diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-25 13:52:07 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-25 15:42:32 +0000 |
| commit | 69f9c1508f7e0965b599097f616cc8204935c1eb (patch) | |
| tree | d39b59fd761b165c704593f2216b530b62c56c23 /src/compositor/compositor_api/qwaylandcompositor.h | |
| parent | 51dcf7c46170b272ed7a63f9dfe1169e90041be8 (diff) | |
Compile with -Wzero-as-null-pointer-constant
Task-number: QTBUG-53619
Change-Id: Idf073287f215113431cad64f85628e010176ab74
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 9b4452395..f97484d86 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -80,7 +80,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject Q_PROPERTY(QWaylandInputDevice *defaultInputDevice READ defaultInputDevice NOTIFY defaultInputDeviceChanged) public: - QWaylandCompositor(QObject *parent = 0); + QWaylandCompositor(QObject *parent = nullptr); virtual ~QWaylandCompositor(); virtual void create(); @@ -142,7 +142,7 @@ protected: virtual QWaylandKeyboard *createKeyboardDevice(QWaylandInputDevice *inputDevice); virtual QWaylandTouch *createTouchDevice(QWaylandInputDevice *inputDevice); - QWaylandCompositor(QWaylandCompositorPrivate &dptr, QObject *parent = 0); + QWaylandCompositor(QWaylandCompositorPrivate &dptr, QObject *parent = nullptr); }; QT_END_NAMESPACE |