From 69f9c1508f7e0965b599097f616cc8204935c1eb Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 25 May 2016 13:52:07 +0200 Subject: Compile with -Wzero-as-null-pointer-constant Task-number: QTBUG-53619 Change-Id: Idf073287f215113431cad64f85628e010176ab74 Reviewed-by: Johan Helsing Reviewed-by: Giulio Camuffo Reviewed-by: Oswald Buddenhagen --- src/client/global/qwaylandclientextension.h | 1 - src/compositor/compositor_api/qwaylandcompositor.h | 4 ++-- src/compositor/compositor_api/qwaylanddestroylistener.h | 2 +- src/compositor/compositor_api/qwaylandkeyboard.h | 2 +- src/compositor/compositor_api/qwaylandpointer.h | 2 +- src/compositor/compositor_api/qwaylandquickcompositor.h | 2 +- src/compositor/compositor_api/qwaylandquickitem.h | 6 +++--- src/compositor/compositor_api/qwaylandtouch.h | 2 +- src/compositor/compositor_api/qwaylandview.h | 2 +- src/compositor/global/qwaylandcompositorextension.h | 4 ++-- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/client/global/qwaylandclientextension.h b/src/client/global/qwaylandclientextension.h index a3de0aa4b..9ff45ea00 100644 --- a/src/client/global/qwaylandclientextension.h +++ b/src/client/global/qwaylandclientextension.h @@ -38,7 +38,6 @@ #define QWAYLANDCLIENTEXTENSION_H #include -#include #include #include QT_BEGIN_NAMESPACE 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 diff --git a/src/compositor/compositor_api/qwaylanddestroylistener.h b/src/compositor/compositor_api/qwaylanddestroylistener.h index db172ae0b..580a5c46a 100644 --- a/src/compositor/compositor_api/qwaylanddestroylistener.h +++ b/src/compositor/compositor_api/qwaylanddestroylistener.h @@ -52,7 +52,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandDestroyListener : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QWaylandDestroyListener) public: - QWaylandDestroyListener(QObject *parent = 0); + QWaylandDestroyListener(QObject *parent = nullptr); void listenForDestruction(struct wl_resource *resource); void reset(); diff --git a/src/compositor/compositor_api/qwaylandkeyboard.h b/src/compositor/compositor_api/qwaylandkeyboard.h index cee32f4e4..b5bf6fe5c 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.h +++ b/src/compositor/compositor_api/qwaylandkeyboard.h @@ -76,7 +76,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandKeyboard : public QWaylandObject Q_PROPERTY(quint32 repeatRate READ repeatRate WRITE setRepeatRate NOTIFY repeatRateChanged) Q_PROPERTY(quint32 repeatDelay READ repeatDelay WRITE setRepeatDelay NOTIFY repeatDelayChanged) public: - QWaylandKeyboard(QWaylandInputDevice *inputDevice, QObject *parent = 0); + QWaylandKeyboard(QWaylandInputDevice *inputDevice, QObject *parent = nullptr); QWaylandInputDevice *inputDevice() const; QWaylandCompositor *compositor() const; diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h index 1019fdc15..9d7d06807 100644 --- a/src/compositor/compositor_api/qwaylandpointer.h +++ b/src/compositor/compositor_api/qwaylandpointer.h @@ -56,7 +56,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandPointer : public QWaylandObject Q_DECLARE_PRIVATE(QWaylandPointer) Q_PROPERTY(bool isButtonPressed READ isButtonPressed NOTIFY buttonPressedChanged) public: - QWaylandPointer(QWaylandInputDevice *inputDevice, QObject *parent = 0); + QWaylandPointer(QWaylandInputDevice *inputDevice, QObject *parent = nullptr); QWaylandInputDevice *inputDevice() const; QWaylandCompositor *compositor() const; diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h index 6e0c5d315..f6fb118a0 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.h +++ b/src/compositor/compositor_api/qwaylandquickcompositor.h @@ -51,7 +51,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompo Q_INTERFACES(QQmlParserStatus) Q_OBJECT public: - QWaylandQuickCompositor(QObject *parent = 0); + QWaylandQuickCompositor(QObject *parent = nullptr); void create() Q_DECL_OVERRIDE; void grabSurface(QWaylandSurfaceGrabber *grabber, const QWaylandBufferRef &buffer) Q_DECL_OVERRIDE; 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 diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h index 06a484de0..b6c40ea96 100644 --- a/src/compositor/compositor_api/qwaylandtouch.h +++ b/src/compositor/compositor_api/qwaylandtouch.h @@ -57,7 +57,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTouch : public QWaylandObject Q_OBJECT Q_DECLARE_PRIVATE(QWaylandTouch) public: - QWaylandTouch(QWaylandInputDevice *inputDevice, QObject *parent = 0); + QWaylandTouch(QWaylandInputDevice *inputDevice, QObject *parent = nullptr); QWaylandInputDevice *inputDevice() const; QWaylandCompositor *compositor() const; diff --git a/src/compositor/compositor_api/qwaylandview.h b/src/compositor/compositor_api/qwaylandview.h index 010bace42..f89d8ca78 100644 --- a/src/compositor/compositor_api/qwaylandview.h +++ b/src/compositor/compositor_api/qwaylandview.h @@ -59,7 +59,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandView : public QObject Q_PROPERTY(bool bufferLock READ isBufferLocked WRITE setBufferLock NOTIFY bufferLockChanged) Q_PROPERTY(bool discardFrontBuffers READ discardFrontBuffers WRITE setDiscardFrontBuffers NOTIFY discardFrontBuffersChanged) public: - QWaylandView(QObject *renderObject = 0, QObject *parent = 0); + QWaylandView(QObject *renderObject = nullptr, QObject *parent = nullptr); virtual ~QWaylandView(); QObject *renderObject() const; diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h index 762df2e8f..0ba54c882 100644 --- a/src/compositor/global/qwaylandcompositorextension.h +++ b/src/compositor/global/qwaylandcompositorextension.h @@ -62,8 +62,8 @@ public: void removeExtension(QWaylandCompositorExtension *extension); protected: - QWaylandObject(QObject *parent = 0); - QWaylandObject(QObjectPrivate &d, QObject *parent = 0); + QWaylandObject(QObject *parent = nullptr); + QWaylandObject(QObjectPrivate &d, QObject *parent = nullptr); QList extension_vector; }; -- cgit v1.2.3