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 /src/plugins/sceneparsers/assimp/assimphelpers.h | |
parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers/assimp/assimphelpers.h')
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimphelpers.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimphelpers.h b/src/plugins/sceneparsers/assimp/assimphelpers.h index 64a6d4abe..0db22ce7b 100644 --- a/src/plugins/sceneparsers/assimp/assimphelpers.h +++ b/src/plugins/sceneparsers/assimp/assimphelpers.h @@ -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 *const m_device; @@ -86,10 +86,10 @@ class AssimpIOSystem : public Assimp::IOSystem public : AssimpIOSystem(); ~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: QMap<QByteArray, QIODevice::OpenMode> m_openModeMaps; |