summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-20 20:57:46 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-21 10:28:44 +0000
commitdcedd30fc78ef2877d49b9c2c64eb92fb7a04f59 (patch)
treecd8319f52b0f2645d1ff25912069a6bca2c3f921
parent4fbebd77c38c5e27404d2bcbcaa1a94ff540b4b7 (diff)
Replace Q_DECL_OVERRIDE with override
Change-Id: Ib258bbc787f43e563fff8af8151ceae87471c672 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
-rw-r--r--src/imports/sensors/qmlhumiditysensor.h8
-rw-r--r--src/imports/sensors/qmllidsensor.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwlidsensor.h6
-rw-r--r--src/sensors/qhumiditysensor.h2
-rw-r--r--src/sensors/qlidsensor.h2
5 files changed, 13 insertions, 13 deletions
diff --git a/src/imports/sensors/qmlhumiditysensor.h b/src/imports/sensors/qmlhumiditysensor.h
index 9fc54ac1..a84a428e 100644
--- a/src/imports/sensors/qmlhumiditysensor.h
+++ b/src/imports/sensors/qmlhumiditysensor.h
@@ -55,8 +55,8 @@ public:
~QmlHumiditySensor();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ QmlSensorReading *createReading() const override;
QHumiditySensor *m_sensor;
};
@@ -78,8 +78,8 @@ Q_SIGNALS:
void absoluteHumidityChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QHumiditySensor *m_sensor;
qreal m_relativeHumidity;
diff --git a/src/imports/sensors/qmllidsensor.h b/src/imports/sensors/qmllidsensor.h
index caa44ef4..37c2faeb 100644
--- a/src/imports/sensors/qmllidsensor.h
+++ b/src/imports/sensors/qmllidsensor.h
@@ -53,8 +53,8 @@ public:
~QmlLidSensor();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ QmlSensorReading *createReading() const override;
QLidSensor *m_sensor;
};
@@ -76,8 +76,8 @@ Q_SIGNALS:
bool frontLidChanged(bool closed);
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QLidSensor *m_sensor;
bool m_backClosed;
diff --git a/src/plugins/sensors/sensorfw/sensorfwlidsensor.h b/src/plugins/sensors/sensorfw/sensorfwlidsensor.h
index 734fd0f3..7ee967a9 100644
--- a/src/plugins/sensors/sensorfw/sensorfwlidsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwlidsensor.h
@@ -56,9 +56,9 @@ public:
static char const * const id;
SensorfwLidSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QLidReading m_reading;
diff --git a/src/sensors/qhumiditysensor.h b/src/sensors/qhumiditysensor.h
index d916fb73..f24d2be2 100644
--- a/src/sensors/qhumiditysensor.h
+++ b/src/sensors/qhumiditysensor.h
@@ -66,7 +66,7 @@ class Q_SENSORS_EXPORT QHumidityFilter : public QSensorFilter
public:
virtual bool filter(QHumidityReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class QHumiditySensorPrivate;
diff --git a/src/sensors/qlidsensor.h b/src/sensors/qlidsensor.h
index c0f88a79..f7992cac 100644
--- a/src/sensors/qlidsensor.h
+++ b/src/sensors/qlidsensor.h
@@ -69,7 +69,7 @@ class Q_SENSORS_EXPORT QLidFilter : public QSensorFilter
public:
virtual bool filter(QLidReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QLidSensor : public QSensor