diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 02:13:35 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 22:14:14 +0000 |
commit | 1c4cd066aaa4d51d468aa22d139b08ad8a81e484 (patch) | |
tree | e5edb329a9bddca9076926899209cbdb6e64b0b1 | |
parent | 66dba70b569aa26faff962c11050318d4c4517f5 (diff) |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
This amends a similar commit on 5.6.
Task-number: QTBUG-45291
Change-Id: I0d76f5c9b95db38f03771acaba1b4a80e4762ec9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/input/frontend/qabstractactioninput.h | 2 | ||||
-rw-r--r-- | src/input/frontend/qabstractaggregateactioninput.h | 2 | ||||
-rw-r--r-- | src/quick3d/imports/core/qt3dquick3dcoreplugin.h | 2 | ||||
-rw-r--r-- | src/quick3d/imports/input/qt3dquick3dinputplugin.h | 2 | ||||
-rw-r--r-- | src/render/framegraph/qrendersurfaceselector.h | 4 | ||||
-rw-r--r-- | src/render/frontend/qcomputejob.h | 4 | ||||
-rw-r--r-- | src/render/frontend/qrenderersettings.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qattribute.h | 6 | ||||
-rw-r--r-- | src/render/geometry/qconegeometry.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qconemesh.h | 2 | ||||
-rw-r--r-- | src/render/renderstates/qseamlesscubemap.h | 2 | ||||
-rw-r--r-- | src/render/texture/qtextureproviders.h | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/src/input/frontend/qabstractactioninput.h b/src/input/frontend/qabstractactioninput.h index 5e54c4831..076717aab 100644 --- a/src/input/frontend/qabstractactioninput.h +++ b/src/input/frontend/qabstractactioninput.h @@ -52,7 +52,7 @@ class QT3DINPUTSHARED_EXPORT QAbstractActionInput : public Qt3DCore::QNode { Q_OBJECT public: - explicit QAbstractActionInput(Qt3DCore::QNodePrivate &dd, Qt3DCore::QNode *parent = 0); + explicit QAbstractActionInput(Qt3DCore::QNodePrivate &dd, Qt3DCore::QNode *parent = nullptr); ~QAbstractActionInput(); }; diff --git a/src/input/frontend/qabstractaggregateactioninput.h b/src/input/frontend/qabstractaggregateactioninput.h index a921e84b2..0025dc8a3 100644 --- a/src/input/frontend/qabstractaggregateactioninput.h +++ b/src/input/frontend/qabstractaggregateactioninput.h @@ -55,7 +55,7 @@ class QT3DINPUTSHARED_EXPORT QAbstractAggregateActionInput : public Qt3DInput::Q { Q_OBJECT public: - explicit QAbstractAggregateActionInput(Qt3DInput::QAbstractAggregateActionInputPrivate &dd, Qt3DCore::QNode *parent = 0); + explicit QAbstractAggregateActionInput(Qt3DInput::QAbstractAggregateActionInputPrivate &dd, Qt3DCore::QNode *parent = nullptr); ~QAbstractAggregateActionInput(); void addInput(QAbstractActionInput *input); diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.h b/src/quick3d/imports/core/qt3dquick3dcoreplugin.h index ee1488981..48c7fd136 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.h +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.h @@ -56,7 +56,7 @@ class Qt3DQuick3DCorePlugin : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: - Qt3DQuick3DCorePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + Qt3DQuick3DCorePlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) Q_DECL_OVERRIDE; }; diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.h b/src/quick3d/imports/input/qt3dquick3dinputplugin.h index 63463b970..d644614e7 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.h +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.h @@ -56,7 +56,7 @@ class Qt3DQuick3DInputPlugin : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: - Qt3DQuick3DInputPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + Qt3DQuick3DInputPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) Q_DECL_OVERRIDE; }; diff --git a/src/render/framegraph/qrendersurfaceselector.h b/src/render/framegraph/qrendersurfaceselector.h index 602d2f429..165ab11ec 100644 --- a/src/render/framegraph/qrendersurfaceselector.h +++ b/src/render/framegraph/qrendersurfaceselector.h @@ -59,7 +59,7 @@ class QT3DRENDERSHARED_EXPORT QRenderSurfaceSelector : public Qt3DRender::QFrame Q_PROPERTY(QWindow *window READ window WRITE setWindow NOTIFY windowChanged) public: - explicit QRenderSurfaceSelector(Qt3DCore::QNode *parent = 0); + explicit QRenderSurfaceSelector(Qt3DCore::QNode *parent = nullptr); ~QRenderSurfaceSelector(); QSurface *surface() const; @@ -75,7 +75,7 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QRenderSurfaceSelector) - QRenderSurfaceSelector(QRenderSurfaceSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderSurfaceSelector(QRenderSurfaceSelectorPrivate &dd, Qt3DCore::QNode *parent = nullptr); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/frontend/qcomputejob.h b/src/render/frontend/qcomputejob.h index 654d90705..76625e20a 100644 --- a/src/render/frontend/qcomputejob.h +++ b/src/render/frontend/qcomputejob.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QComputeJob : public Qt3DCore::QComponent Q_OBJECT public: - explicit QComputeJob(Qt3DCore::QNode *parent = 0); + explicit QComputeJob(Qt3DCore::QNode *parent = nullptr); ~QComputeJob(); public Q_SLOTS: @@ -63,7 +63,7 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QComputeJob) - QComputeJob(QComputeJobPrivate &dd, Qt3DCore::QNode *parent = 0); + QComputeJob(QComputeJobPrivate &dd, Qt3DCore::QNode *parent = nullptr); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/frontend/qrenderersettings.h b/src/render/frontend/qrenderersettings.h index 4669e0505..a68193836 100644 --- a/src/render/frontend/qrenderersettings.h +++ b/src/render/frontend/qrenderersettings.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QRendererSettings : public Qt3DCore::QComponent Q_PROPERTY(PickResultMode pickResultMode READ pickResultMode WRITE setPickResultMode NOTIFY pickResultModeChanged) public: - explicit QRendererSettings(Qt3DCore::QNode *parent = 0); + explicit QRendererSettings(Qt3DCore::QNode *parent = nullptr); ~QRendererSettings(); enum PickMethod { @@ -84,7 +84,7 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QRendererSettings) - QRendererSettings(QRendererSettingsPrivate &dd, Qt3DCore::QNode *parent = 0); + QRendererSettings(QRendererSettingsPrivate &dd, Qt3DCore::QNode *parent = nullptr); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h index 6209225d0..6fbf83f4d 100644 --- a/src/render/geometry/qattribute.h +++ b/src/render/geometry/qattribute.h @@ -87,9 +87,9 @@ public: }; Q_ENUM(VertexBaseType) - explicit QAttribute(QNode *parent = 0); - explicit QAttribute(QBuffer *buf, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = 0); - explicit QAttribute(QBuffer *buf, const QString &name, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = 0); + explicit QAttribute(QNode *parent = nullptr); + explicit QAttribute(QBuffer *buf, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr); + explicit QAttribute(QBuffer *buf, const QString &name, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr); ~QAttribute(); QBuffer *buffer() const; diff --git a/src/render/geometry/qconegeometry.h b/src/render/geometry/qconegeometry.h index ca6514e8a..767cbc270 100644 --- a/src/render/geometry/qconegeometry.h +++ b/src/render/geometry/qconegeometry.h @@ -66,7 +66,7 @@ class QT3DRENDERSHARED_EXPORT QConeGeometry : public QGeometry Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT) public: - explicit QConeGeometry(QNode *parent = 0); + explicit QConeGeometry(QNode *parent = nullptr); ~QConeGeometry(); void updateVertices(); @@ -104,7 +104,7 @@ Q_SIGNALS: void lengthChanged( float length ); protected: - QConeGeometry(QConeGeometryPrivate &dd, QNode *parent = 0); + QConeGeometry(QConeGeometryPrivate &dd, QNode *parent = nullptr); private: Q_DECLARE_PRIVATE(QConeGeometry) diff --git a/src/render/geometry/qconemesh.h b/src/render/geometry/qconemesh.h index ef8231aa7..025489668 100644 --- a/src/render/geometry/qconemesh.h +++ b/src/render/geometry/qconemesh.h @@ -59,7 +59,7 @@ class QT3DRENDERSHARED_EXPORT QConeMesh : public QGeometryRenderer Q_PROPERTY( float bottomRadius READ bottomRadius WRITE setBottomRadius NOTIFY bottomRadiusChanged ) Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) public: - explicit QConeMesh(Qt3DCore::QNode *parent = 0); + explicit QConeMesh(Qt3DCore::QNode *parent = nullptr); ~QConeMesh(); int rings() const; diff --git a/src/render/renderstates/qseamlesscubemap.h b/src/render/renderstates/qseamlesscubemap.h index 7ba762dde..e86cbfe51 100644 --- a/src/render/renderstates/qseamlesscubemap.h +++ b/src/render/renderstates/qseamlesscubemap.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QSeamlessCubemap : public QRenderState Q_OBJECT public: - explicit QSeamlessCubemap(Qt3DCore::QNode *parent = 0); + explicit QSeamlessCubemap(Qt3DCore::QNode *parent = nullptr); ~QSeamlessCubemap(); protected: diff --git a/src/render/texture/qtextureproviders.h b/src/render/texture/qtextureproviders.h index 7b76c7e12..20a3a12cd 100644 --- a/src/render/texture/qtextureproviders.h +++ b/src/render/texture/qtextureproviders.h @@ -143,7 +143,7 @@ class QT3DRENDERSHARED_EXPORT QTextureLoader : public QAbstractTextureProvider Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) public: - explicit QTextureLoader(Qt3DCore::QNode *parent = 0); + explicit QTextureLoader(Qt3DCore::QNode *parent = nullptr); ~QTextureLoader(); QUrl source() const; |