diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-02 02:09:24 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-02 08:46:51 +0000 |
commit | 2c595c382c50a5632b14eda00d85a9b7fcb09b5d (patch) | |
tree | f8e070d11537c794ee99a977a7de91c460d5ebc7 /src/plugins/sensorgestures/shake | |
parent | 07bf3002fecd493a47bfb97420d3c3fbe6ee1458 (diff) |
Replace Q_DECL_OVERRIDE by override
'override' keyword can be used directly since Qt 5.7.
Change-Id: Ibf0fc590f7e247a310a833a22ece700ec75199bb
Reviewed-by: Lorn Potter <lorn.potter@canonical.com>
Diffstat (limited to 'src/plugins/sensorgestures/shake')
-rw-r--r-- | src/plugins/sensorgestures/shake/qshakerecognizer.h | 10 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h index 46d16326..21c85664 100644 --- a/src/plugins/sensorgestures/shake/qshakerecognizer.h +++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h @@ -64,12 +64,12 @@ public: QShakeSensorGestureRecognizer(QObject *parent = 0); ~QShakeSensorGestureRecognizer(); - void create() Q_DECL_OVERRIDE; + void create() override; - QString id() const Q_DECL_OVERRIDE; - bool start() Q_DECL_OVERRIDE; - bool stop() Q_DECL_OVERRIDE; - bool isActive() Q_DECL_OVERRIDE; + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; QTimer *timer; int timerTimeout; diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h index 397ae071..96814eb8 100644 --- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h +++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h @@ -55,11 +55,11 @@ public: explicit QShakeSensorGesturePlugin(); ~QShakeSensorGesturePlugin(); - QList <QSensorGestureRecognizer *> createRecognizers() Q_DECL_OVERRIDE; + QList <QSensorGestureRecognizer *> createRecognizers() override; QStringList gestureSignals() const; - QStringList supportedIds() const Q_DECL_OVERRIDE; - QString name() const Q_DECL_OVERRIDE { return "ShakeGestures"; } + QStringList supportedIds() const override; + QString name() const override { return "ShakeGestures"; } }; #endif // QSHAKESENSORGESTUREPLUGIN_H |