diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-22 13:28:34 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-22 12:41:31 +0000 |
commit | f132bf0938c13745d4e6f7dd9c65db577d94187c (patch) | |
tree | 68707c4f9b85ce43ae12e0a33f8ae6a3bebccde9 | |
parent | b3dadb630c58bcde5501ae811df2267f20ab846d (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: I2285bc99e10d123f15fb3b0aa08bd6de46ce652d
Task-number: QTBUG-45291
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
-rw-r--r-- | src/winextras/qwinfunctions.h | 2 | ||||
-rw-r--r-- | src/winextras/qwinjumplist.h | 2 | ||||
-rw-r--r-- | src/winextras/qwintaskbarbutton.h | 2 | ||||
-rw-r--r-- | src/winextras/qwintaskbarprogress.h | 2 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbar.h | 2 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbutton.h | 2 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbutton_p.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h index 197ac33..d5c2bde 100644 --- a/src/winextras/qwinfunctions.h +++ b/src/winextras/qwinfunctions.h @@ -83,7 +83,7 @@ namespace QtWin Q_WINEXTRAS_EXPORT QString stringFromHresult(HRESULT hresult); Q_WINEXTRAS_EXPORT QString errorStringFromHresult(HRESULT hresult); - Q_WINEXTRAS_EXPORT QColor colorizationColor(bool *opaqueBlend = 0); + Q_WINEXTRAS_EXPORT QColor colorizationColor(bool *opaqueBlend = Q_NULLPTR); Q_WINEXTRAS_EXPORT QColor realColorizationColor(); Q_WINEXTRAS_EXPORT void setWindowExcludedFromPeek(QWindow *window, bool exclude); diff --git a/src/winextras/qwinjumplist.h b/src/winextras/qwinjumplist.h index 732742c..8b33d46 100644 --- a/src/winextras/qwinjumplist.h +++ b/src/winextras/qwinjumplist.h @@ -52,7 +52,7 @@ class Q_WINEXTRAS_EXPORT QWinJumpList : public QObject Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier) public: - explicit QWinJumpList(QObject *parent = 0); + explicit QWinJumpList(QObject *parent = Q_NULLPTR); ~QWinJumpList(); QString identifier() const; diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h index a844870..1979f68 100644 --- a/src/winextras/qwintaskbarbutton.h +++ b/src/winextras/qwintaskbarbutton.h @@ -53,7 +53,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarButton : public QObject Q_PROPERTY(QWindow *window READ window WRITE setWindow) public: - explicit QWinTaskbarButton(QObject *parent = 0); + explicit QWinTaskbarButton(QObject *parent = Q_NULLPTR); ~QWinTaskbarButton(); void setWindow(QWindow *window); diff --git a/src/winextras/qwintaskbarprogress.h b/src/winextras/qwintaskbarprogress.h index ce4883e..6195731 100644 --- a/src/winextras/qwintaskbarprogress.h +++ b/src/winextras/qwintaskbarprogress.h @@ -53,7 +53,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarProgress : public QObject Q_PROPERTY(bool stopped READ isStopped NOTIFY stoppedChanged) public: - explicit QWinTaskbarProgress(QObject *parent = 0); + explicit QWinTaskbarProgress(QObject *parent = Q_NULLPTR); ~QWinTaskbarProgress(); int value() const; diff --git a/src/winextras/qwinthumbnailtoolbar.h b/src/winextras/qwinthumbnailtoolbar.h index 124bb87..3dd6d9d 100644 --- a/src/winextras/qwinthumbnailtoolbar.h +++ b/src/winextras/qwinthumbnailtoolbar.h @@ -55,7 +55,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolBar : public QObject Q_PROPERTY(QPixmap iconicLivePreviewPixmap READ iconicLivePreviewPixmap WRITE setIconicLivePreviewPixmap) public: - explicit QWinThumbnailToolBar(QObject *parent = 0); + explicit QWinThumbnailToolBar(QObject *parent = Q_NULLPTR); ~QWinThumbnailToolBar(); void setWindow(QWindow *window); diff --git a/src/winextras/qwinthumbnailtoolbutton.h b/src/winextras/qwinthumbnailtoolbutton.h index f886f0e..97ac204 100644 --- a/src/winextras/qwinthumbnailtoolbutton.h +++ b/src/winextras/qwinthumbnailtoolbutton.h @@ -55,7 +55,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolButton : public QObject Q_PROPERTY(bool flat READ isFlat WRITE setFlat) public: - explicit QWinThumbnailToolButton(QObject *parent = 0); + explicit QWinThumbnailToolButton(QObject *parent = Q_NULLPTR); ~QWinThumbnailToolButton(); void setToolTip(const QString &toolTip); diff --git a/src/winextras/qwinthumbnailtoolbutton_p.h b/src/winextras/qwinthumbnailtoolbutton_p.h index 706b7ec..ce83002 100644 --- a/src/winextras/qwinthumbnailtoolbutton_p.h +++ b/src/winextras/qwinthumbnailtoolbutton_p.h @@ -55,7 +55,7 @@ class QWinThumbnailToolBar; class QWinThumbnailToolButtonPrivate { public: - QWinThumbnailToolButtonPrivate() : enabled(true), interactive(true), dismiss(false), visible(true), flat(false), toolbar(0) {} + QWinThumbnailToolButtonPrivate() : enabled(true), interactive(true), dismiss(false), visible(true), flat(false), toolbar(Q_NULLPTR) {} QString toolTip; QIcon icon; bool enabled; |