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/qwaylandquickitem.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/qwaylandquickitem.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h index 08827981a..07b6a40a4 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h @@ -69,7 +69,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem Q_PROPERTY(bool sizeFollowsSurface READ sizeFollowsSurface WRITE setSizeFollowsSurface NOTIFY sizeFollowsSurfaceChanged) Q_PROPERTY(QObject *subsurfaceHandler READ subsurfaceHandler WRITE setSubsurfaceHandler NOTIFY subsurfaceHandlerChanged) public: - QWaylandQuickItem(QQuickItem *parent = 0); + QWaylandQuickItem(QQuickItem *parent = nullptr); ~QWaylandQuickItem(); QWaylandCompositor *compositor() const; @@ -128,7 +128,7 @@ protected: virtual void surfaceChangedEvent(QWaylandSurface *newSurface, QWaylandSurface *oldSurface); public Q_SLOTS: - virtual void takeFocus(QWaylandInputDevice *device = 0); + virtual void takeFocus(QWaylandInputDevice *device = nullptr); void setPaintEnabled(bool paintEnabled); void raise(); void lower(); @@ -161,7 +161,7 @@ Q_SIGNALS: protected: QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; - QWaylandQuickItem(QWaylandQuickItemPrivate &dd, QQuickItem *parent = 0); + QWaylandQuickItem(QWaylandQuickItemPrivate &dd, QQuickItem *parent = nullptr); }; QT_END_NAMESPACE |