diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:18:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:18:07 +0200 |
| commit | e8237a3d19e90c31af6d5a6c5e3a2f7815740226 (patch) | |
| tree | 24696c0400318684bc00cf36d41a445051b67b96 /src/sensors/qambienttemperaturesensor.h | |
| parent | f57241666fd4b7074cbe33567827293e2a0a9ad5 (diff) | |
| parent | 3d75c54b8d0d055eff2a41cef7733b6204f8241c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I497c153fe555fbfbbd5fbb40f65f614ee33b065d
Diffstat (limited to 'src/sensors/qambienttemperaturesensor.h')
| -rw-r--r-- | src/sensors/qambienttemperaturesensor.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sensors/qambienttemperaturesensor.h b/src/sensors/qambienttemperaturesensor.h index 134e5a92..c91392d0 100644 --- a/src/sensors/qambienttemperaturesensor.h +++ b/src/sensors/qambienttemperaturesensor.h @@ -62,8 +62,7 @@ class Q_SENSORS_EXPORT QAmbientTemperatureFilter : public QSensorFilter public: virtual bool filter(QAmbientTemperatureReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE - { return filter(static_cast<QAmbientTemperatureReading*>(reading)); } + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT QAmbientTemperatureSensor : public QSensor @@ -72,7 +71,7 @@ class Q_SENSORS_EXPORT QAmbientTemperatureSensor : public QSensor public: explicit QAmbientTemperatureSensor(QObject *parent = 0); ~QAmbientTemperatureSensor(); - QAmbientTemperatureReading *reading() const { return static_cast<QAmbientTemperatureReading*>(QSensor::reading()); } + QAmbientTemperatureReading *reading() const; static char const * const type; private: |