diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-11-23 02:02:53 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-11-25 22:36:21 +0000 |
| commit | 011aeb131ed904d948b69d6444ff58cdbfd4990c (patch) | |
| tree | ae7004ad54843af21f44414574e5af91dde3b908 /examples/widgets/statemachine | |
| parent | f91bbd243890511c99a084a478e7abe96d334860 (diff) | |
Examples: Remove a redundant virtual specifier for overriders
It's a good practice to use override without virtual:
https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#Rh-override
Change-Id: I5c2d73600e6c706424589c0487133c03a4ef3629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples/widgets/statemachine')
| -rw-r--r-- | examples/widgets/statemachine/factorial/main.cpp | 8 | ||||
| -rw-r--r-- | examples/widgets/statemachine/pingpong/main.cpp | 6 | ||||
| -rw-r--r-- | examples/widgets/statemachine/trafficlight/main.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/widgets/statemachine/factorial/main.cpp b/examples/widgets/statemachine/factorial/main.cpp index d0d61cb7df..919988051f 100644 --- a/examples/widgets/statemachine/factorial/main.cpp +++ b/examples/widgets/statemachine/factorial/main.cpp @@ -103,7 +103,7 @@ public: : QSignalTransition(fact, SIGNAL(xChanged(int))), m_fact(fact) {} - virtual bool eventTest(QEvent *e) override + bool eventTest(QEvent *e) override { if (!QSignalTransition::eventTest(e)) return false; @@ -111,7 +111,7 @@ public: return se->arguments().at(0).toInt() > 1; } - virtual void onTransition(QEvent *e) override + void onTransition(QEvent *e) override { QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent*>(e); int x = se->arguments().at(0).toInt(); @@ -133,7 +133,7 @@ public: : QSignalTransition(fact, SIGNAL(xChanged(int))), m_fact(fact) {} - virtual bool eventTest(QEvent *e) override + bool eventTest(QEvent *e) override { if (!QSignalTransition::eventTest(e)) return false; @@ -141,7 +141,7 @@ public: return se->arguments().at(0).toInt() <= 1; } - virtual void onTransition(QEvent *) override + void onTransition(QEvent *) override { fprintf(stdout, "%d\n", m_fact->property("fac").toInt()); } diff --git a/examples/widgets/statemachine/pingpong/main.cpp b/examples/widgets/statemachine/pingpong/main.cpp index 8c3b9f674b..354f1d245b 100644 --- a/examples/widgets/statemachine/pingpong/main.cpp +++ b/examples/widgets/statemachine/pingpong/main.cpp @@ -75,7 +75,7 @@ public: : QState(parent) {} protected: - virtual void onEntry(QEvent *) override + void onEntry(QEvent *) override { machine()->postEvent(new PingEvent()); fprintf(stdout, "ping?\n"); @@ -93,7 +93,7 @@ protected: virtual bool eventTest(QEvent *e) override { return (e->type() == QEvent::User+3); } - virtual void onTransition(QEvent *) override + void onTransition(QEvent *) override { machine()->postDelayedEvent(new PingEvent(), 500); fprintf(stdout, "ping?\n"); @@ -111,7 +111,7 @@ protected: virtual bool eventTest(QEvent *e) override { return (e->type() == QEvent::User+2); } - virtual void onTransition(QEvent *) override + void onTransition(QEvent *) override { machine()->postDelayedEvent(new PongEvent(), 500); fprintf(stdout, "pong!\n"); diff --git a/examples/widgets/statemachine/trafficlight/main.cpp b/examples/widgets/statemachine/trafficlight/main.cpp index 143f2a9324..21df91d8b0 100644 --- a/examples/widgets/statemachine/trafficlight/main.cpp +++ b/examples/widgets/statemachine/trafficlight/main.cpp @@ -74,7 +74,7 @@ public slots: void turnOn() { setOn(true); } protected: - virtual void paintEvent(QPaintEvent *) override + void paintEvent(QPaintEvent *) override { if (!m_on) return; |