diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-20 20:57:27 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-25 10:42:42 +0000 |
commit | 43542ef59ac9324106a0690da3b808b23d5ab3a9 (patch) | |
tree | 2b632ce1cba8aed2c99c5a88297da8120f5940bb /tools | |
parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qgltf/qgltf.cpp | 24 | ||||
-rw-r--r-- | tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h | 2 | ||||
-rw-r--r-- | tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp index e5f49bdc6..3cbe6f3d2 100644 --- a/tools/qgltf/qgltf.cpp +++ b/tools/qgltf/qgltf.cpp @@ -69,12 +69,12 @@ public: AssimpIOStream(QIODevice *device); ~AssimpIOStream(); - size_t Read(void *pvBuffer, size_t pSize, size_t pCount) Q_DECL_OVERRIDE; - size_t Write(const void *pvBuffer, size_t pSize, size_t pCount) Q_DECL_OVERRIDE; - aiReturn Seek(size_t pOffset, aiOrigin pOrigin) Q_DECL_OVERRIDE; - size_t Tell() const Q_DECL_OVERRIDE; - size_t FileSize() const Q_DECL_OVERRIDE; - void Flush() Q_DECL_OVERRIDE; + size_t Read(void *pvBuffer, size_t pSize, size_t pCount) override; + size_t Write(const void *pvBuffer, size_t pSize, size_t pCount) override; + aiReturn Seek(size_t pOffset, aiOrigin pOrigin) override; + size_t Tell() const override; + size_t FileSize() const override; + void Flush() override; private: QIODevice *m_device; @@ -84,10 +84,10 @@ class AssimpIOSystem : public Assimp::IOSystem { public: AssimpIOSystem(); - bool Exists(const char *pFile) const Q_DECL_OVERRIDE; - char getOsSeparator() const Q_DECL_OVERRIDE; - Assimp::IOStream *Open(const char *pFile, const char *pMode) Q_DECL_OVERRIDE; - void Close(Assimp::IOStream *pFile) Q_DECL_OVERRIDE; + bool Exists(const char *pFile) const override; + char getOsSeparator() const override; + Assimp::IOStream *Open(const char *pFile, const char *pMode) override; + void Close(Assimp::IOStream *pFile) override; private: QHash<QByteArray, QIODevice::OpenMode> m_openModeMap; @@ -491,7 +491,7 @@ class AssimpImporter : public Importer public: AssimpImporter(); - bool load(const QString &filename) Q_DECL_OVERRIDE; + bool load(const QString &filename) override; private: const aiScene *scene() const; @@ -1262,7 +1262,7 @@ class GltfExporter : public Exporter { public: GltfExporter(Importer *importer); - void save(const QString &inputFilename) Q_DECL_OVERRIDE; + void save(const QString &inputFilename) override; private: struct ProgramInfo { diff --git a/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h b/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h index 12ee68155..f977a331e 100644 --- a/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h +++ b/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h @@ -23,7 +23,7 @@ class %{CN} : public Qt3DCore::%{Base} public: %{CN}(); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; diff --git a/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h b/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h index c4162d647..5320e31b9 100644 --- a/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h +++ b/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h @@ -43,7 +43,7 @@ protected: private: Q_DECLARE_PRIVATE(%{CN}) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; @endif }; %{JS: Cpp.closeNamespaces('%{Class}')} |