From ceeed543d3218210afd2caca48506dbe7596a8ab Mon Sep 17 00:00:00 2001
From: Thomas McGuire <thomas.mcguire.qnx@kdab.com>
Date: Fri, 29 Jun 2012 11:14:29 +0200
Subject: 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>
---
 src/plugins/sensors/blackberry/bbaccelerometer.h     |  2 +-
 src/plugins/sensors/blackberry/bbaltimeter.h         |  2 +-
 src/plugins/sensors/blackberry/bbcompass.h           |  2 +-
 src/plugins/sensors/blackberry/bbgyroscope.h         |  4 ++--
 src/plugins/sensors/blackberry/bbirproximitysensor.h |  2 +-
 src/plugins/sensors/blackberry/bblightsensor.h       |  2 +-
 src/plugins/sensors/blackberry/bbmagnetometer.h      |  4 ++--
 src/plugins/sensors/blackberry/bborientationsensor.h | 10 +++++-----
 src/plugins/sensors/blackberry/bbpressuresensor.h    |  2 +-
 src/plugins/sensors/blackberry/bbproximitysensor.h   |  2 +-
 src/plugins/sensors/blackberry/bbrotationsensor.h    | 10 +++++-----
 src/plugins/sensors/blackberry/bbsensorbackend.h     |  4 ++--
 src/plugins/sensors/blackberry/main.cpp              |  4 ++--
 13 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'src/plugins/sensors/blackberry')

diff --git a/src/plugins/sensors/blackberry/bbaccelerometer.h b/src/plugins/sensors/blackberry/bbaccelerometer.h
index 7442dd42..5e2efe21 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 ea283d4e..ea10da9a 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 64075d6d..59557c39 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 5e2465eb..3685bae2 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 534b8901..70c97aef 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 210ea098..38d30e2f 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 4ab482a2..0f9cb480 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 44793093..8dcb2711 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 25f62f03..12ca0fd7 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 0cbdb8fb..e7851fe6 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 d2fd8a05..96511c4b 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 dbb07515..5cfefbd9 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 e5827760..aba02aa5 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)
-- 
cgit v1.2.3