From e36e6f0abd45c2794c70c31eb10c5263e7e7a29a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 15 May 2016 15:05:59 -0700 Subject: Use Q_NULLPTR instead of 0 for null pointers in 5.6 headers Change-Id: I635e4116c1e4499fa1c5fffd144edd0c63a9b9ad Reviewed-by: Oswald Buddenhagen --- src/gallery/qabstractgallery.h | 2 +- src/gallery/qdocumentgallery.h | 2 +- src/gallery/qgalleryabstractrequest.h | 4 +-- src/gallery/qgalleryabstractresponse.h | 4 +-- src/gallery/qgalleryitemrequest.h | 4 +-- src/gallery/qgalleryquerymodel.h | 4 +-- src/gallery/qgalleryqueryrequest.h | 4 +-- src/gallery/qgalleryresultset.h | 2 +- src/gallery/qgallerytyperequest.h | 4 +-- src/gallery/tracker/qgallerydbusinterface_p.h | 2 +- .../tracker/qgallerytrackerchangenotifier_p.h | 2 +- .../tracker/qgallerytrackereditableresultset_p.h | 2 +- .../tracker/qgallerytrackermetadataedit_p.h | 2 +- src/gallery/tracker/qgallerytrackerresultset_p.h | 2 +- src/imports/gallery/qdeclarativegalleryfilter.h | 30 +++++++++++----------- src/imports/gallery/qdeclarativegalleryitem.h | 4 +-- .../gallery/qdeclarativegalleryquerymodel.h | 4 +-- src/imports/gallery/qdeclarativegallerytype.h | 4 +-- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/gallery/qabstractgallery.h b/src/gallery/qabstractgallery.h index d54f230..c98b453 100644 --- a/src/gallery/qabstractgallery.h +++ b/src/gallery/qabstractgallery.h @@ -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; diff --git a/src/gallery/qdocumentgallery.h b/src/gallery/qdocumentgallery.h index 519e118..c4d1911 100644 --- a/src/gallery/qdocumentgallery.h +++ b/src/gallery/qdocumentgallery.h @@ -163,7 +163,7 @@ public: FilterError }; - QDocumentGallery(QObject *parent = 0); + QDocumentGallery(QObject *parent = Q_NULLPTR); ~QDocumentGallery(); bool isRequestSupported(QGalleryAbstractRequest::RequestType type) const; diff --git a/src/gallery/qgalleryabstractrequest.h b/src/gallery/qgalleryabstractrequest.h index 7b5f76e..6c1c589 100644 --- a/src/gallery/qgalleryabstractrequest.h +++ b/src/gallery/qgalleryabstractrequest.h @@ -93,8 +93,8 @@ public: 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; diff --git a/src/gallery/qgalleryabstractresponse.h b/src/gallery/qgalleryabstractresponse.h index 34bb20b..eb9bd58 100644 --- a/src/gallery/qgalleryabstractresponse.h +++ b/src/gallery/qgalleryabstractresponse.h @@ -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; @@ -76,7 +76,7 @@ Q_SIGNALS: 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); diff --git a/src/gallery/qgalleryitemrequest.h b/src/gallery/qgalleryitemrequest.h index 42c7921..99a3a84 100644 --- a/src/gallery/qgalleryitemrequest.h +++ b/src/gallery/qgalleryitemrequest.h @@ -68,8 +68,8 @@ class Q_GALLERY_EXPORT QGalleryItemRequest : public QGalleryAbstractRequest Q_PROPERTY(QList 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; diff --git a/src/gallery/qgalleryquerymodel.h b/src/gallery/qgalleryquerymodel.h index 9eb8e92..6399ef7 100644 --- a/src/gallery/qgalleryquerymodel.h +++ b/src/gallery/qgalleryquerymodel.h @@ -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; diff --git a/src/gallery/qgalleryqueryrequest.h b/src/gallery/qgalleryqueryrequest.h index 0315f1c..e16232e 100644 --- a/src/gallery/qgalleryqueryrequest.h +++ b/src/gallery/qgalleryqueryrequest.h @@ -82,8 +82,8 @@ public: 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; diff --git a/src/gallery/qgalleryresultset.h b/src/gallery/qgalleryresultset.h index eacee1c..9cf2f30 100644 --- a/src/gallery/qgalleryresultset.h +++ b/src/gallery/qgalleryresultset.h @@ -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; diff --git a/src/gallery/qgallerytyperequest.h b/src/gallery/qgallerytyperequest.h index 7fef7bc..ac18c36 100644 --- a/src/gallery/qgallerytyperequest.h +++ b/src/gallery/qgallerytyperequest.h @@ -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; diff --git a/src/gallery/tracker/qgallerydbusinterface_p.h b/src/gallery/tracker/qgallerydbusinterface_p.h index 9d0262d..ea764ed 100644 --- a/src/gallery/tracker/qgallerydbusinterface_p.h +++ b/src/gallery/tracker/qgallerydbusinterface_p.h @@ -77,7 +77,7 @@ public: 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: diff --git a/src/gallery/tracker/qgallerytrackerchangenotifier_p.h b/src/gallery/tracker/qgallerytrackerchangenotifier_p.h index 97c5d4e..d6e5afe 100644 --- a/src/gallery/tracker/qgallerytrackerchangenotifier_p.h +++ b/src/gallery/tracker/qgallerytrackerchangenotifier_p.h @@ -66,7 +66,7 @@ public: QGalleryTrackerChangeNotifier( const QString &service, const QGalleryDBusInterfacePointer &daemonInterface, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); public Q_SLOTS: void itemsEdited(const QString &service); diff --git a/src/gallery/tracker/qgallerytrackereditableresultset_p.h b/src/gallery/tracker/qgallerytrackereditableresultset_p.h index 97e633c..6f74b59 100644 --- a/src/gallery/tracker/qgallerytrackereditableresultset_p.h +++ b/src/gallery/tracker/qgallerytrackereditableresultset_p.h @@ -70,7 +70,7 @@ public: QGalleryTrackerResultSetArguments *arguments, const QGalleryDBusInterfacePointer &metaDataInterface, bool autoUpdate, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); ~QGalleryTrackerEditableResultSet(); bool setMetaData(int key, const QVariant &value); diff --git a/src/gallery/tracker/qgallerytrackermetadataedit_p.h b/src/gallery/tracker/qgallerytrackermetadataedit_p.h index 757c14a..113be2f 100644 --- a/src/gallery/tracker/qgallerytrackermetadataedit_p.h +++ b/src/gallery/tracker/qgallerytrackermetadataedit_p.h @@ -68,7 +68,7 @@ public: const QGalleryDBusInterfacePointer &metaDataInterface, const QString &uri, const QString &service, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); ~QGalleryTrackerMetaDataEdit(); int index() const { return m_index; } diff --git a/src/gallery/tracker/qgallerytrackerresultset_p.h b/src/gallery/tracker/qgallerytrackerresultset_p.h index 58f954b..79c13e6 100644 --- a/src/gallery/tracker/qgallerytrackerresultset_p.h +++ b/src/gallery/tracker/qgallerytrackerresultset_p.h @@ -124,7 +124,7 @@ public: TrackerSparqlConnection *connection, QGalleryTrackerResultSetArguments *arguments, bool autoUpdate, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); ~QGalleryTrackerResultSet(); QStringList propertyNames() const; diff --git a/src/imports/gallery/qdeclarativegalleryfilter.h b/src/imports/gallery/qdeclarativegalleryfilter.h index 10cb925..2c5c13c 100644 --- a/src/imports/gallery/qdeclarativegalleryfilter.h +++ b/src/imports/gallery/qdeclarativegalleryfilter.h @@ -64,7 +64,7 @@ class QDeclarativeGalleryFilterBase : public QObject { Q_OBJECT public: - explicit QDeclarativeGalleryFilterBase(QObject *parent = 0) + explicit QDeclarativeGalleryFilterBase(QObject *parent = Q_NULLPTR) : QObject(parent) { } @@ -114,7 +114,7 @@ Q_SIGNALS: protected: explicit QDeclarativeGalleryValueFilter( - QGalleryFilter::Comparator comparator, QObject *parent = 0) + QGalleryFilter::Comparator comparator, QObject *parent = Q_NULLPTR) : QDeclarativeGalleryFilterBase(parent) { m_filter.setComparator(comparator); @@ -148,7 +148,7 @@ Q_SIGNALS: protected: explicit QDeclarativeGalleryStringFilter( - QGalleryFilter::Comparator comparator, QObject *parent = 0) + QGalleryFilter::Comparator comparator, QObject *parent = Q_NULLPTR) : QDeclarativeGalleryFilterBase(parent) { m_filter.setComparator(comparator); @@ -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) { } @@ -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) { } @@ -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) { } @@ -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) { } @@ -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) { } @@ -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) { } @@ -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) { } @@ -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) { } @@ -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) { } @@ -259,7 +259,7 @@ class QDeclarativeGalleryFilterGroup Q_PROPERTY(QQmlListProperty filters READ filters) Q_CLASSINFO("DefaultProperty", "filters") public: - explicit QDeclarativeGalleryFilterGroup(QObject *parent = 0) + explicit QDeclarativeGalleryFilterGroup(QObject *parent = Q_NULLPTR) : QDeclarativeGalleryFilterBase(parent) , m_complete(false) { @@ -289,7 +289,7 @@ class QDeclarativeGalleryFilterUnion : public QDeclarativeGalleryFilterGroup { Q_OBJECT public: - explicit QDeclarativeGalleryFilterUnion(QObject *parent = 0) + explicit QDeclarativeGalleryFilterUnion(QObject *parent = Q_NULLPTR) : QDeclarativeGalleryFilterGroup(parent) { } @@ -301,7 +301,7 @@ class QDeclarativeGalleryFilterIntersection : public QDeclarativeGalleryFilterGr { Q_OBJECT public: - explicit QDeclarativeGalleryFilterIntersection(QObject *parent = 0) + explicit QDeclarativeGalleryFilterIntersection(QObject *parent = Q_NULLPTR) : QDeclarativeGalleryFilterGroup(parent) { } diff --git a/src/imports/gallery/qdeclarativegalleryitem.h b/src/imports/gallery/qdeclarativegalleryitem.h index c92f919..6c1e97a 100644 --- a/src/imports/gallery/qdeclarativegalleryitem.h +++ b/src/imports/gallery/qdeclarativegalleryitem.h @@ -137,7 +137,7 @@ protected: CanceledUpdate }; - explicit QDeclarativeGalleryItem(QObject *parent = 0); + explicit QDeclarativeGalleryItem(QObject *parent = Q_NULLPTR); void deferredExecute(); @@ -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(); diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.h b/src/imports/gallery/qdeclarativegalleryquerymodel.h index 5ba5753..b954103 100644 --- a/src/imports/gallery/qdeclarativegalleryquerymodel.h +++ b/src/imports/gallery/qdeclarativegalleryquerymodel.h @@ -186,7 +186,7 @@ protected: CanceledUpdate }; - explicit QDeclarativeGalleryQueryModel(QObject *parent = 0); + explicit QDeclarativeGalleryQueryModel(QObject *parent = Q_NULLPTR); virtual QVariant itemType(const QString &type) const = 0; @@ -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(); diff --git a/src/imports/gallery/qdeclarativegallerytype.h b/src/imports/gallery/qdeclarativegallerytype.h index 9dead1c..2a91f78 100644 --- a/src/imports/gallery/qdeclarativegallerytype.h +++ b/src/imports/gallery/qdeclarativegallerytype.h @@ -130,7 +130,7 @@ protected: CanceledUpdate }; - explicit QDeclarativeGalleryType(QObject *parent = 0); + explicit QDeclarativeGalleryType(QObject *parent = Q_NULLPTR); void deferredExecute(); @@ -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(); -- cgit v1.2.3