summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers
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/plugins/sceneparsers
parent43542ef59ac9324106a0690da3b808b23d5ab3a9 (diff)
Replace Q_DECL_FINAL with final
Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers')
-rw-r--r--src/plugins/sceneparsers/assimp/assimpimporter.cpp6
-rw-r--r--src/plugins/sceneparsers/gltf/gltfimporter.h10
-rw-r--r--src/plugins/sceneparsers/gltfexport/gltfexporter.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
index ae395a59f..a1558b7e2 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
@@ -336,7 +336,7 @@ class AssimpRawTextureImage : public QAbstractTextureImage
public:
explicit AssimpRawTextureImage(QNode *parent = 0);
- QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_FINAL;
+ QTextureImageDataGeneratorPtr dataGenerator() const final;
void setData(const QByteArray &data);
@@ -348,8 +348,8 @@ private:
public:
explicit AssimpRawTextureImageFunctor(const QByteArray &data);
- QTextureImageDataPtr operator()() Q_DECL_FINAL;
- bool operator ==(const QTextureImageDataGenerator &other) const Q_DECL_FINAL;
+ QTextureImageDataPtr operator()() final;
+ bool operator ==(const QTextureImageDataGenerator &other) const final;
QT3D_FUNCTOR(AssimpRawTextureImageFunctor)
private:
diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.h b/src/plugins/sceneparsers/gltf/gltfimporter.h
index 8a8e1b3ee..d47a6a729 100644
--- a/src/plugins/sceneparsers/gltf/gltfimporter.h
+++ b/src/plugins/sceneparsers/gltf/gltfimporter.h
@@ -97,11 +97,11 @@ public:
bool setJSON( const QJsonDocument &json );
// SceneParserInterface interface
- void setSource(const QUrl &source) Q_DECL_FINAL;
- void setData(const QByteArray& data, const QString &basePath) Q_DECL_FINAL;
- bool areFileTypesSupported(const QStringList &extensions) const Q_DECL_FINAL;
- Qt3DCore::QEntity *node(const QString &id) Q_DECL_FINAL;
- Qt3DCore::QEntity *scene(const QString &id = QString()) Q_DECL_FINAL;
+ void setSource(const QUrl &source) final;
+ void setData(const QByteArray& data, const QString &basePath) final;
+ bool areFileTypesSupported(const QStringList &extensions) const final;
+ Qt3DCore::QEntity *node(const QString &id) final;
+ Qt3DCore::QEntity *scene(const QString &id = QString()) final;
private:
class BufferData
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.h b/src/plugins/sceneparsers/gltfexport/gltfexporter.h
index 07d852fd4..fe6977a6e 100644
--- a/src/plugins/sceneparsers/gltfexport/gltfexporter.h
+++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.h
@@ -91,7 +91,7 @@ public:
~GLTFExporter();
bool exportScene(Qt3DCore::QEntity *sceneRoot, const QString &outDir,
- const QString &exportName, const QVariantHash &options) Q_DECL_FINAL;
+ const QString &exportName, const QVariantHash &options) final;
struct GltfOptions {
bool binaryJson;