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/input/backend | |
parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input/backend')
22 files changed, 53 insertions, 53 deletions
diff --git a/src/input/backend/abstractaxisinput_p.h b/src/input/backend/abstractaxisinput_p.h index 8ce43bce8..765e2214f 100644 --- a/src/input/backend/abstractaxisinput_p.h +++ b/src/input/backend/abstractaxisinput_p.h @@ -70,13 +70,13 @@ public: virtual void cleanup(); inline Qt3DCore::QNodeId sourceDevice() const { return m_sourceDevice; } - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; virtual float process(InputHandler *inputHandler, qint64 currentTime) = 0; protected: AbstractAxisInput(); - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE; + void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override; Qt3DCore::QNodeId m_sourceDevice; }; diff --git a/src/input/backend/action_p.h b/src/input/backend/action_p.h index ee686413f..6a6a867c2 100644 --- a/src/input/backend/action_p.h +++ b/src/input/backend/action_p.h @@ -68,7 +68,7 @@ public: inline QVector<Qt3DCore::QNodeId> inputs() const { return m_inputs; } inline bool actionTriggered() const { return m_actionTriggered; } void setActionTriggered(bool actionTriggered); - 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/src/input/backend/actioninput_p.h b/src/input/backend/actioninput_p.h index 3059f66cf..7f297b73b 100644 --- a/src/input/backend/actioninput_p.h +++ b/src/input/backend/actioninput_p.h @@ -69,9 +69,9 @@ public: inline QVector<int> buttons() const { return m_buttons; } inline Qt3DCore::QNodeId sourceDevice() const { return m_sourceDevice; } - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; - bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE; + bool process(InputHandler *inputHandler, qint64 currentTime) override; private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; diff --git a/src/input/backend/analogaxisinput_p.h b/src/input/backend/analogaxisinput_p.h index 154ef5378..640aff709 100644 --- a/src/input/backend/analogaxisinput_p.h +++ b/src/input/backend/analogaxisinput_p.h @@ -68,7 +68,7 @@ public: inline int axis() const { return m_axis; } void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL; - float process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE; + float process(InputHandler *inputHandler, qint64 currentTime) override; private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; diff --git a/src/input/backend/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h index 44966554d..8a74de85f 100644 --- a/src/input/backend/assignkeyboardfocusjob_p.h +++ b/src/input/backend/assignkeyboardfocusjob_p.h @@ -66,7 +66,7 @@ class AssignKeyboardFocusJob : public Qt3DCore::QAspectJob public: explicit AssignKeyboardFocusJob(Qt3DCore::QNodeId keyboardDevice); void setInputHandler(InputHandler *handler); - void run() Q_DECL_OVERRIDE; + void run() override; private: InputHandler *m_inputHandler; diff --git a/src/input/backend/axis_p.h b/src/input/backend/axis_p.h index e62f70d34..73150c522 100644 --- a/src/input/backend/axis_p.h +++ b/src/input/backend/axis_p.h @@ -68,7 +68,7 @@ public: inline QVector<Qt3DCore::QNodeId> inputs() const { return m_inputs; } inline float axisValue() const { return m_axisValue; } void setAxisValue(float axisValue); - 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/src/input/backend/axisaccumulator_p.h b/src/input/backend/axisaccumulator_p.h index 7d6799eb0..246020cb3 100644 --- a/src/input/backend/axisaccumulator_p.h +++ b/src/input/backend/axisaccumulator_p.h @@ -78,7 +78,7 @@ public: float velocity() const Q_DECL_NOTHROW { return m_velocity; } void setVelocity(float velocity); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; void stepIntegration(AxisManager *axisManager, float dt); diff --git a/src/input/backend/axissetting_p.h b/src/input/backend/axissetting_p.h index 190312bd8..c26d3850c 100644 --- a/src/input/backend/axissetting_p.h +++ b/src/input/backend/axissetting_p.h @@ -69,7 +69,7 @@ public: inline bool isSmoothEnabled() const { return m_smooth; } protected: - 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/src/input/backend/buttonaxisinput_p.h b/src/input/backend/buttonaxisinput_p.h index 05724567c..5ed5b6b52 100644 --- a/src/input/backend/buttonaxisinput_p.h +++ b/src/input/backend/buttonaxisinput_p.h @@ -80,7 +80,7 @@ public: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL; - float process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE; + float process(InputHandler *inputHandler, qint64 currentTime) override; private: void updateSpeedRatio(qint64 currentTime, UpdateType type); diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h index 16aaf3e5b..c3ee1e467 100644 --- a/src/input/backend/genericdevicebackendnode_p.h +++ b/src/input/backend/genericdevicebackendnode_p.h @@ -73,10 +73,10 @@ public: void updateEvents(); // QAbstractPhysicalDeviceBackendNode interface - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void cleanup() Q_DECL_OVERRIDE; - float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE; - bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; + void cleanup() override; + float axisValue(int axisIdentifier) const override; + bool isButtonPressed(int buttonIdentifier) const override; private: QHash<int, qreal> m_axesValues; @@ -89,9 +89,9 @@ class GenericDeviceBackendFunctor : public Qt3DCore::QBackendNodeMapper public: explicit GenericDeviceBackendFunctor(QInputAspect *inputaspect, InputHandler *handler); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; - void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override; + void destroy(Qt3DCore::QNodeId id) const override; private: QInputAspect *m_inputAspect; diff --git a/src/input/backend/inputchord_p.h b/src/input/backend/inputchord_p.h index 95557a00d..3d3a53c50 100644 --- a/src/input/backend/inputchord_p.h +++ b/src/input/backend/inputchord_p.h @@ -73,9 +73,9 @@ public: void setStartTime(qint64 time); void reset(); bool actionTriggered(Qt3DCore::QNodeId input); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; - bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE; + bool process(InputHandler *inputHandler, qint64 currentTime) override; private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; diff --git a/src/input/backend/inputsequence_p.h b/src/input/backend/inputsequence_p.h index a9fa2dd2f..b9a577c3e 100644 --- a/src/input/backend/inputsequence_p.h +++ b/src/input/backend/inputsequence_p.h @@ -75,9 +75,9 @@ public: bool sequenceTriggered() const; void reset(); bool actionTriggered(Qt3DCore::QNodeId input, const qint64 currentTime); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; - bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE; + bool process(InputHandler *inputHandler, qint64 currentTime) override; private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h index 2fee6c946..05beb5c67 100644 --- a/src/input/backend/inputsettings_p.h +++ b/src/input/backend/inputsettings_p.h @@ -69,7 +69,7 @@ public: inline QObject *eventSource() const { return m_eventSource; } protected: - 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; @@ -82,9 +82,9 @@ class InputSettingsFunctor : public Qt3DCore::QBackendNodeMapper public: explicit InputSettingsFunctor(InputHandler *handler); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; - void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override; + void destroy(Qt3DCore::QNodeId id) const override; private: InputHandler *m_handler; diff --git a/src/input/backend/keyboarddevice_p.h b/src/input/backend/keyboarddevice_p.h index 611a06233..781e8ead5 100644 --- a/src/input/backend/keyboarddevice_p.h +++ b/src/input/backend/keyboarddevice_p.h @@ -71,15 +71,15 @@ class Q_AUTOTEST_EXPORT KeyboardDevice : public Qt3DInput::QAbstractPhysicalDevi { public: KeyboardDevice(); - void cleanup() Q_DECL_OVERRIDE; + void cleanup() override; void requestFocusForInput(Qt3DCore::QNodeId inputId); void setInputHandler(InputHandler *handler); void setCurrentFocusItem(Qt3DCore::QNodeId input); - float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE; - bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE; + float axisValue(int axisIdentifier) const override; + bool isButtonPressed(int buttonIdentifier) const override; void updateKeyEvents(const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events); @@ -87,7 +87,7 @@ public: inline Qt3DCore::QNodeId lastKeyboardInputRequester() const { return m_lastRequester; } protected: - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) override; private: void setButtonValue(int key, bool value); @@ -268,9 +268,9 @@ class KeyboardDeviceFunctor : public Qt3DCore::QBackendNodeMapper public: explicit KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHandler *handler); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; - void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override; + void destroy(Qt3DCore::QNodeId id) const override; private: QInputAspect *m_inputAspect; diff --git a/src/input/backend/keyboardeventfilter_p.h b/src/input/backend/keyboardeventfilter_p.h index 46b8071cd..bcf062506 100644 --- a/src/input/backend/keyboardeventfilter_p.h +++ b/src/input/backend/keyboardeventfilter_p.h @@ -69,7 +69,7 @@ public: inline InputHandler *inputHandler() const { return m_inputHandler; } protected: - bool eventFilter(QObject *obj, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *e) override; private: InputHandler *m_inputHandler; diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h index e2aeab4f3..cc1575f2a 100644 --- a/src/input/backend/keyboardhandler_p.h +++ b/src/input/backend/keyboardhandler_p.h @@ -75,7 +75,7 @@ public: inline bool focus() const { return m_focus; } - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; protected: void requestFocus(); @@ -94,9 +94,9 @@ class KeyboardHandlerFunctor : public Qt3DCore::QBackendNodeMapper public: explicit KeyboardHandlerFunctor(InputHandler *handler); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; - void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override; + void destroy(Qt3DCore::QNodeId id) const override; private: InputHandler *m_handler; diff --git a/src/input/backend/keyeventdispatcherjob_p.h b/src/input/backend/keyeventdispatcherjob_p.h index 1456f0878..be2364ac9 100644 --- a/src/input/backend/keyeventdispatcherjob_p.h +++ b/src/input/backend/keyeventdispatcherjob_p.h @@ -67,7 +67,7 @@ class KeyEventDispatcherJob : public Qt3DCore::QAspectJob public: explicit KeyEventDispatcherJob(Qt3DCore::QNodeId input, const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events); void setInputHandler(InputHandler *handler); - void run() Q_DECL_OVERRIDE; + void run() override; private: InputHandler *m_inputHandler; diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h index 38d4e2dd5..e24d7a359 100644 --- a/src/input/backend/logicaldevice_p.h +++ b/src/input/backend/logicaldevice_p.h @@ -71,7 +71,7 @@ public: inline QVector<Qt3DCore::QNodeId> axes() const { return m_axes; } inline QVector<Qt3DCore::QNodeId> actions() const { return m_actions; } - 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/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h index a085194ff..510e9c9b5 100644 --- a/src/input/backend/mousedevice_p.h +++ b/src/input/backend/mousedevice_p.h @@ -95,8 +95,8 @@ public: void setInputHandler(InputHandler *handler); InputHandler *inputHandler() const; - float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE; - bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE; + float axisValue(int axisIdentifier) const override; + bool isButtonPressed(int buttonIdentifier) const override; void updateMouseEvents(const QList<QT_PREPEND_NAMESPACE(QMouseEvent)> &events); #if QT_CONFIG(wheelevent) @@ -108,7 +108,7 @@ public: bool wasPressed() const; float sensitivity() const; - 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; @@ -126,9 +126,9 @@ class MouseDeviceFunctor : public Qt3DCore::QBackendNodeMapper public: explicit MouseDeviceFunctor(Qt3DInput::QInputAspect *inputAspect, InputHandler *handler); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; - void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override; + void destroy(Qt3DCore::QNodeId id) const override; private: QInputAspect *m_inputAspect; diff --git a/src/input/backend/mouseeventfilter_p.h b/src/input/backend/mouseeventfilter_p.h index 340524a61..135b1afcf 100644 --- a/src/input/backend/mouseeventfilter_p.h +++ b/src/input/backend/mouseeventfilter_p.h @@ -69,7 +69,7 @@ public: inline InputHandler *inputHandler() const { return m_inputHandler; } protected: - bool eventFilter(QObject *obj, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *e) override; private: InputHandler *m_inputHandler; diff --git a/src/input/backend/mousehandler_p.h b/src/input/backend/mousehandler_p.h index ae484d8d6..3d32d9864 100644 --- a/src/input/backend/mousehandler_p.h +++ b/src/input/backend/mousehandler_p.h @@ -75,7 +75,7 @@ public: #endif protected: - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; void setDevice(Qt3DCore::QNodeId device); private: @@ -90,9 +90,9 @@ class MouseHandlerFunctor : public Qt3DCore::QBackendNodeMapper public: explicit MouseHandlerFunctor(InputHandler *handler); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; - void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override; + void destroy(Qt3DCore::QNodeId id) const override; private: InputHandler *m_handler; diff --git a/src/input/backend/qabstractphysicaldevicebackendnode_p.h b/src/input/backend/qabstractphysicaldevicebackendnode_p.h index 272143c45..339ad7324 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode_p.h +++ b/src/input/backend/qabstractphysicaldevicebackendnode_p.h @@ -71,7 +71,7 @@ class QT3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceBackendNode : public public: explicit QAbstractPhysicalDeviceBackendNode(QBackendNode::Mode mode); virtual void cleanup(); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; void setInputAspect(QInputAspect *aspect); QInputAspect *inputAspect() const; @@ -83,7 +83,7 @@ public: protected: QAbstractPhysicalDeviceBackendNode(QAbstractPhysicalDeviceBackendNodePrivate &dd); - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE; + void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override; Q_DECLARE_PRIVATE(QAbstractPhysicalDeviceBackendNode) }; |