summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/aspects/qabstractaspect.h4
-rw-r--r--src/core/aspects/qaspectengine.h2
-rw-r--r--src/core/core-components/qcamera.h4
-rw-r--r--src/core/core-components/qcameralens.h4
-rw-r--r--src/core/jobs/qabstractaspectjobmanager_p.h2
-rw-r--r--src/core/nodes/qcomponent.h4
-rw-r--r--src/core/nodes/qentity.h4
-rw-r--r--src/core/nodes/qnode.h4
-rw-r--r--src/core/transforms/qtransform.h4
9 files changed, 16 insertions, 16 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<class Frontend>
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<QAspectJobPtr> &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: