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/quick3d/quick3dextras | |
parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3dextras')
-rw-r--r-- | src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h | 2 | ||||
-rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 2 | ||||
-rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h index 43172952c..a40d73a62 100644 --- a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h +++ b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h @@ -64,7 +64,7 @@ namespace Qt3DExtras { class QuickExtrasNodeFactory : public Qt3DCore::QAbstractNodeFactory { public: - Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE; + Qt3DCore::QNode *createNode(const char *type) override; void registerType(const char *className, const char *quickName, int major, int minor); diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index e41754f42..560247ae9 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -86,7 +86,7 @@ public: startTimer(QGuiApplication::primaryScreen()->refreshRate()); } - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE + void timerEvent(QTimerEvent *) override { incubateFor(m_incubationTime); } diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h index 0880fc160..30f901979 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.h +++ b/src/quick3d/quick3dextras/qt3dquickwindow.h @@ -114,7 +114,7 @@ Q_SIGNALS: void cameraAspectRatioModeChanged(CameraAspectRatioMode mode); protected: - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) override; private: void onSceneCreated(QObject *rootObject); |