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/qpressuresensor.h | |
| parent | f57241666fd4b7074cbe33567827293e2a0a9ad5 (diff) | |
| parent | 3d75c54b8d0d055eff2a41cef7733b6204f8241c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I497c153fe555fbfbbd5fbb40f65f614ee33b065d
Diffstat (limited to 'src/sensors/qpressuresensor.h')
| -rw-r--r-- | src/sensors/qpressuresensor.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sensors/qpressuresensor.h b/src/sensors/qpressuresensor.h index 4df22899..8a14d410 100644 --- a/src/sensors/qpressuresensor.h +++ b/src/sensors/qpressuresensor.h @@ -66,8 +66,7 @@ class Q_SENSORS_EXPORT QPressureFilter : public QSensorFilter public: virtual bool filter(QPressureReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE - { return filter(static_cast<QPressureReading*>(reading)); } + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT QPressureSensor : public QSensor @@ -76,7 +75,7 @@ class Q_SENSORS_EXPORT QPressureSensor : public QSensor public: explicit QPressureSensor(QObject *parent = 0); ~QPressureSensor(); - QPressureReading *reading() const { return static_cast<QPressureReading*>(QSensor::reading()); } + QPressureReading *reading() const; static char const * const type; private: |