summaryrefslogtreecommitdiffstats
path: root/examples/widgets/statemachine
diff options
context:
space:
mode:
Diffstat (limited to 'examples/widgets/statemachine')
-rw-r--r--examples/widgets/statemachine/factorial/main.cpp8
-rw-r--r--examples/widgets/statemachine/pingpong/main.cpp10
-rw-r--r--examples/widgets/statemachine/rogue/movementtransition.h4
-rw-r--r--examples/widgets/statemachine/rogue/window.h4
-rw-r--r--examples/widgets/statemachine/trafficlight/main.cpp2
5 files changed, 14 insertions, 14 deletions
diff --git a/examples/widgets/statemachine/factorial/main.cpp b/examples/widgets/statemachine/factorial/main.cpp
index 1ad2740563..5e83e27b08 100644
--- a/examples/widgets/statemachine/factorial/main.cpp
+++ b/examples/widgets/statemachine/factorial/main.cpp
@@ -93,7 +93,7 @@ public:
: QSignalTransition(fact, SIGNAL(xChanged(int))), m_fact(fact)
{}
- virtual bool eventTest(QEvent *e)
+ virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE
{
if (!QSignalTransition::eventTest(e))
return false;
@@ -101,7 +101,7 @@ public:
return se->arguments().at(0).toInt() > 1;
}
- virtual void onTransition(QEvent *e)
+ virtual void onTransition(QEvent *e) Q_DECL_OVERRIDE
{
QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent*>(e);
int x = se->arguments().at(0).toInt();
@@ -123,7 +123,7 @@ public:
: QSignalTransition(fact, SIGNAL(xChanged(int))), m_fact(fact)
{}
- virtual bool eventTest(QEvent *e)
+ virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE
{
if (!QSignalTransition::eventTest(e))
return false;
@@ -131,7 +131,7 @@ public:
return se->arguments().at(0).toInt() <= 1;
}
- virtual void onTransition(QEvent *)
+ virtual void onTransition(QEvent *) Q_DECL_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 869728f993..acb125d54b 100644
--- a/examples/widgets/statemachine/pingpong/main.cpp
+++ b/examples/widgets/statemachine/pingpong/main.cpp
@@ -65,7 +65,7 @@ public:
: QState(parent) {}
protected:
- virtual void onEntry(QEvent *)
+ virtual void onEntry(QEvent *) Q_DECL_OVERRIDE
{
machine()->postEvent(new PingEvent());
fprintf(stdout, "ping?\n");
@@ -80,10 +80,10 @@ public:
PongTransition() {}
protected:
- virtual bool eventTest(QEvent *e) {
+ virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE {
return (e->type() == QEvent::User+3);
}
- virtual void onTransition(QEvent *)
+ virtual void onTransition(QEvent *) Q_DECL_OVERRIDE
{
machine()->postDelayedEvent(new PingEvent(), 500);
fprintf(stdout, "ping?\n");
@@ -98,10 +98,10 @@ public:
PingTransition() {}
protected:
- virtual bool eventTest(QEvent *e) {
+ virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE {
return (e->type() == QEvent::User+2);
}
- virtual void onTransition(QEvent *)
+ virtual void onTransition(QEvent *) Q_DECL_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 23359f7886..5cfa868b22 100644
--- a/examples/widgets/statemachine/rogue/movementtransition.h
+++ b/examples/widgets/statemachine/rogue/movementtransition.h
@@ -59,7 +59,7 @@ public:
//![1]
protected:
- bool eventTest(QEvent *event) {
+ bool eventTest(QEvent *event) Q_DECL_OVERRIDE {
if (event->type() == QEvent::StateMachineWrapped &&
static_cast<QStateMachine::WrappedEvent *>(event)->event()->type() == QEvent::KeyPress) {
QEvent *wrappedEvent = static_cast<QStateMachine::WrappedEvent *>(event)->event();
@@ -76,7 +76,7 @@ protected:
//![1]
//![2]
- void onTransition(QEvent *event) {
+ void onTransition(QEvent *event) Q_DECL_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 71f195cba1..482c8cf111 100644
--- a/examples/widgets/statemachine/rogue/window.h
+++ b/examples/widgets/statemachine/rogue/window.h
@@ -67,10 +67,10 @@ public:
void setStatus(const QString &status);
QString status() const;
- QSize sizeHint() const;
+ QSize sizeHint() const Q_DECL_OVERRIDE;
protected:
- void paintEvent(QPaintEvent *event);
+ void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
//![0]
//![1]
diff --git a/examples/widgets/statemachine/trafficlight/main.cpp b/examples/widgets/statemachine/trafficlight/main.cpp
index 5fb6063ca0..62d335a89b 100644
--- a/examples/widgets/statemachine/trafficlight/main.cpp
+++ b/examples/widgets/statemachine/trafficlight/main.cpp
@@ -64,7 +64,7 @@ public slots:
void turnOn() { setOn(true); }
protected:
- virtual void paintEvent(QPaintEvent *)
+ virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE
{
if (!m_on)
return;