From 4f7b6037720b21b8150f8495b7318d139d447541 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Sun, 24 Sep 2017 23:55:00 +0200 Subject: Replace Q_NULLPTR with nullptr Change-Id: I1d645e10f702288ddd63f35df7c57d66533ffd6f Reviewed-by: Lars Knoll --- src/declarative/graphicsitems/qdeclarativeitem.h | 4 ++-- src/declarative/qml/qdeclarativecomponent.h | 10 ++++----- src/declarative/qml/qdeclarativecontext.h | 4 ++-- src/declarative/qml/qdeclarativeengine.h | 2 +- src/declarative/qml/qdeclarativeexpression.h | 4 ++-- src/declarative/qml/qdeclarativeextensionplugin.h | 2 +- src/declarative/qml/qdeclarativelist.h | 26 +++++++++++------------ src/declarative/util/qdeclarativepropertymap.h | 2 +- src/declarative/util/qdeclarativeview.h | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src/declarative') diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index d1f6e6c7..043f4bc8 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -95,7 +95,7 @@ public: BottomLeft, Bottom, BottomRight }; - explicit QDeclarativeItem(QDeclarativeItem *parent = Q_NULLPTR); + explicit QDeclarativeItem(QDeclarativeItem *parent = nullptr); virtual ~QDeclarativeItem(); QDeclarativeItem *parentItem() const; @@ -182,7 +182,7 @@ protected: const QRectF &oldGeometry); protected: - explicit QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = Q_NULLPTR); + explicit QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = nullptr); private: Q_DISABLE_COPY(QDeclarativeItem) diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h index b3c73ef8..2865a361 100644 --- a/src/declarative/qml/qdeclarativecomponent.h +++ b/src/declarative/qml/qdeclarativecomponent.h @@ -60,10 +60,10 @@ class Q_DECLARATIVE_EXPORT QDeclarativeComponent : public QObject Q_PROPERTY(QUrl url READ url CONSTANT) public: - explicit QDeclarativeComponent(QObject *parent = Q_NULLPTR); - explicit QDeclarativeComponent(QDeclarativeEngine *, QObject *parent = Q_NULLPTR); - explicit QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = Q_NULLPTR); - explicit QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = Q_NULLPTR); + explicit QDeclarativeComponent(QObject *parent = nullptr); + explicit QDeclarativeComponent(QDeclarativeEngine *, QObject *parent = nullptr); + explicit QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = nullptr); + explicit QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = nullptr); virtual ~QDeclarativeComponent(); Q_ENUMS(Status) @@ -82,7 +82,7 @@ public: QUrl url() const; - virtual QObject *create(QDeclarativeContext *context = Q_NULLPTR); + virtual QObject *create(QDeclarativeContext *context = nullptr); virtual QObject *beginCreate(QDeclarativeContext *); virtual void completeCreate(); diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index ed78da6d..6f5943d5 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -58,8 +58,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject Q_DECLARE_PRIVATE(QDeclarativeContext) public: - explicit QDeclarativeContext(QDeclarativeEngine *parent, QObject *objParent = Q_NULLPTR); - explicit QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent = Q_NULLPTR); + explicit QDeclarativeContext(QDeclarativeEngine *parent, QObject *objParent = nullptr); + explicit QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent = nullptr); virtual ~QDeclarativeContext(); bool isValid() const; diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h index 6cf7515d..44fd2422 100644 --- a/src/declarative/qml/qdeclarativeengine.h +++ b/src/declarative/qml/qdeclarativeengine.h @@ -62,7 +62,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeEngine : public QObject Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath) Q_OBJECT public: - explicit QDeclarativeEngine(QObject *p = Q_NULLPTR); + explicit QDeclarativeEngine(QObject *p = nullptr); virtual ~QDeclarativeEngine(); QDeclarativeContext *rootContext() const; diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index c92471db..caa7c7fe 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -55,7 +55,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject Q_OBJECT public: QDeclarativeExpression(); - explicit QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = Q_NULLPTR); + explicit QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = nullptr); virtual ~QDeclarativeExpression(); QDeclarativeEngine *engine() const; @@ -77,7 +77,7 @@ public: void clearError(); QDeclarativeError error() const; - QVariant evaluate(bool *valueIsUndefined = Q_NULLPTR); + QVariant evaluate(bool *valueIsUndefined = nullptr); Q_SIGNALS: void valueChanged(); diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h index 552e15f9..9ca7bf78 100644 --- a/src/declarative/qml/qdeclarativeextensionplugin.h +++ b/src/declarative/qml/qdeclarativeextensionplugin.h @@ -49,7 +49,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeExtensionPlugin : public QObject, public Q_OBJECT Q_INTERFACES(QDeclarativeExtensionInterface) public: - explicit QDeclarativeExtensionPlugin(QObject *parent = Q_NULLPTR); + explicit QDeclarativeExtensionPlugin(QObject *parent = nullptr); ~QDeclarativeExtensionPlugin(); virtual void registerTypes(const char *uri) = 0; diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index e5b8d249..71c6ddae 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -56,21 +56,21 @@ public: typedef void (*ClearFunction)(QDeclarativeListProperty *); QDeclarativeListProperty() - : object(Q_NULLPTR), - data(Q_NULLPTR), - append(Q_NULLPTR), - count(Q_NULLPTR), - at(Q_NULLPTR), - clear(Q_NULLPTR), - dummy1(Q_NULLPTR), - dummy2(Q_NULLPTR) + : object(nullptr), + data(nullptr), + append(nullptr), + count(nullptr), + at(nullptr), + clear(nullptr), + dummy1(nullptr), + dummy2(nullptr) {} QDeclarativeListProperty(QObject *o, QList &list) : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at), - clear(qlist_clear), dummy1(Q_NULLPTR), dummy2(Q_NULLPTR) {} - QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = Q_NULLPTR, - AtFunction t = Q_NULLPTR, ClearFunction r = Q_NULLPTR) - : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(Q_NULLPTR), dummy2(Q_NULLPTR) {} + clear(qlist_clear), dummy1(nullptr), dummy2(nullptr) {} + QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = nullptr, + AtFunction t = nullptr, ClearFunction r = nullptr) + : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(nullptr), dummy2(nullptr) {} bool operator==(const QDeclarativeListProperty &o) const { return object == o.object && @@ -116,7 +116,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeListReference { public: QDeclarativeListReference(); - explicit QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = Q_NULLPTR); + explicit QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = nullptr); QDeclarativeListReference(const QDeclarativeListReference &); QDeclarativeListReference &operator=(const QDeclarativeListReference &); ~QDeclarativeListReference(); diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h index 0ccf4ffc..b53d5342 100644 --- a/src/declarative/util/qdeclarativepropertymap.h +++ b/src/declarative/util/qdeclarativepropertymap.h @@ -49,7 +49,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativePropertyMap : public QObject { Q_OBJECT public: - explicit QDeclarativePropertyMap(QObject *parent = Q_NULLPTR); + explicit QDeclarativePropertyMap(QObject *parent = nullptr); virtual ~QDeclarativePropertyMap(); QVariant value(const QString &key) const; diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h index fb623b7f..694e2cf6 100644 --- a/src/declarative/util/qdeclarativeview.h +++ b/src/declarative/util/qdeclarativeview.h @@ -59,8 +59,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true) Q_ENUMS(ResizeMode Status) public: - explicit QDeclarativeView(QWidget *parent = Q_NULLPTR); - explicit QDeclarativeView(const QUrl &source, QWidget *parent = Q_NULLPTR); + explicit QDeclarativeView(QWidget *parent = nullptr); + explicit QDeclarativeView(const QUrl &source, QWidget *parent = nullptr); virtual ~QDeclarativeView(); QUrl source() const; -- cgit v1.2.3