diff options
author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-06-29 11:14:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-02 13:45:59 +0200 |
commit | ceeed543d3218210afd2caca48506dbe7596a8ab (patch) | |
tree | 4fa0bd01c58baf7fefec366c24ed27f77f4fa86e /src | |
parent | 20769d97920674d9b7480d1f2305315dcd9d2819 (diff) | |
download | qtsensors-ceeed543d3218210afd2caca48506dbe7596a8ab.tar.gz |
Blackberry: Add Q_DECL_OVERRIDE keywords
Change-Id: Iae2c29ac040d32623ec49976cf4df0a7a492d28b
Reviewed-by: Adam Parco <aparco@rim.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/sensors/blackberry/bbaccelerometer.h | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbaltimeter.h | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbcompass.h | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbgyroscope.h | 4 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbirproximitysensor.h | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bblightsensor.h | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbmagnetometer.h | 4 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bborientationsensor.h | 10 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbpressuresensor.h | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbproximitysensor.h | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbrotationsensor.h | 10 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbsensorbackend.h | 4 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/main.cpp | 4 |
13 files changed, 25 insertions, 25 deletions
diff --git a/src/plugins/sensors/blackberry/bbaccelerometer.h b/src/plugins/sensors/blackberry/bbaccelerometer.h index 7442dd4..5e2efe2 100644 --- a/src/plugins/sensors/blackberry/bbaccelerometer.h +++ b/src/plugins/sensors/blackberry/bbaccelerometer.h @@ -54,7 +54,7 @@ public: static QString devicePath(); protected: - bool updateReadingFromEvent(const sensor_event_t &event, QAccelerometerReading *reading); + bool updateReadingFromEvent(const sensor_event_t &event, QAccelerometerReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bbaltimeter.h b/src/plugins/sensors/blackberry/bbaltimeter.h index ea283d4..ea10da9 100644 --- a/src/plugins/sensors/blackberry/bbaltimeter.h +++ b/src/plugins/sensors/blackberry/bbaltimeter.h @@ -65,7 +65,7 @@ public: static QString devicePath(); protected: - bool updateReadingFromEvent(const sensor_event_t &event, BbAltimeterReading *reading); + bool updateReadingFromEvent(const sensor_event_t &event, BbAltimeterReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bbcompass.h b/src/plugins/sensors/blackberry/bbcompass.h index 64075d6..59557c3 100644 --- a/src/plugins/sensors/blackberry/bbcompass.h +++ b/src/plugins/sensors/blackberry/bbcompass.h @@ -54,7 +54,7 @@ public: static QString devicePath(); protected: - bool updateReadingFromEvent(const sensor_event_t &event, QCompassReading *reading); + bool updateReadingFromEvent(const sensor_event_t &event, QCompassReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bbgyroscope.h b/src/plugins/sensors/blackberry/bbgyroscope.h index 5e2465e..3685bae 100644 --- a/src/plugins/sensors/blackberry/bbgyroscope.h +++ b/src/plugins/sensors/blackberry/bbgyroscope.h @@ -54,8 +54,8 @@ public: static QString devicePath(); protected: - qreal convertValue(float bbValue); - bool updateReadingFromEvent(const sensor_event_t &event, QGyroscopeReading *reading); + qreal convertValue(float bbValue) Q_DECL_OVERRIDE; + bool updateReadingFromEvent(const sensor_event_t &event, QGyroscopeReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bbirproximitysensor.h b/src/plugins/sensors/blackberry/bbirproximitysensor.h index 534b890..70c97ae 100644 --- a/src/plugins/sensors/blackberry/bbirproximitysensor.h +++ b/src/plugins/sensors/blackberry/bbirproximitysensor.h @@ -54,7 +54,7 @@ public: static QString devicePath(); protected: - bool updateReadingFromEvent(const sensor_event_t &event, QIRProximityReading *reading); + bool updateReadingFromEvent(const sensor_event_t &event, QIRProximityReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bblightsensor.h b/src/plugins/sensors/blackberry/bblightsensor.h index 210ea09..38d30e2 100644 --- a/src/plugins/sensors/blackberry/bblightsensor.h +++ b/src/plugins/sensors/blackberry/bblightsensor.h @@ -54,7 +54,7 @@ public: static QString devicePath(); protected: - bool updateReadingFromEvent(const sensor_event_t &event, QLightReading *reading); + bool updateReadingFromEvent(const sensor_event_t &event, QLightReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bbmagnetometer.h b/src/plugins/sensors/blackberry/bbmagnetometer.h index 4ab482a..0f9cb48 100644 --- a/src/plugins/sensors/blackberry/bbmagnetometer.h +++ b/src/plugins/sensors/blackberry/bbmagnetometer.h @@ -54,8 +54,8 @@ public: static QString devicePath(); protected: - qreal convertValue(float bbValue); - bool updateReadingFromEvent(const sensor_event_t &event, QMagnetometerReading *reading); + qreal convertValue(float bbValue) Q_DECL_OVERRIDE; + bool updateReadingFromEvent(const sensor_event_t &event, QMagnetometerReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bborientationsensor.h b/src/plugins/sensors/blackberry/bborientationsensor.h index 4479309..8dcb271 100644 --- a/src/plugins/sensors/blackberry/bborientationsensor.h +++ b/src/plugins/sensors/blackberry/bborientationsensor.h @@ -56,7 +56,7 @@ class BbOrientationReading : public QOrientationReading public: explicit BbOrientationReading(QObject *parent = 0); ~BbOrientationReading(); - void copyValuesFrom(QSensorReading *other); + void copyValuesFrom(QSensorReading *other) Q_DECL_OVERRIDE; int rotation() const; void setRotation(int rotation); @@ -73,12 +73,12 @@ public: static QString devicePath(); - void start(); - void additionalDeviceInit(); - bool addDefaultRange(); + void start() Q_DECL_OVERRIDE; + void additionalDeviceInit() Q_DECL_OVERRIDE; + bool addDefaultRange() Q_DECL_OVERRIDE; protected: - bool updateReadingFromEvent(const sensor_event_t &event, BbOrientationReading *reading); + bool updateReadingFromEvent(const sensor_event_t &event, BbOrientationReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bbpressuresensor.h b/src/plugins/sensors/blackberry/bbpressuresensor.h index 25f62f0..12ca0fd 100644 --- a/src/plugins/sensors/blackberry/bbpressuresensor.h +++ b/src/plugins/sensors/blackberry/bbpressuresensor.h @@ -65,7 +65,7 @@ public: static QString devicePath(); protected: - bool updateReadingFromEvent(const sensor_event_t &event, BbPressureReading *reading); + bool updateReadingFromEvent(const sensor_event_t &event, BbPressureReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bbproximitysensor.h b/src/plugins/sensors/blackberry/bbproximitysensor.h index 0cbdb8f..e7851fe 100644 --- a/src/plugins/sensors/blackberry/bbproximitysensor.h +++ b/src/plugins/sensors/blackberry/bbproximitysensor.h @@ -80,7 +80,7 @@ public: static QString devicePath(); protected: - bool updateReadingFromEvent(const sensor_event_t &event, BbProximityReading *reading); + bool updateReadingFromEvent(const sensor_event_t &event, BbProximityReading *reading) Q_DECL_OVERRIDE; }; #endif diff --git a/src/plugins/sensors/blackberry/bbrotationsensor.h b/src/plugins/sensors/blackberry/bbrotationsensor.h index d2fd8a0..96511c4 100644 --- a/src/plugins/sensors/blackberry/bbrotationsensor.h +++ b/src/plugins/sensors/blackberry/bbrotationsensor.h @@ -54,13 +54,13 @@ public: static QString devicePath(); protected: - void additionalDeviceInit(); - bool addDefaultRange(); - qreal convertValue(float bbValue); - bool updateReadingFromEvent(const sensor_event_t &event, QRotationReading *reading); + void additionalDeviceInit() Q_DECL_OVERRIDE; + bool addDefaultRange() Q_DECL_OVERRIDE; + qreal convertValue(float bbValue) Q_DECL_OVERRIDE; + bool updateReadingFromEvent(const sensor_event_t &event, QRotationReading *reading) Q_DECL_OVERRIDE; bool isAutoAxisRemappingEnabled() const; - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; private: void updateOrientation(); diff --git a/src/plugins/sensors/blackberry/bbsensorbackend.h b/src/plugins/sensors/blackberry/bbsensorbackend.h index dbb0751..5cfefbd 100644 --- a/src/plugins/sensors/blackberry/bbsensorbackend.h +++ b/src/plugins/sensors/blackberry/bbsensorbackend.h @@ -65,8 +65,8 @@ public: void initSensorInfo(); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; protected: QFile& deviceFile(); diff --git a/src/plugins/sensors/blackberry/main.cpp b/src/plugins/sensors/blackberry/main.cpp index e582776..aba02aa 100644 --- a/src/plugins/sensors/blackberry/main.cpp +++ b/src/plugins/sensors/blackberry/main.cpp @@ -76,7 +76,7 @@ class BbSensorPlugin : public QObject, public QSensorPluginInterface, public QSe Q_INTERFACES(QSensorPluginInterface) public: - void registerSensors() + void registerSensors() Q_DECL_OVERRIDE { if (sensorSupported(BbAccelerometer::devicePath())) QSensorManager::registerBackend(QAccelerometer::type, bbAccelerometerId, this); @@ -106,7 +106,7 @@ public: QSensorManager::registerBackend("BbTemperatureSensor", bbTemperatureSensorId, this); } - QSensorBackend *createBackend(QSensor *sensor) + QSensorBackend *createBackend(QSensor *sensor) Q_DECL_OVERRIDE { BbSensorBackendBase *backend = 0; if (sensor->identifier() == bbAccelerometerId) |