summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensorgestures
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-02 02:09:24 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-12-02 08:46:51 +0000
commit2c595c382c50a5632b14eda00d85a9b7fcb09b5d (patch)
treef8e070d11537c794ee99a977a7de91c460d5ebc7 /src/plugins/sensorgestures
parent07bf3002fecd493a47bfb97420d3c3fbe6ee1458 (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')
-rw-r--r--src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qshake2recognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h6
-rw-r--r--src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/shake/qshakerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h6
13 files changed, 61 insertions, 61 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
index 1478e70d..d9c57e80 100644
--- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QCoverSensorGestureRecognizer(QObject *parent = 0);
~QCoverSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void cover();
diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
index 6522882e..73d7db56 100644
--- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
@@ -56,12 +56,12 @@ public:
explicit QDoubleTapSensorGestureRecognizer(QObject *parent = 0);
~QDoubleTapSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void doubletap();
diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
index 89fdb4d8..124475ad 100644
--- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QFreefallSensorGestureRecognizer(QObject *parent = 0);
~QFreefallSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void freefall();
diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
index 072f8402..d0c8f706 100644
--- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QHoverSensorGestureRecognizer(QObject *parent = 0);
~QHoverSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void hover();
diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
index 28e511c3..fdc0a6fe 100644
--- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
@@ -53,12 +53,12 @@ public:
explicit QPickupSensorGestureRecognizer(QObject *parent = 0);
~QPickupSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void pickup();
diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
index 3b8c5ecd..9e402cf6 100644
--- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
@@ -71,12 +71,12 @@ public:
QShake2SensorGestureRecognizer(QObject *parent = 0);
~QShake2SensorGestureRecognizer();
- 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;
int timerTimeout;
diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
index c2a1fc66..4217eec3 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QSlamSensorGestureRecognizer(QObject *parent = 0);
~QSlamSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void slam();
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
index 79b6cf4d..87a93f16 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
@@ -56,11 +56,11 @@ class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterfa
public:
explicit QtSensorGesturePlugin();
~QtSensorGesturePlugin();
- 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 "QtSensorGestures"; }
+ QStringList supportedIds() const override;
+ QString name() const override { return "QtSensorGestures"; }
};
diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
index 679a4430..295cb5f7 100644
--- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
@@ -52,12 +52,12 @@ public:
explicit QTurnoverSensorGestureRecognizer(QObject *parent = 0);
~QTurnoverSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void turnover();
diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
index a12845cb..3080e2a6 100644
--- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
@@ -61,12 +61,12 @@ public:
explicit QTwistSensorGestureRecognizer(QObject *parent = 0);
~QTwistSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void twistLeft();
diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
index 8e143459..6d674ab5 100644
--- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
@@ -54,12 +54,12 @@ public:
explicit QWhipSensorGestureRecognizer(QObject *parent = 0);
~QWhipSensorGestureRecognizer();
- 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;
Q_SIGNALS:
void whip();
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