diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:11:15 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 10:32:55 +0000 |
| commit | a767014167d4f7b258a2bd83637dc1ef25b364f0 (patch) | |
| tree | dec849a76c2109cd3dff1d0b3b51c3fe85a91b3e /src/gui/kernel/qwindow.h | |
| parent | 08f6b38ec72f9358ce0f6270034b5a8a4baf2e14 (diff) | |
QtGui: Use Q_NULLPTR instead of 0 in all public headers
This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.
Task-number: QTBUG-45291
Change-Id: I72ab40b21a9499b53a639564fa45884de17b6c98
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/kernel/qwindow.h')
| -rw-r--r-- | src/gui/kernel/qwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 67585ce963..b29e7aaae7 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -125,7 +125,7 @@ public: }; Q_ENUM(Visibility) - explicit QWindow(QScreen *screen = 0); + explicit QWindow(QScreen *screen = Q_NULLPTR); explicit QWindow(QWindow *parent); virtual ~QWindow(); @@ -360,12 +360,12 @@ private: #ifndef Q_QDOC template <> inline QWindow *qobject_cast<QWindow*>(QObject *o) { - if (!o || !o->isWindowType()) return 0; + if (!o || !o->isWindowType()) return Q_NULLPTR; return static_cast<QWindow*>(o); } template <> inline const QWindow *qobject_cast<const QWindow*>(const QObject *o) { - if (!o || !o->isWindowType()) return 0; + if (!o || !o->isWindowType()) return Q_NULLPTR; return static_cast<const QWindow*>(o); } #endif // !Q_QDOC |