Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use Q_NULLPTR instead of 0 for null pointers in 5.6 headers
Change-Id: I635e4116c1e4499fa1c5fffd144edd0c63a9b9ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
  • Loading branch information
thiagomacieira committed May 30, 2016
1 parent 2da36eb commit e36e6f0
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion src/gallery/qabstractgallery.h
Expand Up @@ -52,7 +52,7 @@ class Q_GALLERY_EXPORT QAbstractGallery : public QObject
{
Q_OBJECT
public:
QAbstractGallery(QObject *parent = 0);
QAbstractGallery(QObject *parent = Q_NULLPTR);
~QAbstractGallery();

virtual bool isRequestSupported(QGalleryAbstractRequest::RequestType type) const = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/gallery/qdocumentgallery.h
Expand Up @@ -163,7 +163,7 @@ class Q_GALLERY_EXPORT QDocumentGallery : public QAbstractGallery
FilterError
};

QDocumentGallery(QObject *parent = 0);
QDocumentGallery(QObject *parent = Q_NULLPTR);
~QDocumentGallery();

bool isRequestSupported(QGalleryAbstractRequest::RequestType type) const;
Expand Down
4 changes: 2 additions & 2 deletions src/gallery/qgalleryabstractrequest.h
Expand Up @@ -93,8 +93,8 @@ class Q_GALLERY_EXPORT QGalleryAbstractRequest : public QObject
TypeRequest
};

explicit QGalleryAbstractRequest(RequestType type, QObject *parent = 0);
explicit QGalleryAbstractRequest( QAbstractGallery *gallery, RequestType type, QObject *parent = 0);
explicit QGalleryAbstractRequest(RequestType type, QObject *parent = Q_NULLPTR);
explicit QGalleryAbstractRequest( QAbstractGallery *gallery, RequestType type, QObject *parent = Q_NULLPTR);
~QGalleryAbstractRequest();

QAbstractGallery *gallery() const;
Expand Down
4 changes: 2 additions & 2 deletions src/gallery/qgalleryabstractresponse.h
Expand Up @@ -56,7 +56,7 @@ class Q_GALLERY_EXPORT QGalleryAbstractResponse : public QObject
Q_DECLARE_PRIVATE(QGalleryAbstractResponse)
public:
QGalleryAbstractResponse(
int error, const QString &errorString = QString(), QObject *parent = 0);
int error, const QString &errorString = QString(), QObject *parent = Q_NULLPTR);
~QGalleryAbstractResponse();

int error() const;
Expand All @@ -76,7 +76,7 @@ class Q_GALLERY_EXPORT QGalleryAbstractResponse : public QObject
void progressChanged(int current, int maximum);

protected:
QGalleryAbstractResponse(QObject *parent = 0);
QGalleryAbstractResponse(QObject *parent = Q_NULLPTR);
QGalleryAbstractResponse(QGalleryAbstractResponsePrivate &dd, QObject *parent);

void finish(bool idle = false);
Expand Down
4 changes: 2 additions & 2 deletions src/gallery/qgalleryitemrequest.h
Expand Up @@ -68,8 +68,8 @@ class Q_GALLERY_EXPORT QGalleryItemRequest : public QGalleryAbstractRequest
Q_PROPERTY(QList<QGalleryResource> resources READ resources NOTIFY itemChanged)

public:
explicit QGalleryItemRequest(QObject *parent = 0);
explicit QGalleryItemRequest(QAbstractGallery *gallery, QObject *parent = 0);
explicit QGalleryItemRequest(QObject *parent = Q_NULLPTR);
explicit QGalleryItemRequest(QAbstractGallery *gallery, QObject *parent = Q_NULLPTR);
~QGalleryItemRequest();

QStringList propertyNames() const;
Expand Down
4 changes: 2 additions & 2 deletions src/gallery/qgalleryquerymodel.h
Expand Up @@ -69,8 +69,8 @@ class Q_GALLERY_EXPORT QGalleryQueryModel : public QAbstractItemModel
Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
Q_PROPERTY(QGalleryAbstractRequest::State state READ state NOTIFY stateChanged)
public:
QGalleryQueryModel(QObject *parent = 0);
QGalleryQueryModel(QAbstractGallery *gallery, QObject *parent = 0);
QGalleryQueryModel(QObject *parent = Q_NULLPTR);
QGalleryQueryModel(QAbstractGallery *gallery, QObject *parent = Q_NULLPTR);
~QGalleryQueryModel();

QAbstractGallery *gallery() const;
Expand Down
4 changes: 2 additions & 2 deletions src/gallery/qgalleryqueryrequest.h
Expand Up @@ -82,8 +82,8 @@ class Q_GALLERY_EXPORT QGalleryQueryRequest : public QGalleryAbstractRequest
DirectDescendants
};

explicit QGalleryQueryRequest(QObject *parent = 0);
explicit QGalleryQueryRequest(QAbstractGallery *gallery, QObject *parent = 0);
explicit QGalleryQueryRequest(QObject *parent = Q_NULLPTR);
explicit QGalleryQueryRequest(QAbstractGallery *gallery, QObject *parent = Q_NULLPTR);
~QGalleryQueryRequest();

QStringList propertyNames() const;
Expand Down
2 changes: 1 addition & 1 deletion src/gallery/qgalleryresultset.h
Expand Up @@ -61,7 +61,7 @@ class Q_GALLERY_EXPORT QGalleryResultSet : public QGalleryAbstractResponse
Q_OBJECT
Q_DECLARE_PRIVATE(QGalleryResultSet)
public:
QGalleryResultSet(QObject *parent = 0);
QGalleryResultSet(QObject *parent = Q_NULLPTR);
~QGalleryResultSet();

virtual int propertyKey(const QString &property) const = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/gallery/qgallerytyperequest.h
Expand Up @@ -64,8 +64,8 @@ class Q_GALLERY_EXPORT QGalleryTypeRequest : public QGalleryAbstractRequest
Q_PROPERTY(bool valid READ isValid NOTIFY typeChanged)

public:
explicit QGalleryTypeRequest(QObject *parent = 0);
explicit QGalleryTypeRequest(QAbstractGallery *gallery, QObject *parent = 0);
explicit QGalleryTypeRequest(QObject *parent = Q_NULLPTR);
explicit QGalleryTypeRequest(QAbstractGallery *gallery, QObject *parent = Q_NULLPTR);
~QGalleryTypeRequest();

QStringList propertyNames() const;
Expand Down
2 changes: 1 addition & 1 deletion src/gallery/tracker/qgallerydbusinterface_p.h
Expand Up @@ -77,7 +77,7 @@ class QGalleryDBusInterface : public QDBusAbstractInterface, public QSharedData
const QString &path,
const char *interface,
const QDBusConnection &connection = QDBusConnection::sessionBus(),
QObject *parent = 0)
QObject *parent = Q_NULLPTR)
: QDBusAbstractInterface(service, path, interface, connection, parent) {}

Q_SIGNALS:
Expand Down
2 changes: 1 addition & 1 deletion src/gallery/tracker/qgallerytrackerchangenotifier_p.h
Expand Up @@ -66,7 +66,7 @@ class QGalleryTrackerChangeNotifier : public QObject
QGalleryTrackerChangeNotifier(
const QString &service,
const QGalleryDBusInterfacePointer &daemonInterface,
QObject *parent = 0);
QObject *parent = Q_NULLPTR);

public Q_SLOTS:
void itemsEdited(const QString &service);
Expand Down
2 changes: 1 addition & 1 deletion src/gallery/tracker/qgallerytrackereditableresultset_p.h
Expand Up @@ -70,7 +70,7 @@ class QGalleryTrackerEditableResultSet : public QGalleryTrackerResultSet
QGalleryTrackerResultSetArguments *arguments,
const QGalleryDBusInterfacePointer &metaDataInterface,
bool autoUpdate,
QObject *parent = 0);
QObject *parent = Q_NULLPTR);
~QGalleryTrackerEditableResultSet();

bool setMetaData(int key, const QVariant &value);
Expand Down
2 changes: 1 addition & 1 deletion src/gallery/tracker/qgallerytrackermetadataedit_p.h
Expand Up @@ -68,7 +68,7 @@ class QGalleryTrackerMetaDataEdit : public QObject
const QGalleryDBusInterfacePointer &metaDataInterface,
const QString &uri,
const QString &service,
QObject *parent = 0);
QObject *parent = Q_NULLPTR);
~QGalleryTrackerMetaDataEdit();

int index() const { return m_index; }
Expand Down
2 changes: 1 addition & 1 deletion src/gallery/tracker/qgallerytrackerresultset_p.h
Expand Up @@ -124,7 +124,7 @@ class QGalleryTrackerResultSet : public QGalleryResultSet
TrackerSparqlConnection *connection,
QGalleryTrackerResultSetArguments *arguments,
bool autoUpdate,
QObject *parent = 0);
QObject *parent = Q_NULLPTR);
~QGalleryTrackerResultSet();

QStringList propertyNames() const;
Expand Down
30 changes: 15 additions & 15 deletions src/imports/gallery/qdeclarativegalleryfilter.h
Expand Up @@ -64,7 +64,7 @@ class QDeclarativeGalleryFilterBase : public QObject
{
Q_OBJECT
public:
explicit QDeclarativeGalleryFilterBase(QObject *parent = 0)
explicit QDeclarativeGalleryFilterBase(QObject *parent = Q_NULLPTR)
: QObject(parent)
{
}
Expand Down Expand Up @@ -114,7 +114,7 @@ class QDeclarativeGalleryValueFilter : public QDeclarativeGalleryFilterBase

protected:
explicit QDeclarativeGalleryValueFilter(
QGalleryFilter::Comparator comparator, QObject *parent = 0)
QGalleryFilter::Comparator comparator, QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryFilterBase(parent)
{
m_filter.setComparator(comparator);
Expand Down Expand Up @@ -148,7 +148,7 @@ class QDeclarativeGalleryStringFilter : public QDeclarativeGalleryFilterBase

protected:
explicit QDeclarativeGalleryStringFilter(
QGalleryFilter::Comparator comparator, QObject *parent = 0)
QGalleryFilter::Comparator comparator, QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryFilterBase(parent)
{
m_filter.setComparator(comparator);
Expand All @@ -161,7 +161,7 @@ class QDeclarativeGalleryEqualsFilter : public QDeclarativeGalleryValueFilter
{
Q_OBJECT
public:
explicit QDeclarativeGalleryEqualsFilter(QObject *parent = 0)
explicit QDeclarativeGalleryEqualsFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryValueFilter(QGalleryFilter::Equals, parent)
{
}
Expand All @@ -173,7 +173,7 @@ class QDeclarativeGalleryLessThanFilter : public QDeclarativeGalleryValueFilter
{
Q_OBJECT
public:
explicit QDeclarativeGalleryLessThanFilter(QObject *parent = 0)
explicit QDeclarativeGalleryLessThanFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryValueFilter(QGalleryFilter::LessThan, parent)
{
}
Expand All @@ -183,7 +183,7 @@ class QDeclarativeGalleryLessThanEqualsFilter : public QDeclarativeGalleryValueF
{
Q_OBJECT
public:
explicit QDeclarativeGalleryLessThanEqualsFilter(QObject *parent = 0)
explicit QDeclarativeGalleryLessThanEqualsFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryValueFilter(QGalleryFilter::LessThanEquals, parent)
{
}
Expand All @@ -193,7 +193,7 @@ class QDeclarativeGalleryGreaterThanFilter : public QDeclarativeGalleryValueFilt
{
Q_OBJECT
public:
explicit QDeclarativeGalleryGreaterThanFilter(QObject *parent = 0)
explicit QDeclarativeGalleryGreaterThanFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryValueFilter(QGalleryFilter::GreaterThan, parent)
{
}
Expand All @@ -203,7 +203,7 @@ class QDeclarativeGalleryGreaterThanEqualsFilter : public QDeclarativeGalleryVal
{
Q_OBJECT
public:
explicit QDeclarativeGalleryGreaterThanEqualsFilter(QObject *parent = 0)
explicit QDeclarativeGalleryGreaterThanEqualsFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryValueFilter(QGalleryFilter::GreaterThanEquals, parent)
{
}
Expand All @@ -213,7 +213,7 @@ class QDeclarativeGalleryContainsFilter : public QDeclarativeGalleryStringFilter
{
Q_OBJECT
public:
explicit QDeclarativeGalleryContainsFilter(QObject *parent = 0)
explicit QDeclarativeGalleryContainsFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryStringFilter(QGalleryFilter::Contains, parent)
{
}
Expand All @@ -223,7 +223,7 @@ class QDeclarativeGalleryStartsWithFilter : public QDeclarativeGalleryStringFilt
{
Q_OBJECT
public:
explicit QDeclarativeGalleryStartsWithFilter(QObject *parent = 0)
explicit QDeclarativeGalleryStartsWithFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryStringFilter(QGalleryFilter::StartsWith, parent)
{
}
Expand All @@ -234,7 +234,7 @@ class QDeclarativeGalleryEndsWithFilter : public QDeclarativeGalleryStringFilter
{
Q_OBJECT
public:
explicit QDeclarativeGalleryEndsWithFilter(QObject *parent = 0)
explicit QDeclarativeGalleryEndsWithFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryStringFilter(QGalleryFilter::EndsWith, parent)
{
}
Expand All @@ -244,7 +244,7 @@ class QDeclarativeGalleryWildcardFilter : public QDeclarativeGalleryStringFilter
{
Q_OBJECT
public:
explicit QDeclarativeGalleryWildcardFilter(QObject *parent = 0)
explicit QDeclarativeGalleryWildcardFilter(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryStringFilter(QGalleryFilter::Wildcard, parent)
{
}
Expand All @@ -259,7 +259,7 @@ class QDeclarativeGalleryFilterGroup
Q_PROPERTY(QQmlListProperty<QDocGallery::QDeclarativeGalleryFilterBase> filters READ filters)
Q_CLASSINFO("DefaultProperty", "filters")
public:
explicit QDeclarativeGalleryFilterGroup(QObject *parent = 0)
explicit QDeclarativeGalleryFilterGroup(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryFilterBase(parent)
, m_complete(false)
{
Expand Down Expand Up @@ -289,7 +289,7 @@ class QDeclarativeGalleryFilterUnion : public QDeclarativeGalleryFilterGroup
{
Q_OBJECT
public:
explicit QDeclarativeGalleryFilterUnion(QObject *parent = 0)
explicit QDeclarativeGalleryFilterUnion(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryFilterGroup(parent)
{
}
Expand All @@ -301,7 +301,7 @@ class QDeclarativeGalleryFilterIntersection : public QDeclarativeGalleryFilterGr
{
Q_OBJECT
public:
explicit QDeclarativeGalleryFilterIntersection(QObject *parent = 0)
explicit QDeclarativeGalleryFilterIntersection(QObject *parent = Q_NULLPTR)
: QDeclarativeGalleryFilterGroup(parent)
{
}
Expand Down
4 changes: 2 additions & 2 deletions src/imports/gallery/qdeclarativegalleryitem.h
Expand Up @@ -137,7 +137,7 @@ public Q_SLOTS:
CanceledUpdate
};

explicit QDeclarativeGalleryItem(QObject *parent = 0);
explicit QDeclarativeGalleryItem(QObject *parent = Q_NULLPTR);

void deferredExecute();

Expand All @@ -162,7 +162,7 @@ class QDeclarativeDocumentGalleryItem : public QDeclarativeGalleryItem
Q_OBJECT
Q_PROPERTY(QDocGallery::QDeclarativeDocumentGallery::ItemType itemType READ itemType NOTIFY itemTypeChanged)
public:
explicit QDeclarativeDocumentGalleryItem(QObject *parent = 0);
explicit QDeclarativeDocumentGalleryItem(QObject *parent = Q_NULLPTR);
~QDeclarativeDocumentGalleryItem();

void classBegin();
Expand Down
4 changes: 2 additions & 2 deletions src/imports/gallery/qdeclarativegalleryquerymodel.h
Expand Up @@ -186,7 +186,7 @@ protected Q_SLOTS:
CanceledUpdate
};

explicit QDeclarativeGalleryQueryModel(QObject *parent = 0);
explicit QDeclarativeGalleryQueryModel(QObject *parent = Q_NULLPTR);

virtual QVariant itemType(const QString &type) const = 0;

Expand Down Expand Up @@ -214,7 +214,7 @@ class QDeclarativeDocumentGalleryModel : public QDeclarativeGalleryQueryModel
Q_OBJECT
Q_PROPERTY(QDocGallery::QDeclarativeDocumentGallery::ItemType rootType READ rootType WRITE setRootType NOTIFY rootTypeChanged)
public:
explicit QDeclarativeDocumentGalleryModel(QObject *parent = 0);
explicit QDeclarativeDocumentGalleryModel(QObject *parent = Q_NULLPTR);
~QDeclarativeDocumentGalleryModel();

void classBegin();
Expand Down
4 changes: 2 additions & 2 deletions src/imports/gallery/qdeclarativegallerytype.h
Expand Up @@ -130,7 +130,7 @@ public Q_SLOTS:
CanceledUpdate
};

explicit QDeclarativeGalleryType(QObject *parent = 0);
explicit QDeclarativeGalleryType(QObject *parent = Q_NULLPTR);

void deferredExecute();

Expand All @@ -153,7 +153,7 @@ class QDeclarativeDocumentGalleryType : public QDeclarativeGalleryType
Q_OBJECT
Q_PROPERTY(QDocGallery::QDeclarativeDocumentGallery::ItemType itemType READ itemType WRITE setItemType NOTIFY itemTypeChanged)
public:
explicit QDeclarativeDocumentGalleryType(QObject *parent = 0);
explicit QDeclarativeDocumentGalleryType(QObject *parent = Q_NULLPTR);
~QDeclarativeDocumentGalleryType();

void classBegin();
Expand Down

0 comments on commit e36e6f0

Please sign in to comment.