From 792fb7c40e33fa34d6039956c48dea4bd82bb8d1 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 1 Mar 2016 02:13:35 +0100 Subject: Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. Task-number: QTBUG-45291 Change-Id: I1453477ad718335ca6c5c0c3447539cb93e21176 Reviewed-by: Sean Harmer --- src/core/aspects/qabstractaspect.h | 4 ++-- src/core/aspects/qaspectengine.h | 2 +- src/core/core-components/qcamera.h | 4 ++-- src/core/core-components/qcameralens.h | 4 ++-- src/core/jobs/qabstractaspectjobmanager_p.h | 2 +- src/core/nodes/qcomponent.h | 4 ++-- src/core/nodes/qentity.h | 4 ++-- src/core/nodes/qnode.h | 4 ++-- src/core/transforms/qtransform.h | 4 ++-- src/input/frontend/qabstractphysicaldevice.h | 4 ++-- src/input/frontend/qaxisactionhandler.h | 2 +- src/input/frontend/qinputaspect.h | 2 +- src/input/frontend/qinputdeviceintegration.h | 4 ++-- src/input/frontend/qkeyboardcontroller.h | 4 ++-- src/input/frontend/qkeyboardinput.h | 4 ++-- src/input/frontend/qmousecontroller.h | 4 ++-- src/input/frontend/qmouseinput.h | 4 ++-- src/logic/qlogicaspect.h | 2 +- src/logic/qlogiccomponent.h | 4 ++-- src/quick3d/quick3d/qqmlaspectengine.h | 2 +- src/render/defaults/qdiffusemapmaterial.h | 2 +- src/render/defaults/qdiffusespecularmapmaterial.h | 2 +- src/render/defaults/qforwardrenderer.h | 2 +- src/render/defaults/qgoochmaterial.h | 4 ++-- .../defaults/qnormaldiffusemapalphamaterial.h | 2 +- src/render/defaults/qnormaldiffusemapmaterial.h | 4 ++-- .../defaults/qnormaldiffusespecularmapmaterial.h | 4 ++-- src/render/defaults/qpervertexcolormaterial.h | 2 +- src/render/defaults/qphongalphamaterial.h | 2 +- src/render/defaults/qphongmaterial.h | 2 +- src/render/defaults/qskyboxentity.h | 2 +- src/render/framegraph/qcameraselector.h | 4 ++-- src/render/framegraph/qclearbuffer.h | 4 ++-- src/render/framegraph/qframegraph.h | 4 ++-- src/render/framegraph/qframegraphnode.h | 4 ++-- src/render/framegraph/qframegraphselector.h | 2 +- src/render/framegraph/qlayerfilter.h | 4 ++-- src/render/framegraph/qlighting.h | 4 ++-- src/render/framegraph/qnodraw.h | 2 +- src/render/framegraph/qrenderpassfilter.h | 4 ++-- src/render/framegraph/qrendertargetselector.h | 4 ++-- src/render/framegraph/qsortcriterion.h | 4 ++-- src/render/framegraph/qsortmethod.h | 4 ++-- src/render/framegraph/qstateset.h | 4 ++-- src/render/framegraph/qtechniquefilter.h | 4 ++-- src/render/framegraph/qviewport.h | 4 ++-- src/render/frontend/qabstractfunctor.h | 2 +- src/render/frontend/qlayer.h | 4 ++-- src/render/frontend/qrenderaspect.h | 4 ++-- src/render/frontend/qrenderattachment.h | 4 ++-- src/render/frontend/qrendertarget.h | 4 ++-- src/render/geometry/qabstractattribute.h | 8 ++++---- src/render/geometry/qabstractbuffer.h | 4 ++-- src/render/geometry/qattribute.h | 2 +- src/render/geometry/qboundingvolumespecifier.h | 2 +- src/render/geometry/qbuffer.h | 4 ++-- src/render/geometry/qcuboidmesh.h | 2 +- src/render/geometry/qcylindergeometry.h | 4 ++-- src/render/geometry/qcylindermesh.h | 2 +- src/render/geometry/qgeometry.h | 4 ++-- src/render/geometry/qgeometryrenderer.h | 4 ++-- src/render/geometry/qmesh.h | 4 ++-- src/render/geometry/qplanemesh.h | 2 +- src/render/geometry/qspheremesh.h | 2 +- src/render/geometry/qtorusgeometry.h | 4 ++-- src/render/geometry/qtorusmesh.h | 2 +- src/render/io/qabstractsceneloader.h | 4 ++-- src/render/io/qsceneloader.h | 2 +- src/render/io/qsceneparserplugin.h | 2 +- src/render/lights/qdirectionallight.h | 4 ++-- src/render/lights/qlight.h | 4 ++-- src/render/lights/qpointlight.h | 2 +- src/render/lights/qspotlight.h | 4 ++-- src/render/materialsystem/qannotation.h | 2 +- src/render/materialsystem/qeffect.h | 4 ++-- src/render/materialsystem/qgraphicsapifilter.h | 2 +- src/render/materialsystem/qmaterial.h | 4 ++-- src/render/materialsystem/qparameter.h | 8 ++++---- src/render/materialsystem/qparametermapping.h | 6 +++--- src/render/materialsystem/qrenderpass.h | 4 ++-- src/render/materialsystem/qshaderdata.h | 4 ++-- src/render/materialsystem/qshaderprogram.h | 4 ++-- src/render/materialsystem/qtechnique.h | 4 ++-- src/render/renderstates/qalphacoverage.h | 2 +- src/render/renderstates/qalphatest.h | 2 +- src/render/renderstates/qblendequation.h | 2 +- src/render/renderstates/qblendstate.h | 6 +++--- src/render/renderstates/qclipplane.h | 2 +- src/render/renderstates/qcullface.h | 2 +- src/render/renderstates/qdepthmask.h | 2 +- src/render/renderstates/qdepthtest.h | 2 +- src/render/renderstates/qdithering.h | 2 +- src/render/renderstates/qfrontface.h | 2 +- src/render/renderstates/qpointsize.h | 2 +- src/render/renderstates/qscissortest.h | 2 +- src/render/renderstates/qstencilmask.h | 2 +- src/render/renderstates/qstencilop.h | 2 +- src/render/renderstates/qstencilopseparate.h | 2 +- src/render/renderstates/qstenciltest.h | 2 +- src/render/renderstates/qstenciltestseparate.h | 2 +- src/render/texture/qabstracttextureimage.h | 4 ++-- src/render/texture/qabstracttextureprovider.h | 6 +++--- src/render/texture/qtextureimage.h | 2 +- src/render/texture/qtextureproviders.h | 22 +++++++++++----------- src/render/texture/qwrapmode.h | 4 ++-- 105 files changed, 180 insertions(+), 180 deletions(-) diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index e5842aa08..7724a6e02 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -61,10 +61,10 @@ class QT3DCORESHARED_EXPORT QAbstractAspect : public QObject Q_OBJECT public: - explicit QAbstractAspect(QObject *parent = 0); + explicit QAbstractAspect(QObject *parent = Q_NULLPTR); protected: - QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = 0); + QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = Q_NULLPTR); template void registerBackendType(const QBackendNodeFunctorPtr &functor); diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h index b472e4130..37d0ac22e 100644 --- a/src/core/aspects/qaspectengine.h +++ b/src/core/aspects/qaspectengine.h @@ -56,7 +56,7 @@ class QT3DCORESHARED_EXPORT QAspectEngine : public QObject { Q_OBJECT public: - explicit QAspectEngine(QObject *parent = 0); + explicit QAspectEngine(QObject *parent = Q_NULLPTR); ~QAspectEngine(); void setRootEntity(QEntity *root); diff --git a/src/core/core-components/qcamera.h b/src/core/core-components/qcamera.h index f09281c50..847041dbe 100644 --- a/src/core/core-components/qcamera.h +++ b/src/core/core-components/qcamera.h @@ -73,7 +73,7 @@ class QT3DCORESHARED_EXPORT QCamera : public QEntity Q_PROPERTY(QMatrix4x4 viewMatrix READ viewMatrix NOTIFY viewMatrixChanged) public: - explicit QCamera(QNode *parent = 0); + explicit QCamera(QNode *parent = Q_NULLPTR); ~QCamera(); enum CameraTranslationOption { @@ -159,7 +159,7 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QCamera) QT3D_CLONEABLE(QCamera) - QCamera(QCameraPrivate &dd, QNode *parent = 0); + QCamera(QCameraPrivate &dd, QNode *parent = Q_NULLPTR); }; } // namespace Qt3DCore diff --git a/src/core/core-components/qcameralens.h b/src/core/core-components/qcameralens.h index 120148e29..5cb0d8389 100644 --- a/src/core/core-components/qcameralens.h +++ b/src/core/core-components/qcameralens.h @@ -65,7 +65,7 @@ class QT3DCORESHARED_EXPORT QCameraLens : public QComponent Q_PROPERTY(QMatrix4x4 projectionMatrix READ projectionMatrix NOTIFY projectionMatrixChanged) public: - explicit QCameraLens(QNode *parent = 0); + explicit QCameraLens(QNode *parent = Q_NULLPTR); ~QCameraLens(); enum ProjectionType { @@ -122,7 +122,7 @@ Q_SIGNALS: void projectionMatrixChanged(const QMatrix4x4 &projectionMatrix); protected: - QCameraLens(QCameraLensPrivate &dd, QNode *parent = 0); + QCameraLens(QCameraLensPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h index 4397c746e..23ea8f6ac 100644 --- a/src/core/jobs/qabstractaspectjobmanager_p.h +++ b/src/core/jobs/qabstractaspectjobmanager_p.h @@ -60,7 +60,7 @@ class QAbstractAspectJobManager : public QObject { Q_OBJECT public: - explicit QAbstractAspectJobManager(QObject *p = 0); + explicit QAbstractAspectJobManager(QObject *p = Q_NULLPTR); virtual void initialize() {} virtual void enqueueJobs(const QVector &jobQueue) = 0; diff --git a/src/core/nodes/qcomponent.h b/src/core/nodes/qcomponent.h index 6751b2c64..cb91270d0 100644 --- a/src/core/nodes/qcomponent.h +++ b/src/core/nodes/qcomponent.h @@ -52,7 +52,7 @@ class QT3DCORESHARED_EXPORT QComponent : public QNode Q_PROPERTY(bool shareable READ shareable WRITE setShareable NOTIFY shareableChanged) public: - explicit QComponent(QNode *parent = 0); + explicit QComponent(QNode *parent = Q_NULLPTR); ~QComponent(); bool shareable() const; @@ -67,7 +67,7 @@ Q_SIGNALS: void enabledChanged(bool enabled); protected: - QComponent(QComponentPrivate &dd, QNode *parent = 0); + QComponent(QComponentPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h index be25eff8d..0e8da0800 100644 --- a/src/core/nodes/qentity.h +++ b/src/core/nodes/qentity.h @@ -55,7 +55,7 @@ class QT3DCORESHARED_EXPORT QEntity : public QNode { Q_OBJECT public: - explicit QEntity(QNode *parent = 0); + explicit QEntity(QNode *parent = Q_NULLPTR); virtual ~QEntity(); QComponentList components() const; @@ -67,7 +67,7 @@ public: QEntity *parentEntity() const; protected: - QEntity(QEntityPrivate &dd, QNode *parent = 0); + QEntity(QEntityPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index 5b9761538..65aa340e9 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -76,7 +76,7 @@ class QT3DCORESHARED_EXPORT QNode : public QObject Q_PROPERTY(Qt3DCore::QNode *parent READ parentNode WRITE setParent NOTIFY parentChanged) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) public: - explicit QNode(QNode *parent = 0); + explicit QNode(QNode *parent = Q_NULLPTR); virtual ~QNode(); const QNodeId id() const; @@ -101,7 +101,7 @@ protected: // Clone should only be made in the main thread static QNode *clone(QNode *node); - QNode(QNodePrivate &dd, QNode *parent = 0); + QNode(QNodePrivate &dd, QNode *parent = Q_NULLPTR); virtual void copy(const QNode *ref); virtual void sceneChangeEvent(const QSceneChangePtr &change); diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h index 00f69b125..ccb4e3e5b 100644 --- a/src/core/transforms/qtransform.h +++ b/src/core/transforms/qtransform.h @@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT QTransform : public QComponent Q_PROPERTY(QVector3D translation READ translation WRITE setTranslation NOTIFY translationChanged) public: - explicit QTransform(QNode *parent = 0); + explicit QTransform(QNode *parent = Q_NULLPTR); ~QTransform(); float scale() const; @@ -111,7 +111,7 @@ Q_SIGNALS: void matrixChanged(const QMatrix4x4 &matrix); protected: - QTransform(QTransformPrivate &dd, QNode *parent = 0); + QTransform(QTransformPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h index 8056a195b..5565bbaeb 100644 --- a/src/input/frontend/qabstractphysicaldevice.h +++ b/src/input/frontend/qabstractphysicaldevice.h @@ -54,7 +54,7 @@ class QT3DINPUTSHARED_EXPORT QAbstractPhysicalDevice : public Qt3DCore::QNode { Q_OBJECT public: - explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = 0); + explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAbstractPhysicalDevice(); virtual int axisCount() const = 0; @@ -70,7 +70,7 @@ public: QVector axisSettings() const; protected: - QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = 0); + QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); Q_DECLARE_PRIVATE(QAbstractPhysicalDevice) void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; }; diff --git a/src/input/frontend/qaxisactionhandler.h b/src/input/frontend/qaxisactionhandler.h index 388014f01..ed3c17884 100644 --- a/src/input/frontend/qaxisactionhandler.h +++ b/src/input/frontend/qaxisactionhandler.h @@ -70,7 +70,7 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QAxisActionHandler) - QAxisActionHandler(QAxisActionHandlerPrivate &dd, Qt3DCore::QNode *parent = 0); + QAxisActionHandler(QAxisActionHandlerPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; diff --git a/src/input/frontend/qinputaspect.h b/src/input/frontend/qinputaspect.h index 7a5b298af..4d81a2a51 100644 --- a/src/input/frontend/qinputaspect.h +++ b/src/input/frontend/qinputaspect.h @@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3DCore::QAbstractAspect Q_OBJECT Q_PROPERTY(Qt3DCore::QCamera* camera READ camera WRITE setCamera) public: - explicit QInputAspect(QObject *parent = 0); + explicit QInputAspect(QObject *parent = Q_NULLPTR); Qt3DCore::QCamera *camera() const; QAbstractPhysicalDevice *createPhysicalDevice(const QString &name); diff --git a/src/input/frontend/qinputdeviceintegration.h b/src/input/frontend/qinputdeviceintegration.h index 2ea8ea1ae..4816f2989 100644 --- a/src/input/frontend/qinputdeviceintegration.h +++ b/src/input/frontend/qinputdeviceintegration.h @@ -62,8 +62,8 @@ class QT3DINPUTSHARED_EXPORT QInputDeviceIntegration : public QObject { Q_OBJECT protected: - explicit QInputDeviceIntegration(QObject *parent = 0); - explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = 0); + explicit QInputDeviceIntegration(QObject *parent = Q_NULLPTR); + explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = Q_NULLPTR); template void registerBackendType(const Qt3DCore::QBackendNodeFunctorPtr &functor) diff --git a/src/input/frontend/qkeyboardcontroller.h b/src/input/frontend/qkeyboardcontroller.h index e929629d9..da57604b4 100644 --- a/src/input/frontend/qkeyboardcontroller.h +++ b/src/input/frontend/qkeyboardcontroller.h @@ -53,7 +53,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3DInput::QAbstractPh Q_PROPERTY(Qt3DInput::QKeyboardInput *activeInput READ activeInput NOTIFY activeInputChanged) public: - explicit QKeyboardController(QNode *parent = 0); + explicit QKeyboardController(QNode *parent = Q_NULLPTR); ~QKeyboardController(); QKeyboardInput *activeInput() const; @@ -66,7 +66,7 @@ public: int buttonIdentifier(const QString &name) const Q_DECL_FINAL; protected: - QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = 0); + QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = Q_NULLPTR); void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; Q_SIGNALS: diff --git a/src/input/frontend/qkeyboardinput.h b/src/input/frontend/qkeyboardinput.h index b7bc1a97d..0640ffc45 100644 --- a/src/input/frontend/qkeyboardinput.h +++ b/src/input/frontend/qkeyboardinput.h @@ -54,7 +54,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardInput : public Qt3DCore::QComponent Q_PROPERTY(Qt3DInput::QKeyboardController *controller READ controller WRITE setController NOTIFY controllerChanged) Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged) public: - explicit QKeyboardInput(QNode *parent = 0); + explicit QKeyboardInput(QNode *parent = Q_NULLPTR); ~QKeyboardInput(); QKeyboardController *controller() const; @@ -113,7 +113,7 @@ Q_SIGNALS: void released(Qt3DInput::QKeyEvent *event); protected: - QKeyboardInput(QKeyboardInputPrivate &dd, QNode *parent = 0); + QKeyboardInput(QKeyboardInputPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; void keyEvent(QKeyEvent *event); diff --git a/src/input/frontend/qmousecontroller.h b/src/input/frontend/qmousecontroller.h index 3773c652c..0394522ea 100644 --- a/src/input/frontend/qmousecontroller.h +++ b/src/input/frontend/qmousecontroller.h @@ -52,7 +52,7 @@ class QT3DINPUTSHARED_EXPORT QMouseController : public Qt3DInput::QAbstractPhysi Q_OBJECT Q_PROPERTY(float sensitivity READ sensitivity WRITE setSensitivity NOTIFY sensitivityChanged) public: - explicit QMouseController(Qt3DCore::QNode *parent = 0); + explicit QMouseController(Qt3DCore::QNode *parent = Q_NULLPTR); ~QMouseController(); enum Axis { @@ -84,7 +84,7 @@ Q_SIGNALS: void sensitivityChanged(float value); protected: - QMouseController(QMouseControllerPrivate &dd, Qt3DCore::QNode *parent = 0); + QMouseController(QMouseControllerPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; diff --git a/src/input/frontend/qmouseinput.h b/src/input/frontend/qmouseinput.h index ec6176bfd..72183bd12 100644 --- a/src/input/frontend/qmouseinput.h +++ b/src/input/frontend/qmouseinput.h @@ -55,7 +55,7 @@ class QT3DINPUTSHARED_EXPORT QMouseInput : public Qt3DCore::QComponent Q_PROPERTY(bool containsMouse READ containsMouse NOTIFY containsMouseChanged) public: - explicit QMouseInput(QNode *parent = 0); + explicit QMouseInput(QNode *parent = Q_NULLPTR); ~QMouseInput(); QMouseController *controller() const; @@ -82,7 +82,7 @@ Q_SIGNALS: void wheel(Qt3DInput::QWheelEvent *wheel); protected: - QMouseInput(QMouseInputPrivate &dd, Qt3DCore::QNode *parent = 0); + QMouseInput(QMouseInputPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; void mouseEvent(Qt3DInput::QMouseEvent *event); diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h index 3abc5e03b..b70d4801f 100644 --- a/src/logic/qlogicaspect.h +++ b/src/logic/qlogicaspect.h @@ -50,7 +50,7 @@ class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: - explicit QLogicAspect(QObject *parent = 0); + explicit QLogicAspect(QObject *parent = Q_NULLPTR); QVector jobsToExecute(qint64 time) Q_DECL_OVERRIDE; diff --git a/src/logic/qlogiccomponent.h b/src/logic/qlogiccomponent.h index 68d0bf69a..3d2e9739a 100644 --- a/src/logic/qlogiccomponent.h +++ b/src/logic/qlogiccomponent.h @@ -56,11 +56,11 @@ class QT3DLOGICSHARED_EXPORT QLogicComponent : public Qt3DCore::QComponent Q_OBJECT public: - explicit QLogicComponent(Qt3DCore::QNode *parent = 0); + explicit QLogicComponent(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLogicComponent(); protected: - QLogicComponent(QLogicComponentPrivate &dd, QNode *parent = 0); + QLogicComponent(QLogicComponentPrivate &dd, QNode *parent = Q_NULLPTR); Q_SIGNALS: void frameUpdate(float dt); diff --git a/src/quick3d/quick3d/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h index 7f742e83f..6c71f3edb 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.h +++ b/src/quick3d/quick3d/qqmlaspectengine.h @@ -54,7 +54,7 @@ class QT3DQUICKSHARED_EXPORT QQmlAspectEngine: public QObject public: enum Status { Null, Ready, Loading, Error }; - explicit QQmlAspectEngine(QObject *parent = 0); + explicit QQmlAspectEngine(QObject *parent = Q_NULLPTR); Status status() const; void setSource(const QUrl &source); diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index 5367abe9d..8725b89a6 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDiffuseMapMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h index 096c4ce88..4a0318cd9 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.h +++ b/src/render/defaults/qdiffusespecularmapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDiffuseSpecularMapMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h index 44f74983c..bbddbebfe 100644 --- a/src/render/defaults/qforwardrenderer.h +++ b/src/render/defaults/qforwardrenderer.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QForwardRenderer(Qt3DCore::QNode *parent = 0); + explicit QForwardRenderer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QForwardRenderer(); QRectF viewportRect() const; diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h index c7eba355d..b90233abc 100644 --- a/src/render/defaults/qgoochmaterial.h +++ b/src/render/defaults/qgoochmaterial.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QGoochMaterial : public QMaterial Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) public: - explicit QGoochMaterial(Qt3DCore::QNode *parent = 0); + explicit QGoochMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); QColor diffuse() const; QColor specular() const; QColor cool() const; @@ -86,7 +86,7 @@ Q_SIGNALS: void shininessChanged(float shininess); protected: - QGoochMaterial(QGoochMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QGoochMaterial(QGoochMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QGoochMaterial) diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h index 57b53e2a4..5875bbd4c 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.h +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h @@ -49,7 +49,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDif { Q_OBJECT public: - explicit QNormalDiffuseMapAlphaMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseMapAlphaMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseMapAlphaMaterial(); private: diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h index 835c0a155..d6ca4edc8 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.h +++ b/src/render/defaults/qnormaldiffusemapmaterial.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseMapMaterial(); QColor ambient() const; @@ -85,7 +85,7 @@ Q_SIGNALS: void textureScaleChanged(float textureScale); protected: - QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial) diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h index 2e72cc0fa..263c8fecd 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMateri Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseSpecularMapMaterial(); QColor ambient() const; @@ -84,7 +84,7 @@ Q_SIGNALS: void textureScaleChanged(float textureScale); protected: - QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QNormalDiffuseSpecularMapMaterial) diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h index 300eab170..0e7125e3d 100644 --- a/src/render/defaults/qpervertexcolormaterial.h +++ b/src/render/defaults/qpervertexcolormaterial.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial Q_OBJECT public: - explicit QPerVertexColorMaterial(Qt3DCore::QNode *parent = 0); + explicit QPerVertexColorMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPerVertexColorMaterial(); private: diff --git a/src/render/defaults/qphongalphamaterial.h b/src/render/defaults/qphongalphamaterial.h index 556777184..263ca344e 100644 --- a/src/render/defaults/qphongalphamaterial.h +++ b/src/render/defaults/qphongalphamaterial.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QPhongAlphaMaterial : public QMaterial Q_PROPERTY(float alpha READ alpha WRITE setAlpha NOTIFY alphaChanged) public: - explicit QPhongAlphaMaterial(Qt3DCore::QNode *parent = 0); + explicit QPhongAlphaMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPhongAlphaMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h index d9c50d515..2c1dfcfc5 100644 --- a/src/render/defaults/qphongmaterial.h +++ b/src/render/defaults/qphongmaterial.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QPhongMaterial : public QMaterial Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) public: - explicit QPhongMaterial(Qt3DCore::QNode *parent = 0); + explicit QPhongMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPhongMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h index 4dfa84804..935710d2a 100644 --- a/src/render/defaults/qskyboxentity.h +++ b/src/render/defaults/qskyboxentity.h @@ -50,7 +50,7 @@ class QT3DRENDERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity { Q_OBJECT public: - explicit QSkyboxEntity(Qt3DCore::QNode *parent = 0); + explicit QSkyboxEntity(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSkyboxEntity(); void setBaseName(const QString &path); diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h index b5a14bfb5..3be2c30a6 100644 --- a/src/render/framegraph/qcameraselector.h +++ b/src/render/framegraph/qcameraselector.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QCameraSelector : public QFrameGraphNode Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QCameraSelector(Qt3DCore::QNode *parent = 0); + explicit QCameraSelector(Qt3DCore::QNode *parent = Q_NULLPTR); ~QCameraSelector(); Qt3DCore::QEntity *camera() const; @@ -64,7 +64,7 @@ Q_SIGNALS: void cameraChanged(Qt3DCore::QEntity *camera); protected: - QCameraSelector(QCameraSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + QCameraSelector(QCameraSelectorPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qclearbuffer.h b/src/render/framegraph/qclearbuffer.h index 06ac480b2..54114526d 100644 --- a/src/render/framegraph/qclearbuffer.h +++ b/src/render/framegraph/qclearbuffer.h @@ -50,7 +50,7 @@ class QT3DRENDERSHARED_EXPORT QClearBuffer : public QFrameGraphNode Q_OBJECT Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged) public: - explicit QClearBuffer(Qt3DCore::QNode *parent = 0); + explicit QClearBuffer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QClearBuffer(); enum BufferType { @@ -74,7 +74,7 @@ Q_SIGNALS: void buffersChanged(BufferType buffers); protected: - QClearBuffer(QClearBufferPrivate &dd, Qt3DCore::QNode *parent = 0); + QClearBuffer(QClearBufferPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qframegraph.h b/src/render/framegraph/qframegraph.h index 3c8604eb7..3ed2c4125 100644 --- a/src/render/framegraph/qframegraph.h +++ b/src/render/framegraph/qframegraph.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent Q_CLASSINFO("DefaultProperty", "activeFrameGraph") public: - explicit QFrameGraph(Qt3DCore::QNode *parent = 0); + explicit QFrameGraph(Qt3DCore::QNode *parent = Q_NULLPTR); ~QFrameGraph(); QFrameGraphNode *activeFrameGraph() const; @@ -68,7 +68,7 @@ Q_SIGNALS: void activeFrameGraphChanged(QFrameGraphNode *activeFrameGraph); protected: - QFrameGraph(QFrameGraphPrivate &dd, Qt3DCore::QNode *parent = 0); + QFrameGraph(QFrameGraphPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index 851b2fd74..36248cbc0 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode Q_OBJECT Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) public: - explicit QFrameGraphNode(Qt3DCore::QNode *parent = 0); + explicit QFrameGraphNode(Qt3DCore::QNode *parent = Q_NULLPTR); ~QFrameGraphNode(); QFrameGraphNode *parentFrameGraphNode() const; @@ -63,7 +63,7 @@ public Q_SLOTS: void setEnabled(bool enabled); protected: - QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = 0); + QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); Q_SIGNALS: void enabledChanged(bool enabled); diff --git a/src/render/framegraph/qframegraphselector.h b/src/render/framegraph/qframegraphselector.h index e88fcbba8..8114dbcf2 100644 --- a/src/render/framegraph/qframegraphselector.h +++ b/src/render/framegraph/qframegraphselector.h @@ -59,7 +59,7 @@ class QT3DRENDERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode { Q_OBJECT public: - explicit QFrameGraphSelector(Qt3DCore::QNode *parent = 0); + explicit QFrameGraphSelector(Qt3DCore::QNode *parent = Q_NULLPTR); ~QFrameGraphSelector(); QFrameGraphSelectorFunctorPtr selectionFunctor() const; diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index 749acbb2b..a3e5d8af5 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QLayerFilter : public QFrameGraphNode Q_OBJECT Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged) public: - explicit QLayerFilter(Qt3DCore::QNode *parent = 0); + explicit QLayerFilter(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLayerFilter(); QStringList layers() const; @@ -63,7 +63,7 @@ Q_SIGNALS: void layersChanged(const QStringList &layers); protected: - QLayerFilter(QLayerFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + QLayerFilter(QLayerFilterPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qlighting.h b/src/render/framegraph/qlighting.h index dab2f056e..603fe8e46 100644 --- a/src/render/framegraph/qlighting.h +++ b/src/render/framegraph/qlighting.h @@ -50,11 +50,11 @@ class QT3DRENDERSHARED_EXPORT QLighting : public QFrameGraphNode Q_OBJECT public: - explicit QLighting(Qt3DCore::QNode *parent = 0); + explicit QLighting(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLighting(); protected: - QLighting(QLightingPrivate &dd, Qt3DCore::QNode *parent = 0); + QLighting(QLightingPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h index 312e0c808..5e33d411c 100644 --- a/src/render/framegraph/qnodraw.h +++ b/src/render/framegraph/qnodraw.h @@ -47,7 +47,7 @@ class QT3DRENDERSHARED_EXPORT QNoDraw : public QFrameGraphNode { Q_OBJECT public: - explicit QNoDraw(Qt3DCore::QNode *parent = 0); + explicit QNoDraw(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNoDraw(); private: diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index 941a22a8f..4060c267c 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode Q_OBJECT public: - explicit QRenderPassFilter(Qt3DCore::QNode *parent = 0); + explicit QRenderPassFilter(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderPassFilter(); QList includes() const; @@ -67,7 +67,7 @@ public: QList parameters() const; protected: - QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index d2fbb81b8..3b6b86d71 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode Q_OBJECT Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) public: - explicit QRenderTargetSelector(Qt3DCore::QNode *parent = 0); + explicit QRenderTargetSelector(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderTargetSelector(); QRenderTarget *target() const; @@ -69,7 +69,7 @@ Q_SIGNALS: void targetChanged(QRenderTarget *target); protected: - QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h index e38356e66..44f047b13 100644 --- a/src/render/framegraph/qsortcriterion.h +++ b/src/render/framegraph/qsortcriterion.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode Q_OBJECT Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) public: - explicit QSortCriterion(Qt3DCore::QNode *parent = 0); + explicit QSortCriterion(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSortCriterion(); enum SortType { @@ -70,7 +70,7 @@ Q_SIGNALS: void sortChanged(SortType sort); protected: - QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = 0); + QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qsortmethod.h b/src/render/framegraph/qsortmethod.h index e8866a726..bffce84c5 100644 --- a/src/render/framegraph/qsortmethod.h +++ b/src/render/framegraph/qsortmethod.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QSortMethod : public QFrameGraphNode Q_OBJECT public: - explicit QSortMethod(Qt3DCore::QNode *parent = 0); + explicit QSortMethod(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSortMethod(); void addCriterion(QSortCriterion *criterion); @@ -59,7 +59,7 @@ public: QList criteria() const; protected: - QSortMethod(QSortMethodPrivate &dd, Qt3DCore::QNode *parent = 0); + QSortMethod(QSortMethodPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qstateset.h b/src/render/framegraph/qstateset.h index db9972a45..c9838a403 100644 --- a/src/render/framegraph/qstateset.h +++ b/src/render/framegraph/qstateset.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QStateSet : public QFrameGraphNode Q_OBJECT public: - explicit QStateSet(Qt3DCore::QNode *parent = 0); + explicit QStateSet(Qt3DCore::QNode *parent = Q_NULLPTR); ~QStateSet(); void addRenderState(QRenderState *state); @@ -59,7 +59,7 @@ public: QList renderStates() const; protected: - QStateSet(QStateSetPrivate &dd, Qt3DCore::QNode *parent = 0); + QStateSet(QStateSetPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index 7637941dc..90f5f7e28 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode { Q_OBJECT public: - explicit QTechniqueFilter(Qt3DCore::QNode *parent = 0); + explicit QTechniqueFilter(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTechniqueFilter(); QList criteria() const; @@ -64,7 +64,7 @@ public: QList parameters() const; protected: - QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index 91cdae73e..4dd4c17e9 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) public: - explicit QViewport(Qt3DCore::QNode *parent = 0); + explicit QViewport(Qt3DCore::QNode *parent = Q_NULLPTR); ~QViewport(); QRectF rect() const; @@ -69,7 +69,7 @@ Q_SIGNALS: void clearColorChanged(const QColor &clearColor); protected: - QViewport(QViewportPrivate &dd, Qt3DCore::QNode *parent = 0); + QViewport(QViewportPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/frontend/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h index da96da124..7bcfd1da6 100644 --- a/src/render/frontend/qabstractfunctor.h +++ b/src/render/frontend/qabstractfunctor.h @@ -53,7 +53,7 @@ struct FunctorType // The MSVC linker can under some cases optimize all the template // functions into a single function. The code below is there to ensure // that the linker won't collapse all these distincts functions into one - static T *t = 0; + static T *t = Q_NULLPTR; return reinterpret_cast(t); } }; diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index 1d5e7bd78..3405f368c 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent Q_OBJECT Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged) public: - explicit QLayer(Qt3DCore::QNode *parent = 0); + explicit QLayer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLayer(); QStringList names() const; @@ -64,7 +64,7 @@ Q_SIGNALS: void namesChanged(const QStringList &names); protected: - QLayer(QLayerPrivate &dd, Qt3DCore::QNode *parent = 0); + QLayer(QLayerPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h index d7398dab7..2213e10cc 100644 --- a/src/render/frontend/qrenderaspect.h +++ b/src/render/frontend/qrenderaspect.h @@ -61,8 +61,8 @@ public: Threaded }; - explicit QRenderAspect(QObject *parent = 0); - explicit QRenderAspect(RenderType type, QObject *parent = 0); + explicit QRenderAspect(QObject *parent = Q_NULLPTR); + explicit QRenderAspect(RenderType type, QObject *parent = Q_NULLPTR); void renderInitialize(QOpenGLContext *context); void renderSynchronous(); diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h index 6560c08b6..a4efe299f 100644 --- a/src/render/frontend/qrenderattachment.h +++ b/src/render/frontend/qrenderattachment.h @@ -91,7 +91,7 @@ public: }; Q_ENUM(CubeMapFace) - explicit QRenderAttachment(Qt3DCore::QNode *parent = 0); + explicit QRenderAttachment(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderAttachment(); RenderAttachmentType type() const; @@ -118,7 +118,7 @@ Q_SIGNALS: void nameChanged(const QString &name); protected: - QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index 930e57764..0010c68cd 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent { Q_OBJECT public: - explicit QRenderTarget(Qt3DCore::QNode *parent = 0); + explicit QRenderTarget(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderTarget(); void addAttachment(QRenderAttachment *attachment); @@ -59,7 +59,7 @@ public: QList attachments() const; protected: - QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/geometry/qabstractattribute.h b/src/render/geometry/qabstractattribute.h index 7afc24a27..29d1e44f3 100644 --- a/src/render/geometry/qabstractattribute.h +++ b/src/render/geometry/qabstractattribute.h @@ -84,9 +84,9 @@ public: }; Q_ENUM(DataType) - explicit QAbstractAttribute(QNode *parent = 0); + explicit QAbstractAttribute(QNode *parent = Q_NULLPTR); ~QAbstractAttribute(); - QAbstractAttribute(QAbstractBuffer *buf, DataType dataType, uint dataSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = 0); + QAbstractAttribute(QAbstractBuffer *buf, DataType dataType, uint dataSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = Q_NULLPTR); QAbstractBuffer *buffer() const; QString name() const; @@ -126,8 +126,8 @@ Q_SIGNALS: void attributeTypeChanged(AttributeType attributeType); protected: - QAbstractAttribute(QAbstractAttributePrivate &dd, QNode *parent = 0); - QAbstractAttribute(QAbstractAttributePrivate &dd, QAbstractBuffer *buf, const QString &name, DataType dataType, uint dataSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = 0); + QAbstractAttribute(QAbstractAttributePrivate &dd, QNode *parent = Q_NULLPTR); + QAbstractAttribute(QAbstractAttributePrivate &dd, QAbstractBuffer *buf, const QString &name, DataType dataType, uint dataSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; diff --git a/src/render/geometry/qabstractbuffer.h b/src/render/geometry/qabstractbuffer.h index 477f96cc1..b62907eb2 100644 --- a/src/render/geometry/qabstractbuffer.h +++ b/src/render/geometry/qabstractbuffer.h @@ -51,14 +51,14 @@ class QT3DRENDERSHARED_EXPORT QAbstractBuffer : public Qt3DCore::QNode { Q_OBJECT public: - QAbstractBuffer(QNode *parent = 0); + QAbstractBuffer(QNode *parent = Q_NULLPTR); virtual ~QAbstractBuffer(); void setData(const QByteArray &bytes); QByteArray data() const; protected: - QAbstractBuffer(QAbstractBufferPrivate &dd, QNode *parent = 0); + QAbstractBuffer(QAbstractBufferPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; Q_SIGNALS: diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h index 005beb1fb..274aecb8d 100644 --- a/src/render/geometry/qattribute.h +++ b/src/render/geometry/qattribute.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QAttribute : public QAbstractAttribute Q_OBJECT public: - explicit QAttribute(Qt3DCore::QNode *parent = 0); + explicit QAttribute(Qt3DCore::QNode *parent = Q_NULLPTR); QAttribute(QBuffer *buf, DataType type, uint dataSize, int count, int offset=0, int stride = 0); QAttribute(QBuffer *buf, const QString &name, DataType type, uint dataSize, int count, int offset=0, int stride = 0); ~QAttribute(); diff --git a/src/render/geometry/qboundingvolumespecifier.h b/src/render/geometry/qboundingvolumespecifier.h index cbc84c94f..34b61d51a 100644 --- a/src/render/geometry/qboundingvolumespecifier.h +++ b/src/render/geometry/qboundingvolumespecifier.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QBoundingVolumeSpecifier : public QObject Q_OBJECT Q_PROPERTY(Qt3DRender::QAbstractAttribute *positionAttribute READ positionAttribute WRITE setPositionAttribute NOTIFY positionAttributeChanged) public: - explicit QBoundingVolumeSpecifier(QObject *parent = 0); + explicit QBoundingVolumeSpecifier(QObject *parent = Q_NULLPTR); QAbstractAttribute *positionAttribute() const; diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index 8b91a3efd..5034d7106 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -80,7 +80,7 @@ public: }; Q_ENUM(UsageType) - explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = 0); + explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = Q_NULLPTR); ~QBuffer(); UsageType usage() const; @@ -96,7 +96,7 @@ public Q_SLOTS: void setSync(bool sync); protected: - QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, Qt3DCore::QNode *parent = 0); + QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h index 84a58a215..ea369cdc4 100644 --- a/src/render/geometry/qcuboidmesh.h +++ b/src/render/geometry/qcuboidmesh.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer Q_PROPERTY(QSize xyMeshResolution READ xyMeshResolution WRITE setXYMeshResolution NOTIFY xyMeshResolutionChanged) public: - explicit QCuboidMesh(Qt3DCore::QNode *parent = 0); + explicit QCuboidMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QCuboidMesh(); float xExtent() const; diff --git a/src/render/geometry/qcylindergeometry.h b/src/render/geometry/qcylindergeometry.h index 74b520e0e..24e280928 100644 --- a/src/render/geometry/qcylindergeometry.h +++ b/src/render/geometry/qcylindergeometry.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QCylinderGeometry : public QGeometry Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT) public: - explicit QCylinderGeometry(QNode *parent = 0); + explicit QCylinderGeometry(QNode *parent = Q_NULLPTR); ~QCylinderGeometry(); void updateVertices(); @@ -89,7 +89,7 @@ Q_SIGNALS: void lengthChanged(float length); protected: - QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent = 0); + QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QCylinderGeometry) diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h index 93f28a092..2dcc60b7f 100644 --- a/src/render/geometry/qcylindermesh.h +++ b/src/render/geometry/qcylindermesh.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) public: - explicit QCylinderMesh(Qt3DCore::QNode *parent = 0); + explicit QCylinderMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QCylinderMesh(); int rings() const; diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h index 5a8722383..e0a22e50a 100644 --- a/src/render/geometry/qgeometry.h +++ b/src/render/geometry/qgeometry.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged) Q_PROPERTY(Qt3DRender::QBoundingVolumeSpecifier *boundingVolumeSpecifier READ boundingVolumeSpecifier CONSTANT) public: - explicit QGeometry(Qt3DCore::QNode *parent = 0); + explicit QGeometry(Qt3DCore::QNode *parent = Q_NULLPTR); ~QGeometry(); QAttributeList attributes() const; @@ -74,7 +74,7 @@ Q_SIGNALS: void verticesPerPatchChanged(int verticesPerPatch); protected: - QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = 0); + QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index e58b648b3..290d13b29 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -63,7 +63,7 @@ class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged) public: - explicit QGeometryRenderer(Qt3DCore::QNode *parent = 0); + explicit QGeometryRenderer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QGeometryRenderer(); enum PrimitiveType { @@ -118,7 +118,7 @@ Q_SIGNALS: void primitiveTypeChanged(PrimitiveType primitiveType); protected: - QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = 0); + QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index 58985789a..072ad2dd2 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer Q_PROPERTY(QString subMesh READ subMesh WRITE setSubMesh NOTIFY subMeshChanged) public: - explicit QMesh(Qt3DCore::QNode *parent = 0); + explicit QMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QMesh(); QUrl source() const; @@ -73,7 +73,7 @@ Q_SIGNALS: void subMeshChanged(const QString &subMesh); protected: - QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = 0); + QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QMesh) diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h index e5db1a099..8c2e6a4de 100644 --- a/src/render/geometry/qplanemesh.h +++ b/src/render/geometry/qplanemesh.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged) public: - explicit QPlaneMesh(Qt3DCore::QNode *parent = 0); + explicit QPlaneMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPlaneMesh(); float width() const; diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h index a80f7f0c9..5eca84128 100644 --- a/src/render/geometry/qspheremesh.h +++ b/src/render/geometry/qspheremesh.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QSphereMesh : public QGeometryRenderer Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged) public: - explicit QSphereMesh(Qt3DCore::QNode *parent = 0); + explicit QSphereMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSphereMesh(); int rings() const; diff --git a/src/render/geometry/qtorusgeometry.h b/src/render/geometry/qtorusgeometry.h index 08a82a0f3..874e0e7a7 100644 --- a/src/render/geometry/qtorusgeometry.h +++ b/src/render/geometry/qtorusgeometry.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QTorusGeometry : public QGeometry Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT) public: - explicit QTorusGeometry(QNode *parent = 0); + explicit QTorusGeometry(QNode *parent = Q_NULLPTR); ~QTorusGeometry(); void updateVertices(); @@ -90,7 +90,7 @@ Q_SIGNALS: protected: - QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent = 0); + QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QTorusGeometry) diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h index c04d7fbc7..be8ed58e4 100644 --- a/src/render/geometry/qtorusmesh.h +++ b/src/render/geometry/qtorusmesh.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QTorusMesh : public QGeometryRenderer Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged) public: - explicit QTorusMesh(Qt3DCore::QNode *parent = 0); + explicit QTorusMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTorusMesh(); int rings() const; diff --git a/src/render/io/qabstractsceneloader.h b/src/render/io/qabstractsceneloader.h index 599ca1fc7..3bea49f08 100644 --- a/src/render/io/qabstractsceneloader.h +++ b/src/render/io/qabstractsceneloader.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QAbstractSceneLoader : public Qt3DCore::QComponent Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) public: - explicit QAbstractSceneLoader(Qt3DCore::QNode *parent = 0); + explicit QAbstractSceneLoader(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAbstractSceneLoader(); enum Status { @@ -77,7 +77,7 @@ Q_SIGNALS: void statusChanged(Status status); protected: - QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3DCore::QNode *parent = 0); + QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index d90747b10..851bcb8f6 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -47,7 +47,7 @@ class QT3DRENDERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader { Q_OBJECT public: - explicit QSceneLoader(Qt3DCore::QNode *parent = 0); + explicit QSceneLoader(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSceneLoader(); void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; diff --git a/src/render/io/qsceneparserplugin.h b/src/render/io/qsceneparserplugin.h index 102473a4d..5d1334b35 100644 --- a/src/render/io/qsceneparserplugin.h +++ b/src/render/io/qsceneparserplugin.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QSceneParserPlugin : public QObject { Q_OBJECT public: - explicit QSceneParserPlugin(QObject *parent = 0); + explicit QSceneParserPlugin(QObject *parent = Q_NULLPTR); ~QSceneParserPlugin(); virtual QAbstractSceneParser *create(const QString &key, const QStringList ¶mList); diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h index bffb601a5..874c09dfa 100644 --- a/src/render/lights/qdirectionallight.h +++ b/src/render/lights/qdirectionallight.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QDirectionalLight : public QLight Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged) public: - explicit QDirectionalLight(Qt3DCore::QNode *parent = 0); + explicit QDirectionalLight(Qt3DCore::QNode *parent = Q_NULLPTR); QVector3D direction() const; @@ -62,7 +62,7 @@ Q_SIGNALS: void directionChanged(const QVector3D &direction); protected: - QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = 0); + QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/lights/qlight.h b/src/render/lights/qlight.h index febff442c..ffec5d12b 100644 --- a/src/render/lights/qlight.h +++ b/src/render/lights/qlight.h @@ -64,7 +64,7 @@ public : }; Q_ENUM(Type) - explicit QLight(Qt3DCore::QNode *parent = 0); + explicit QLight(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLight(); Type type() const; @@ -77,7 +77,7 @@ public Q_SLOTS: void setIntensity(float intensity); protected : - QLight(QLightPrivate &dd, Qt3DCore::QNode *parent = 0); + QLight(QLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; Q_SIGNALS: diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h index 62e8ebcb6..4ef082082 100644 --- a/src/render/lights/qpointlight.h +++ b/src/render/lights/qpointlight.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QPointLight : public QLight Q_PROPERTY(QVector3D attenuation READ attenuation WRITE setAttenuation NOTIFY attenuationChanged) public: - explicit QPointLight(Qt3DCore::QNode *parent = 0); + explicit QPointLight(Qt3DCore::QNode *parent = Q_NULLPTR); QVector3D attenuation() const; diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h index 4c3c5dd53..dd19bc61c 100644 --- a/src/render/lights/qspotlight.h +++ b/src/render/lights/qspotlight.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QSpotLight : public QPointLight Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged) public: - explicit QSpotLight(Qt3DCore::QNode *parent = 0); + explicit QSpotLight(Qt3DCore::QNode *parent = Q_NULLPTR); QVector3D direction() const; float cutOffAngle() const; @@ -66,7 +66,7 @@ Q_SIGNALS: void cutOffAngleChanged(float cutOffAngle); protected: - QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = 0); + QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qannotation.h b/src/render/materialsystem/qannotation.h index 1cf73186d..2b16d26cd 100644 --- a/src/render/materialsystem/qannotation.h +++ b/src/render/materialsystem/qannotation.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QAnnotation : public Qt3DCore::QNode Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) public: - explicit QAnnotation(Qt3DCore::QNode *parent = 0); + explicit QAnnotation(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAnnotation(); QVariant value() const; diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index 0f806f02b..2a921b6fc 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QEffect { Q_OBJECT public: - explicit QEffect(Qt3DCore::QNode *parent = 0); + explicit QEffect(Qt3DCore::QNode *parent = Q_NULLPTR); ~QEffect(); void addParameter(QParameter *parameter); @@ -65,7 +65,7 @@ public: QList techniques() const; protected: - QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = 0); + QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qgraphicsapifilter.h b/src/render/materialsystem/qgraphicsapifilter.h index 8ebf44096..93981a79f 100644 --- a/src/render/materialsystem/qgraphicsapifilter.h +++ b/src/render/materialsystem/qgraphicsapifilter.h @@ -75,7 +75,7 @@ public: }; Q_ENUM(Profile) - explicit QGraphicsApiFilter(QObject *parent = 0); + explicit QGraphicsApiFilter(QObject *parent = Q_NULLPTR); void copy(const QGraphicsApiFilter &ref); diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index cfb0bad48..381e72ad1 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) public: - explicit QMaterial(Qt3DCore::QNode *parent = 0); + explicit QMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QMaterial(); QEffect *effect() const; @@ -78,7 +78,7 @@ Q_SIGNALS: void effectChanged(QEffect *effect); protected: - QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index 94b0f2889..579452cab 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -55,10 +55,10 @@ class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) public: - explicit QParameter(Qt3DCore::QNode *parent = 0); + explicit QParameter(Qt3DCore::QNode *parent = Q_NULLPTR); ~QParameter(); - QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = 0); - QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = 0); + QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = Q_NULLPTR); + QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = Q_NULLPTR); QString name() const; @@ -77,7 +77,7 @@ Q_SIGNALS: void nameChanged(const QString &name); protected: - QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = 0); + QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qparametermapping.h b/src/render/materialsystem/qparametermapping.h index eb8a258f4..cffe2d848 100644 --- a/src/render/materialsystem/qparametermapping.h +++ b/src/render/materialsystem/qparametermapping.h @@ -64,8 +64,8 @@ public: }; Q_ENUM(Binding) - explicit QParameterMapping(Qt3DCore::QNode *parent = 0); - QParameterMapping(const QString ¶meterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3DCore::QNode *parent = 0); + explicit QParameterMapping(Qt3DCore::QNode *parent = Q_NULLPTR); + QParameterMapping(const QString ¶meterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3DCore::QNode *parent = Q_NULLPTR); ~QParameterMapping(); QString parameterName() const; @@ -83,7 +83,7 @@ Q_SIGNALS: void bindingTypeChanged(Binding bindingType); protected: - QParameterMapping(QParameterMappingPrivate &dd, Qt3DCore::QNode *parent = 0); + QParameterMapping(QParameterMappingPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index e1622ba7f..7421c0f95 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -64,7 +64,7 @@ class QT3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) public: - explicit QRenderPass(Qt3DCore::QNode *parent = 0); + explicit QRenderPass(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderPass(); QString glslNameForParameter(QString paramName) const; @@ -97,7 +97,7 @@ Q_SIGNALS: void shaderProgramChanged(QShaderProgram *shaderProgram); protected: - QRenderPass(QRenderPassPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderPass(QRenderPassPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 5d18eda70..002d43915 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -59,7 +59,7 @@ class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent { Q_OBJECT public: - explicit QShaderData(Qt3DCore::QNode *parent = 0); + explicit QShaderData(Qt3DCore::QNode *parent = Q_NULLPTR); ~QShaderData(); enum TransformType { @@ -71,7 +71,7 @@ public: PropertyReaderInterfacePtr propertyReader() const; protected: - QShaderData(QShaderDataPrivate &dd, Qt3DCore::QNode *parent = 0); + QShaderData(QShaderDataPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h index 1a1314156..87a841653 100644 --- a/src/render/materialsystem/qshaderprogram.h +++ b/src/render/materialsystem/qshaderprogram.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode Q_PROPERTY(QByteArray computeShaderCode READ computeShaderCode WRITE setComputeShaderCode NOTIFY computeShaderCodeChanged) public: - explicit QShaderProgram(Qt3DCore::QNode *parent = 0); + explicit QShaderProgram(Qt3DCore::QNode *parent = Q_NULLPTR); ~QShaderProgram(); enum ShaderType { @@ -100,7 +100,7 @@ Q_SIGNALS: void computeShaderCodeChanged(const QByteArray &computeShaderCode); protected: - QShaderProgram(QShaderProgramPrivate &dd, Qt3DCore::QNode *parent = 0); + QShaderProgram(QShaderProgramPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index 9a680c6c5..8c5c34da0 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode Q_PROPERTY(Qt3DRender::QGraphicsApiFilter *graphicsApiFilter READ graphicsApiFilter CONSTANT) public: - explicit QTechnique(Qt3DCore::QNode *parent = 0); + explicit QTechnique(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTechnique(); void addAnnotation(QAnnotation *criterion); @@ -76,7 +76,7 @@ public: QGraphicsApiFilter *graphicsApiFilter(); protected: - QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = 0); + QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h index 7e0487688..2586bc531 100644 --- a/src/render/renderstates/qalphacoverage.h +++ b/src/render/renderstates/qalphacoverage.h @@ -50,7 +50,7 @@ class QT3DRENDERSHARED_EXPORT QAlphaCoverage : public QRenderState { Q_OBJECT public: - explicit QAlphaCoverage(Qt3DCore::QNode *parent = 0); + explicit QAlphaCoverage(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAlphaCoverage(); private: diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index 7465e18c3..59959138d 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -65,7 +65,7 @@ public: }; Q_ENUM(AlphaFunc) - explicit QAlphaTest(Qt3DCore::QNode *parent = 0); + explicit QAlphaTest(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAlphaTest(); AlphaFunc func() const; diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index f5e58d1fe..83bfce5b4 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -62,7 +62,7 @@ public: }; Q_ENUM(BlendMode) - explicit QBlendEquation(Qt3DCore::QNode *parent = 0); + explicit QBlendEquation(Qt3DCore::QNode *parent = Q_NULLPTR); ~QBlendEquation(); BlendMode mode() const; diff --git a/src/render/renderstates/qblendstate.h b/src/render/renderstates/qblendstate.h index 5d9d53787..4413d4a28 100644 --- a/src/render/renderstates/qblendstate.h +++ b/src/render/renderstates/qblendstate.h @@ -80,7 +80,7 @@ public: }; Q_ENUM(Blending) - explicit QBlendState(Qt3DCore::QNode *parent = 0); + explicit QBlendState(Qt3DCore::QNode *parent = Q_NULLPTR); ~QBlendState(); Blending srcRGB() const; @@ -102,7 +102,7 @@ Q_SIGNALS: protected: void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; - QBlendState(QRenderState::Type type, Qt3DCore::QNode *parent = 0); + QBlendState(QRenderState::Type type, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QBlendState) @@ -113,7 +113,7 @@ class QT3DRENDERSHARED_EXPORT QBlendStateSeparate : public QBlendState { Q_OBJECT public: - explicit QBlendStateSeparate(Qt3DCore::QNode *parent = 0); + explicit QBlendStateSeparate(Qt3DCore::QNode *parent = Q_NULLPTR); }; } // namespace Qt3DRender diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h index 73874a091..98f97ec72 100644 --- a/src/render/renderstates/qclipplane.h +++ b/src/render/renderstates/qclipplane.h @@ -50,7 +50,7 @@ class QT3DRENDERSHARED_EXPORT QClipPlane : public QRenderState Q_OBJECT Q_PROPERTY(int plane READ plane WRITE setPlane NOTIFY planeChanged) public: - explicit QClipPlane(Qt3DCore::QNode *parent = 0); + explicit QClipPlane(Qt3DCore::QNode *parent = Q_NULLPTR); ~QClipPlane(); int plane() const; diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index 316fac7a4..35b43eb2c 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -62,7 +62,7 @@ public: }; Q_ENUM(CullingMode) - explicit QCullFace(Qt3DCore::QNode *parent = 0); + explicit QCullFace(Qt3DCore::QNode *parent = Q_NULLPTR); ~QCullFace(); CullingMode mode() const; diff --git a/src/render/renderstates/qdepthmask.h b/src/render/renderstates/qdepthmask.h index 816da9038..2c58317bf 100644 --- a/src/render/renderstates/qdepthmask.h +++ b/src/render/renderstates/qdepthmask.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QDepthMask : public QRenderState Q_OBJECT Q_PROPERTY (bool mask READ mask WRITE setMask NOTIFY maskChanged) public: - explicit QDepthMask(Qt3DCore::QNode *parent = 0); + explicit QDepthMask(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDepthMask(); bool mask() const; diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index f70ff1d59..35f2c5810 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -64,7 +64,7 @@ public: }; Q_ENUM(DepthFunc) - explicit QDepthTest(Qt3DCore::QNode *parent = 0); + explicit QDepthTest(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDepthTest(); DepthFunc func() const; diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h index 6026bfffb..7b863f8da 100644 --- a/src/render/renderstates/qdithering.h +++ b/src/render/renderstates/qdithering.h @@ -50,7 +50,7 @@ class QT3DRENDERSHARED_EXPORT QDithering : public QRenderState { Q_OBJECT public: - explicit QDithering(Qt3DCore::QNode *parent = 0); + explicit QDithering(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDithering(); private: diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index d0bc852e2..b075c5557 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -59,7 +59,7 @@ public: }; Q_ENUM(FaceDir) - explicit QFrontFace(Qt3DCore::QNode *parent = 0); + explicit QFrontFace(Qt3DCore::QNode *parent = Q_NULLPTR); ~QFrontFace(); FaceDir direction() const; diff --git a/src/render/renderstates/qpointsize.h b/src/render/renderstates/qpointsize.h index 716e61d54..ffc8f2010 100644 --- a/src/render/renderstates/qpointsize.h +++ b/src/render/renderstates/qpointsize.h @@ -57,7 +57,7 @@ public: }; Q_ENUM(Specification) - explicit QPointSize(Qt3DCore::QNode *parent = 0); + explicit QPointSize(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPointSize(); Specification specification() const; diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h index 9dd69592c..0178ff7c2 100644 --- a/src/render/renderstates/qscissortest.h +++ b/src/render/renderstates/qscissortest.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QScissorTest : public QRenderState Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) public: - explicit QScissorTest(Qt3DCore::QNode *parent = 0); + explicit QScissorTest(Qt3DCore::QNode *parent = Q_NULLPTR); ~QScissorTest(); int left() const; diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h index 364e34a59..c99d12973 100644 --- a/src/render/renderstates/qstencilmask.h +++ b/src/render/renderstates/qstencilmask.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QStencilMask : public QRenderState Q_PROPERTY(uint frontMask READ frontMask WRITE setFrontMask NOTIFY frontMaskChanged) Q_PROPERTY(uint backMask READ backMask WRITE setBackMask NOTIFY backMaskChanged) public: - explicit QStencilMask(Qt3DCore::QNode *parent = 0); + explicit QStencilMask(Qt3DCore::QNode *parent = Q_NULLPTR); ~QStencilMask(); uint frontMask() const; diff --git a/src/render/renderstates/qstencilop.h b/src/render/renderstates/qstencilop.h index 88ea2aac8..655658148 100644 --- a/src/render/renderstates/qstencilop.h +++ b/src/render/renderstates/qstencilop.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QStencilOp : public QRenderState Q_PROPERTY(Qt3DRender::QStencilOpSeparate *back READ back CONSTANT) public: - explicit QStencilOp(Qt3DCore::QNode *parent = 0); + explicit QStencilOp(Qt3DCore::QNode *parent = Q_NULLPTR); ~QStencilOp(); QStencilOpSeparate *front() const; diff --git a/src/render/renderstates/qstencilopseparate.h b/src/render/renderstates/qstencilopseparate.h index 6b82b7c9e..1da98a82c 100644 --- a/src/render/renderstates/qstencilopseparate.h +++ b/src/render/renderstates/qstencilopseparate.h @@ -97,7 +97,7 @@ Q_SIGNALS: void faceModeChanged(StencilFaceMode faceMode); private: - explicit QStencilOpSeparate(StencilFaceMode mode, QObject *parent = 0); + explicit QStencilOpSeparate(StencilFaceMode mode, QObject *parent = Q_NULLPTR); Q_DECLARE_PRIVATE(QStencilOpSeparate) friend class QStencilOpPrivate; diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h index c631e7fac..80a5f077a 100644 --- a/src/render/renderstates/qstenciltest.h +++ b/src/render/renderstates/qstenciltest.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QStencilTest : public QRenderState Q_PROPERTY(Qt3DRender::QStencilTestSeparate *back READ back CONSTANT) public: - explicit QStencilTest(Qt3DCore::QNode *parent = 0); + explicit QStencilTest(Qt3DCore::QNode *parent = Q_NULLPTR); ~QStencilTest(); QStencilTestSeparate *front() const; diff --git a/src/render/renderstates/qstenciltestseparate.h b/src/render/renderstates/qstenciltestseparate.h index 21a9e1d31..d89ca1c4f 100644 --- a/src/render/renderstates/qstenciltestseparate.h +++ b/src/render/renderstates/qstenciltestseparate.h @@ -97,7 +97,7 @@ Q_SIGNALS: void faceModeChanged(StencilFaceMode faceMode); private: - explicit QStencilTestSeparate(StencilFaceMode face, QObject *parent = 0); + explicit QStencilTestSeparate(StencilFaceMode face, QObject *parent = Q_NULLPTR); friend class QStencilTestPrivate; diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index 1a6ffc6de..8fecb29ec 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -67,7 +67,7 @@ class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged) Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged) public: - explicit QAbstractTextureImage(Qt3DCore::QNode *parent = 0); + explicit QAbstractTextureImage(Qt3DCore::QNode *parent = Q_NULLPTR); virtual ~QAbstractTextureImage(); int mipmapLevel() const; @@ -89,7 +89,7 @@ Q_SIGNALS: protected: void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; - QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3DCore::QNode *parent = 0); + QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QAbstractTextureImage) diff --git a/src/render/texture/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h index 093d20864..f4aa6eca7 100644 --- a/src/render/texture/qabstracttextureprovider.h +++ b/src/render/texture/qabstracttextureprovider.h @@ -319,9 +319,9 @@ Q_SIGNALS: void uniqueChanged(bool unique); protected: - explicit QAbstractTextureProvider(Qt3DCore::QNode *parent = 0); - explicit QAbstractTextureProvider(Target target, Qt3DCore::QNode *parent = 0); - QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3DCore::QNode *parent = 0); + explicit QAbstractTextureProvider(Qt3DCore::QNode *parent = Q_NULLPTR); + explicit QAbstractTextureProvider(Target target, Qt3DCore::QNode *parent = Q_NULLPTR); + QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void setStatus(Status status); diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index c3528a245..0159b7fd7 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) public: - explicit QTextureImage(Qt3DCore::QNode *parent = 0); + explicit QTextureImage(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTextureImage(); QUrl source() const; diff --git a/src/render/texture/qtextureproviders.h b/src/render/texture/qtextureproviders.h index 17e4a62d5..00a432917 100644 --- a/src/render/texture/qtextureproviders.h +++ b/src/render/texture/qtextureproviders.h @@ -47,7 +47,7 @@ class QT3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTexture1D(Qt3DCore::QNode *parent = 0); + explicit QTexture1D(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTexture1D(); }; @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTexture1DArray(Qt3DCore::QNode *parent = 0); + explicit QTexture1DArray(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTexture1DArray(); }; @@ -63,7 +63,7 @@ class QT3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTexture2D(Qt3DCore::QNode *parent = 0); + explicit QTexture2D(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTexture2D(); }; @@ -71,7 +71,7 @@ class QT3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTexture2DArray(Qt3DCore::QNode *parent = 0); + explicit QTexture2DArray(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTexture2DArray(); }; @@ -79,7 +79,7 @@ class QT3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTexture3D(Qt3DCore::QNode *parent = 0); + explicit QTexture3D(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTexture3D(); }; @@ -87,7 +87,7 @@ class QT3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTextureCubeMap(Qt3DCore::QNode *parent = 0); + explicit QTextureCubeMap(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTextureCubeMap(); }; @@ -95,7 +95,7 @@ class QT3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTextureProv { Q_OBJECT public: - explicit QTextureCubeMapArray(Qt3DCore::QNode *parent = 0); + explicit QTextureCubeMapArray(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTextureCubeMapArray(); }; @@ -103,7 +103,7 @@ class QT3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTexturePro { Q_OBJECT public: - explicit QTexture2DMultisample(Qt3DCore::QNode *parent = 0); + explicit QTexture2DMultisample(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTexture2DMultisample(); }; @@ -111,7 +111,7 @@ class QT3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTextu { Q_OBJECT public: - explicit QTexture2DMultisampleArray(Qt3DCore::QNode *parent = 0); + explicit QTexture2DMultisampleArray(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTexture2DMultisampleArray(); }; @@ -119,7 +119,7 @@ class QT3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTextureProvide { Q_OBJECT public: - explicit QTextureRectangle(Qt3DCore::QNode *parent = 0); + explicit QTextureRectangle(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTextureRectangle(); }; @@ -127,7 +127,7 @@ class QT3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTextureBuffer(Qt3DCore::QNode *parent = 0); + explicit QTextureBuffer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTextureBuffer(); }; diff --git a/src/render/texture/qwrapmode.h b/src/render/texture/qwrapmode.h index 40e6d5583..ebc54464a 100644 --- a/src/render/texture/qwrapmode.h +++ b/src/render/texture/qwrapmode.h @@ -62,8 +62,8 @@ public: }; Q_ENUM(WrapMode) - explicit QTextureWrapMode(WrapMode wrapMode = ClampToEdge, QObject *parent = 0); - explicit QTextureWrapMode(WrapMode x, WrapMode y, WrapMode z, QObject *parent = 0); + explicit QTextureWrapMode(WrapMode wrapMode = ClampToEdge, QObject *parent = Q_NULLPTR); + explicit QTextureWrapMode(WrapMode x, WrapMode y, WrapMode z, QObject *parent = Q_NULLPTR); WrapMode x() const; WrapMode y() const; -- cgit v1.2.3