summaryrefslogtreecommitdiffstats
path: root/src/render/geometry
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-21 17:14:38 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-09-25 10:42:44 +0000
commit93f5ac54f56b8c340731fd88e1b88525fca7793c (patch)
tree61f28cbaa19c0ca7aa07bcee0f7f0fd71eb06fb5 /src/render/geometry
parent43542ef59ac9324106a0690da3b808b23d5ab3a9 (diff)
Replace Q_DECL_FINAL with final
Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/geometry')
-rw-r--r--src/render/geometry/armature_p.h2
-rw-r--r--src/render/geometry/attribute_p.h2
-rw-r--r--src/render/geometry/buffer_p.h2
-rw-r--r--src/render/geometry/geometry_p.h2
-rw-r--r--src/render/geometry/geometryrenderer_p.h2
-rw-r--r--src/render/geometry/skeleton_p.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/render/geometry/armature_p.h b/src/render/geometry/armature_p.h
index 3e2bd748a..3e6e52a3f 100644
--- a/src/render/geometry/armature_p.h
+++ b/src/render/geometry/armature_p.h
@@ -73,7 +73,7 @@ public:
const UniformValue &skinningPaletteUniform() const { return m_skinningPaletteUniform; }
private:
- void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
Qt3DCore::QNodeId m_skeletonId;
UniformValue m_skinningPaletteUniform;
diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index bd395160a..e01537605 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -84,7 +84,7 @@ public:
void unsetDirty();
private:
- void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
Qt3DCore::QNodeId m_bufferId;
QString m_name;
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index ac5dc1437..690d1eab6 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -89,7 +89,7 @@ public:
void unsetDirty();
private:
- void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
void forceDataUpload();
QBuffer::BufferType m_type;
diff --git a/src/render/geometry/geometry_p.h b/src/render/geometry/geometry_p.h
index ea1f7fdb2..b158648ad 100644
--- a/src/render/geometry/geometry_p.h
+++ b/src/render/geometry/geometry_p.h
@@ -76,7 +76,7 @@ public:
void unsetDirty();
private:
- void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
QVector<Qt3DCore::QNodeId> m_attributes;
bool m_geometryDirty;
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index 146f49dc2..57d1ca0be 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -98,7 +98,7 @@ public:
QVector<RayCasting::QBoundingVolume *> triangleData() const;
private:
- void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
Qt3DCore::QNodeId m_geometryId;
int m_instanceCount;
diff --git a/src/render/geometry/skeleton_p.h b/src/render/geometry/skeleton_p.h
index b1567ab1b..4a14e5c1c 100644
--- a/src/render/geometry/skeleton_p.h
+++ b/src/render/geometry/skeleton_p.h
@@ -120,7 +120,7 @@ public:
#endif
private:
- void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
void loadSkeletonFromUrl();
void loadSkeletonFromData();
Qt3DCore::QJoint *createFrontendJoints(const SkeletonData &skeletonData) const;