diff options
Diffstat (limited to 'src/render/geometry')
-rw-r--r-- | src/render/geometry/qabstractattribute.h | 8 | ||||
-rw-r--r-- | src/render/geometry/qabstractbuffer.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qattribute.h | 2 | ||||
-rw-r--r-- | src/render/geometry/qboundingvolumespecifier.h | 2 | ||||
-rw-r--r-- | src/render/geometry/qbuffer.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qcuboidmesh.h | 2 | ||||
-rw-r--r-- | src/render/geometry/qcylindergeometry.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qcylindermesh.h | 2 | ||||
-rw-r--r-- | src/render/geometry/qgeometry.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qgeometryrenderer.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qmesh.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qplanemesh.h | 2 | ||||
-rw-r--r-- | src/render/geometry/qspheremesh.h | 2 | ||||
-rw-r--r-- | src/render/geometry/qtorusgeometry.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qtorusmesh.h | 2 |
15 files changed, 25 insertions, 25 deletions
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; |