diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-06 14:10:43 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-07 09:05:04 +0000 |
commit | a6fe61915ef46b300975faa394736344046e600c (patch) | |
tree | 1898674607e1e8b7a37073477447478051f8a2a1 /src/declarative/qml/qdeclarativecomponent.h | |
parent | 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141 (diff) |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Change-Id: I1ef66cc4a88f71ae804c2f19e59456bc6b55f6c6
Task-number: QTBUG-45291
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
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 ace62d77..cbba0fb5 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: - QDeclarativeComponent(QObject *parent = 0); - QDeclarativeComponent(QDeclarativeEngine *, QObject *parent=0); - QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = 0); - QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = 0); + QDeclarativeComponent(QObject *parent = Q_NULLPTR); + QDeclarativeComponent(QDeclarativeEngine *, QObject *parent = Q_NULLPTR); + QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = Q_NULLPTR); + QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = Q_NULLPTR); virtual ~QDeclarativeComponent(); Q_ENUMS(Status) @@ -82,7 +82,7 @@ public: QUrl url() const; - virtual QObject *create(QDeclarativeContext *context = 0); + virtual QObject *create(QDeclarativeContext *context = Q_NULLPTR); virtual QObject *beginCreate(QDeclarativeContext *); virtual void completeCreate(); |