From 40a54bf565079c007eada8755b9ff7224754949d Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 15 Jun 2016 10:12:35 +0200 Subject: Examples: Replace 'Q_DECL_OVERRIDE' by 'override' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Examples should demonstrate best practice, and we can use the keyword directly nowadays. Change-Id: I1f122e5caceca17290757ffbaf3d660e7daa9ae4 Reviewed-by: Topi Reiniö --- examples/widgets/statemachine/rogue/movementtransition.h | 4 ++-- examples/widgets/statemachine/rogue/window.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/widgets/statemachine/rogue') 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(event)->event()->type() == QEvent::KeyPress) { QEvent *wrappedEvent = static_cast(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( static_cast(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] -- cgit v1.2.3