diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-22 13:40:10 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-22 14:15:23 +0000 |
| commit | 3fcb77996b3e6c076d50db9ccf9da3aefd24f159 (patch) | |
| tree | f31206b92674f2681fcba1593eeeae13ff707d50 /src | |
| parent | 90c94f288dcfc07dcaca2f9457706af42d976904 (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: Iddf561087189ece6dd34b42605842dfafdbd8b4e
Task-number: QTBUG-45291
Reviewed-by: Johan Helsing <johan.helsing@theqtcompany.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'src')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 1817fa07d..7097a19f4 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -86,7 +86,7 @@ public: }; Q_DECLARE_FLAGS(ExtensionFlags, ExtensionFlag) - QWaylandCompositor(const char *socketName = 0, ExtensionFlags extensions = DefaultExtensions); + QWaylandCompositor(const char *socketName = Q_NULLPTR, ExtensionFlags extensions = DefaultExtensions); virtual ~QWaylandCompositor(); void addGlobalInterface(QWaylandGlobalInterface *interface); diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h index e54018901..c43e4b267 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.h +++ b/src/compositor/compositor_api/qwaylandquickcompositor.h @@ -46,7 +46,7 @@ class QWaylandOutput; class Q_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor { public: - QWaylandQuickCompositor(const char *socketName = 0, QWaylandCompositor::ExtensionFlags extensions = DefaultExtensions); + QWaylandQuickCompositor(const char *socketName = Q_NULLPTR, QWaylandCompositor::ExtensionFlags extensions = DefaultExtensions); QWaylandSurfaceView *createView(QWaylandSurface *surf) Q_DECL_OVERRIDE; QWaylandOutput *createOutput(QWindow *window, diff --git a/src/compositor/compositor_api/qwaylandsurfaceitem.h b/src/compositor/compositor_api/qwaylandsurfaceitem.h index cb51b6bfb..cfbe410c1 100644 --- a/src/compositor/compositor_api/qwaylandsurfaceitem.h +++ b/src/compositor/compositor_api/qwaylandsurfaceitem.h @@ -69,7 +69,7 @@ class Q_COMPOSITOR_EXPORT QWaylandSurfaceItem : public QQuickItem, public QWayla Q_PROPERTY(bool resizeSurfaceToItem READ resizeSurfaceToItem WRITE setResizeSurfaceToItem NOTIFY resizeSurfaceToItemChanged) public: - QWaylandSurfaceItem(QWaylandQuickSurface *surface, QQuickItem *parent = 0); + QWaylandSurfaceItem(QWaylandQuickSurface *surface, QQuickItem *parent = Q_NULLPTR); ~QWaylandSurfaceItem(); Q_INVOKABLE bool isYInverted() const; @@ -103,7 +103,7 @@ protected: void mouseUngrabEvent() Q_DECL_OVERRIDE; public Q_SLOTS: - virtual void takeFocus(QWaylandInputDevice *device = 0); + virtual void takeFocus(QWaylandInputDevice *device = Q_NULLPTR); void setPaintEnabled(bool paintEnabled); private Q_SLOTS: diff --git a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h index 3a7f2de20..895f35b59 100644 --- a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h +++ b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h @@ -70,7 +70,7 @@ class Q_COMPOSITOR_EXPORT WindowManagerServerIntegration : public QObject, publi { Q_OBJECT public: - explicit WindowManagerServerIntegration(QWaylandCompositor *compositor, QObject *parent = 0); + explicit WindowManagerServerIntegration(QWaylandCompositor *compositor, QObject *parent = Q_NULLPTR); ~WindowManagerServerIntegration(); void initialize(QtWayland::Display *waylandDisplay); |