diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-11-27 12:45:37 +0300 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-29 10:06:02 +0000 |
commit | c050a1bdea993df5634fec9ed05f682cf5a81691 (patch) | |
tree | 1525ce9ea5589e91d21d82b44e9e89ae6b51440b | |
parent | a103992f49045323a3aaa4970eb1ee5f65a378dd (diff) |
Examples: Remove more redundant virtual specifiers for overriders
Change-Id: I3e378c656a2651fb7031b6cf6a6939dfc5576519
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | examples/widgets/graphicsview/boxes/glbuffers.h | 2 | ||||
-rw-r--r-- | examples/widgets/graphicsview/boxes/scene.h | 4 | ||||
-rw-r--r-- | examples/widgets/statemachine/pingpong/main.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/widgets/graphicsview/boxes/glbuffers.h b/examples/widgets/graphicsview/boxes/glbuffers.h index 0b80c8c4ae..03c24a91d3 100644 --- a/examples/widgets/graphicsview/boxes/glbuffers.h +++ b/examples/widgets/graphicsview/boxes/glbuffers.h @@ -146,7 +146,7 @@ public: void begin(int face); // end rendering void end(); - virtual bool failed() const override {return m_failed || m_fbo.failed();} + bool failed() const override { return m_failed || m_fbo.failed(); } static void getViewMatrix(QMatrix4x4& mat, int face); static void getProjectionMatrix(QMatrix4x4& mat, float nearZ, float farZ); diff --git a/examples/widgets/graphicsview/boxes/scene.h b/examples/widgets/graphicsview/boxes/scene.h index 3f367a8dce..a2ba1d0b5a 100644 --- a/examples/widgets/graphicsview/boxes/scene.h +++ b/examples/widgets/graphicsview/boxes/scene.h @@ -81,7 +81,7 @@ class ColorEdit : public ParameterEdit public: ColorEdit(QRgb initialColor, int id); QRgb color() const {return m_color;} - virtual void emitChange() override { emit colorChanged(m_color, m_id); } + void emitChange() override { emit colorChanged(m_color, m_id); } public slots: void editDone(); signals: @@ -103,7 +103,7 @@ class FloatEdit : public ParameterEdit public: FloatEdit(float initialValue, int id); float value() const {return m_value;} - virtual void emitChange() override { emit valueChanged(m_value, m_id); } + void emitChange() override { emit valueChanged(m_value, m_id); } public slots: void editDone(); signals: diff --git a/examples/widgets/statemachine/pingpong/main.cpp b/examples/widgets/statemachine/pingpong/main.cpp index 354f1d245b..c09060c502 100644 --- a/examples/widgets/statemachine/pingpong/main.cpp +++ b/examples/widgets/statemachine/pingpong/main.cpp @@ -90,7 +90,7 @@ public: PongTransition() {} protected: - virtual bool eventTest(QEvent *e) override { + bool eventTest(QEvent *e) override { return (e->type() == QEvent::User+3); } void onTransition(QEvent *) override @@ -108,7 +108,7 @@ public: PingTransition() {} protected: - virtual bool eventTest(QEvent *e) override { + bool eventTest(QEvent *e) override { return (e->type() == QEvent::User+2); } void onTransition(QEvent *) override |