diff options
author | hjk <hjk@theqtcompany.com> | 2016-06-15 10:12:35 +0200 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2016-06-15 09:32:30 +0000 |
commit | 40a54bf565079c007eada8755b9ff7224754949d (patch) | |
tree | ccd3bb45ca7369b79fc54d26955cf5b0dfc8ece1 /examples/widgets/statemachine | |
parent | 4d3ffae3d562e5b3b2748a2d92eb4ab2933422e7 (diff) |
Examples: Replace 'Q_DECL_OVERRIDE' by 'override'
Examples should demonstrate best practice, and we can use the keyword
directly nowadays.
Change-Id: I1f122e5caceca17290757ffbaf3d660e7daa9ae4
Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
Diffstat (limited to 'examples/widgets/statemachine')
5 files changed, 14 insertions, 14 deletions
diff --git a/examples/widgets/statemachine/factorial/main.cpp b/examples/widgets/statemachine/factorial/main.cpp index 995ae4d246..d0d61cb7df 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) Q_DECL_OVERRIDE + virtual 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) Q_DECL_OVERRIDE + virtual 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) Q_DECL_OVERRIDE + virtual 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 *) Q_DECL_OVERRIDE + virtual 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 ef799ec998..8c3b9f674b 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 *) Q_DECL_OVERRIDE + virtual void onEntry(QEvent *) override { machine()->postEvent(new PingEvent()); fprintf(stdout, "ping?\n"); @@ -90,10 +90,10 @@ public: PongTransition() {} protected: - virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE { + virtual bool eventTest(QEvent *e) override { return (e->type() == QEvent::User+3); } - virtual void onTransition(QEvent *) Q_DECL_OVERRIDE + virtual void onTransition(QEvent *) override { machine()->postDelayedEvent(new PingEvent(), 500); fprintf(stdout, "ping?\n"); @@ -108,10 +108,10 @@ public: PingTransition() {} protected: - virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE { + virtual bool eventTest(QEvent *e) override { return (e->type() == QEvent::User+2); } - virtual void onTransition(QEvent *) Q_DECL_OVERRIDE + virtual void onTransition(QEvent *) override { machine()->postDelayedEvent(new PongEvent(), 500); fprintf(stdout, "pong!\n"); diff --git a/examples/widgets/statemachine/rogue/movementtransition.h b/examples/widgets/statemachine/rogue/movementtransition.h index 05fc7edf61..74ffed6608 100644 --- a/examples/widgets/statemachine/rogue/movementtransition.h +++ b/examples/widgets/statemachine/rogue/movementtransition.h @@ -69,7 +69,7 @@ public: //![1] protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE { + bool eventTest(QEvent *event) override { if (event->type() == QEvent::StateMachineWrapped && static_cast<QStateMachine::WrappedEvent *>(event)->event()->type() == QEvent::KeyPress) { QEvent *wrappedEvent = static_cast<QStateMachine::WrappedEvent *>(event)->event(); @@ -86,7 +86,7 @@ protected: //![1] //![2] - void onTransition(QEvent *event) Q_DECL_OVERRIDE { + void onTransition(QEvent *event) override { QKeyEvent *keyEvent = static_cast<QKeyEvent *>( static_cast<QStateMachine::WrappedEvent *>(event)->event()); diff --git a/examples/widgets/statemachine/rogue/window.h b/examples/widgets/statemachine/rogue/window.h index 2ac9650201..af34815ffd 100644 --- a/examples/widgets/statemachine/rogue/window.h +++ b/examples/widgets/statemachine/rogue/window.h @@ -77,10 +77,10 @@ public: void setStatus(const QString &status); QString status() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; //![0] //![1] diff --git a/examples/widgets/statemachine/trafficlight/main.cpp b/examples/widgets/statemachine/trafficlight/main.cpp index ebfb3bface..143f2a9324 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 *) Q_DECL_OVERRIDE + virtual void paintEvent(QPaintEvent *) override { if (!m_on) return; |