diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:55:00 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-27 08:05:55 +0000 |
| commit | 4f7b6037720b21b8150f8495b7318d139d447541 (patch) | |
| tree | e5575c217489e7cd4c69da0269eac450b84e418d /src/declarative/qml/qdeclarativecomponent.h | |
| parent | 3f8cddf6208eedab70ff481dbefd90b7c1553d39 (diff) | |
| download | qtquick1-4f7b6037720b21b8150f8495b7318d139d447541.tar.gz | |
Replace Q_NULLPTR with nullptr
Change-Id: I1d645e10f702288ddd63f35df7c57d66533ffd6f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.h | 10 |
1 files changed, 5 insertions, 5 deletions
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(); |