From 400ad25d72b8b2d9a10057953a88d7d64b9bc0a9 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Mon, 18 Nov 2013 23:07:09 +0100 Subject: Make QtSensors use Q_DECL_OVERRIDE This patch aims to make QtSensors uses Q_DECL_OVERRIDE uniformly across the module Task-number: QTBUG-27392 Change-Id: I5f814f93307159175f92e29a9990587c03cce96f Reviewed-by: Thomas McGuire --- .../sensorgestures/qtsensors/qcoversensorgesturerecognizer.h | 10 +++++----- .../qtsensors/qdoubletapsensorgesturerecognizer.h | 11 ++++++----- .../qtsensors/qfreefallsensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qhoversensorgesturerecognizer.h | 11 ++++++----- .../qtsensors/qpickupsensorgesturerecognizer.h | 10 +++++----- src/plugins/sensorgestures/qtsensors/qshake2recognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qslamgesturerecognizer.h | 10 +++++----- src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h | 6 +++--- .../qtsensors/qturnoversensorgesturerecognizer.h | 12 +++++++----- .../sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h | 10 +++++----- 11 files changed, 57 insertions(+), 53 deletions(-) (limited to 'src/plugins/sensorgestures/qtsensors') diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h index 8df8e65e..5df98cc2 100644 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h @@ -57,12 +57,12 @@ public: explicit QCoverSensorGestureRecognizer(QObject *parent = 0); ~QCoverSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void cover(); diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h index a4e74cce..e1e660b3 100644 --- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h @@ -58,11 +58,12 @@ public: explicit QDoubleTapSensorGestureRecognizer(QObject *parent = 0); ~QDoubleTapSensorGestureRecognizer(); - void create(); - QString id() const; - bool start(); - bool stop(); - bool isActive(); + void create() Q_DECL_OVERRIDE; + + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void doubletap(); diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h index 094d0c6e..9f72582a 100644 --- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h @@ -57,12 +57,12 @@ public: explicit QFreefallSensorGestureRecognizer(QObject *parent = 0); ~QFreefallSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void freefall(); diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h index cb9d81aa..d8dc0097 100644 --- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h @@ -57,11 +57,12 @@ public: explicit QHoverSensorGestureRecognizer(QObject *parent = 0); ~QHoverSensorGestureRecognizer(); - void create(); - QString id() const; - bool start(); - bool stop(); - bool isActive(); + void create() Q_DECL_OVERRIDE; + + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void hover(); diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h index 2fd249fc..37f66058 100644 --- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h @@ -55,12 +55,12 @@ public: explicit QPickupSensorGestureRecognizer(QObject *parent = 0); ~QPickupSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void pickup(); diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h index 232d2adc..647b713f 100644 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h @@ -73,12 +73,12 @@ public: QShake2SensorGestureRecognizer(QObject *parent = 0); ~QShake2SensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; int timerTimeout; diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h index 49450334..5dba87a5 100644 --- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h @@ -56,12 +56,12 @@ public: explicit QSlamSensorGestureRecognizer(QObject *parent = 0); ~QSlamSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void slam(); diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h index 848a4f08..34455ace 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h +++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h @@ -58,11 +58,11 @@ class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterfa public: explicit QtSensorGesturePlugin(); ~QtSensorGesturePlugin(); - QList createRecognizers(); + QList createRecognizers() Q_DECL_OVERRIDE; QStringList gestureSignals() const; - QStringList supportedIds() const; - QString name() const { return "QtSensorGestures"; } + QStringList supportedIds() const Q_DECL_OVERRIDE; + QString name() const Q_DECL_OVERRIDE { return "QtSensorGestures"; } }; diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h index 3319ac50..1729f3ee 100644 --- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h @@ -53,11 +53,13 @@ class QTurnoverSensorGestureRecognizer : public QSensorGestureRecognizer public: explicit QTurnoverSensorGestureRecognizer(QObject *parent = 0); ~QTurnoverSensorGestureRecognizer(); - void create(); - QString id() const; - bool start(); - bool stop(); - bool isActive(); + + void create() Q_DECL_OVERRIDE; + + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void turnover(); diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h index a4b9ceb4..5db192af 100644 --- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h @@ -63,12 +63,12 @@ public: explicit QTwistSensorGestureRecognizer(QObject *parent = 0); ~QTwistSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void twistLeft(); diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h index e3ad7a05..a8aef52e 100644 --- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h @@ -56,12 +56,12 @@ public: explicit QWhipSensorGestureRecognizer(QObject *parent = 0); ~QWhipSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void whip(); -- cgit v1.2.3