diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-06-16 10:54:52 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-22 11:04:55 +0000 |
commit | 269d8b48b41b735fe76e5315a41bcbbb30480a5b (patch) | |
tree | 7e130e948a29020dda324551d2bd224157a5c5c8 | |
parent | 6cce2d5d53f16f764e38bb7c29196465718fa3cf (diff) |
Remove unused QmlSensorReading constructor parameter
The ctor parameter is not used. For clarity it should be mentioned
that the memory management of the created 'reading' is done by
explicitly parenting the 'reading' in the qmlsensor baseclass.
Task-number: QTBUG-92505
Change-Id: I4e50bcafa7789f7400364078302339915473a3b1
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 89905b1ea1c81013d21093c95f6fee2665fdaa69)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
22 files changed, 23 insertions, 52 deletions
diff --git a/src/sensorsquick/qmlaccelerometer.cpp b/src/sensorsquick/qmlaccelerometer.cpp index 2063ec69..f6f4ec11 100644 --- a/src/sensorsquick/qmlaccelerometer.cpp +++ b/src/sensorsquick/qmlaccelerometer.cpp @@ -118,8 +118,7 @@ QSensor *QmlAccelerometer::sensor() const */ QmlAccelerometerReading::QmlAccelerometerReading(QAccelerometer *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlaltimeter.cpp b/src/sensorsquick/qmlaltimeter.cpp index fe0177db..2c80c365 100644 --- a/src/sensorsquick/qmlaltimeter.cpp +++ b/src/sensorsquick/qmlaltimeter.cpp @@ -94,8 +94,7 @@ QSensor *QmlAltimeter::sensor() const */ QmlAltimeterReading::QmlAltimeterReading(QAltimeter *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlambientlightsensor.cpp b/src/sensorsquick/qmlambientlightsensor.cpp index 6854baf7..0dbe9157 100644 --- a/src/sensorsquick/qmlambientlightsensor.cpp +++ b/src/sensorsquick/qmlambientlightsensor.cpp @@ -95,8 +95,7 @@ QSensor *QmlAmbientLightSensor::sensor() const */ QmlAmbientLightSensorReading::QmlAmbientLightSensorReading(QAmbientLightSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlambienttemperaturesensor.cpp b/src/sensorsquick/qmlambienttemperaturesensor.cpp index 2dccfa38..652b45d8 100644 --- a/src/sensorsquick/qmlambienttemperaturesensor.cpp +++ b/src/sensorsquick/qmlambienttemperaturesensor.cpp @@ -94,8 +94,7 @@ QSensor *QmlAmbientTemperatureSensor::sensor() const */ QmlAmbientTemperatureReading::QmlAmbientTemperatureReading(QAmbientTemperatureSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) , m_temperature(0) { } diff --git a/src/sensorsquick/qmlcompass.cpp b/src/sensorsquick/qmlcompass.cpp index c1c110d1..d5f12b19 100644 --- a/src/sensorsquick/qmlcompass.cpp +++ b/src/sensorsquick/qmlcompass.cpp @@ -95,8 +95,7 @@ QSensor *QmlCompass::sensor() const */ QmlCompassReading::QmlCompassReading(QCompass *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmldistancesensor.cpp b/src/sensorsquick/qmldistancesensor.cpp index 8d48ece9..a779fbb2 100644 --- a/src/sensorsquick/qmldistancesensor.cpp +++ b/src/sensorsquick/qmldistancesensor.cpp @@ -94,8 +94,7 @@ QSensor *QmlDistanceSensor::sensor() const */ QmlDistanceReading::QmlDistanceReading(QDistanceSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) , m_distance(0.0) { } diff --git a/src/sensorsquick/qmlgyroscope.cpp b/src/sensorsquick/qmlgyroscope.cpp index 2db7a67f..7654805a 100644 --- a/src/sensorsquick/qmlgyroscope.cpp +++ b/src/sensorsquick/qmlgyroscope.cpp @@ -94,8 +94,7 @@ QSensor *QmlGyroscope::sensor() const */ QmlGyroscopeReading::QmlGyroscopeReading(QGyroscope *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlholstersensor.cpp b/src/sensorsquick/qmlholstersensor.cpp index d1b8863c..b8b28b32 100644 --- a/src/sensorsquick/qmlholstersensor.cpp +++ b/src/sensorsquick/qmlholstersensor.cpp @@ -94,8 +94,7 @@ QSensor *QmlHolsterSensor::sensor() const */ QmlHolsterReading::QmlHolsterReading(QHolsterSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) , m_holstered(false) { } diff --git a/src/sensorsquick/qmlhumiditysensor.cpp b/src/sensorsquick/qmlhumiditysensor.cpp index 4715789c..ad7aa6de 100644 --- a/src/sensorsquick/qmlhumiditysensor.cpp +++ b/src/sensorsquick/qmlhumiditysensor.cpp @@ -95,8 +95,7 @@ QSensor *QmlHumiditySensor::sensor() const */ QmlHumidityReading::QmlHumidityReading(QHumiditySensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) , m_relativeHumidity(0) , m_absoluteHumidity(0) { diff --git a/src/sensorsquick/qmlirproximitysensor.cpp b/src/sensorsquick/qmlirproximitysensor.cpp index 9623377a..81c41f33 100644 --- a/src/sensorsquick/qmlirproximitysensor.cpp +++ b/src/sensorsquick/qmlirproximitysensor.cpp @@ -93,8 +93,7 @@ QSensor *QmlIRProximitySensor::sensor() const */ QmlIRProximitySensorReading::QmlIRProximitySensorReading(QIRProximitySensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmllidsensor.cpp b/src/sensorsquick/qmllidsensor.cpp index 68d92181..3c841f2b 100644 --- a/src/sensorsquick/qmllidsensor.cpp +++ b/src/sensorsquick/qmllidsensor.cpp @@ -94,8 +94,7 @@ QSensor *QmlLidSensor::sensor() const */ QmlLidReading::QmlLidReading(QLidSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) , m_backClosed(false) , m_frontClosed(true) { diff --git a/src/sensorsquick/qmllightsensor.cpp b/src/sensorsquick/qmllightsensor.cpp index 2be7e1e0..9761fe47 100644 --- a/src/sensorsquick/qmllightsensor.cpp +++ b/src/sensorsquick/qmllightsensor.cpp @@ -109,8 +109,7 @@ qreal QmlLightSensor::fieldOfView() const */ QmlLightSensorReading::QmlLightSensorReading(QLightSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlmagnetometer.cpp b/src/sensorsquick/qmlmagnetometer.cpp index f2d144a5..b228360e 100644 --- a/src/sensorsquick/qmlmagnetometer.cpp +++ b/src/sensorsquick/qmlmagnetometer.cpp @@ -116,8 +116,7 @@ void QmlMagnetometer::setReturnGeoValues(bool geo) */ QmlMagnetometerReading::QmlMagnetometerReading(QMagnetometer *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlorientationsensor.cpp b/src/sensorsquick/qmlorientationsensor.cpp index c44df521..50e5ea2e 100644 --- a/src/sensorsquick/qmlorientationsensor.cpp +++ b/src/sensorsquick/qmlorientationsensor.cpp @@ -95,8 +95,7 @@ QSensor *QmlOrientationSensor::sensor() const */ QmlOrientationSensorReading::QmlOrientationSensorReading(QOrientationSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlpressuresensor.cpp b/src/sensorsquick/qmlpressuresensor.cpp index 054f089e..285d321c 100644 --- a/src/sensorsquick/qmlpressuresensor.cpp +++ b/src/sensorsquick/qmlpressuresensor.cpp @@ -94,8 +94,7 @@ QSensor *QmlPressureSensor::sensor() const */ QmlPressureReading::QmlPressureReading(QPressureSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) , m_pressure(0) , m_temperature(0) { diff --git a/src/sensorsquick/qmlproximitysensor.cpp b/src/sensorsquick/qmlproximitysensor.cpp index fcf73452..c45bc7bb 100644 --- a/src/sensorsquick/qmlproximitysensor.cpp +++ b/src/sensorsquick/qmlproximitysensor.cpp @@ -95,8 +95,7 @@ QSensor *QmlProximitySensor::sensor() const */ QmlProximitySensorReading::QmlProximitySensorReading(QProximitySensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlrotationsensor.cpp b/src/sensorsquick/qmlrotationsensor.cpp index c9cbeb21..be453a87 100644 --- a/src/sensorsquick/qmlrotationsensor.cpp +++ b/src/sensorsquick/qmlrotationsensor.cpp @@ -110,8 +110,7 @@ bool QmlRotationSensor::hasZ() const */ QmlRotationSensorReading::QmlRotationSensorReading(QRotationSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmlsensor.cpp b/src/sensorsquick/qmlsensor.cpp index eccdb57b..c722343f 100644 --- a/src/sensorsquick/qmlsensor.cpp +++ b/src/sensorsquick/qmlsensor.cpp @@ -523,15 +523,6 @@ void QmlSensor::updateReading() This element cannot be directly created. */ -QmlSensorReading::QmlSensorReading(QSensor *) - : QObject(nullptr) -{ -} - -QmlSensorReading::~QmlSensorReading() -{ -} - /*! \qmlproperty quint64 SensorReading::timestamp A timestamp for the reading. diff --git a/src/sensorsquick/qmlsensor_p.h b/src/sensorsquick/qmlsensor_p.h index b5a63cfd..801934dc 100644 --- a/src/sensorsquick/qmlsensor_p.h +++ b/src/sensorsquick/qmlsensor_p.h @@ -206,8 +206,8 @@ class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorReading : public QObject QML_UNCREATABLE("Cannot create SensorReading") QML_ADDED_IN_VERSION(5,0) public: - explicit QmlSensorReading(QSensor *sensor); - ~QmlSensorReading(); + explicit QmlSensorReading() = default; + ~QmlSensorReading() = default; quint64 timestamp() const; QBindable<quint64> bindableTimestamp() const; diff --git a/src/sensorsquick/qmltapsensor.cpp b/src/sensorsquick/qmltapsensor.cpp index 190bda45..ae89cc4b 100644 --- a/src/sensorsquick/qmltapsensor.cpp +++ b/src/sensorsquick/qmltapsensor.cpp @@ -116,8 +116,7 @@ void QmlTapSensor::setReturnDoubleTapEvents(bool ret) */ QmlTapSensorReading::QmlTapSensorReading(QTapSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/src/sensorsquick/qmltiltsensor.cpp b/src/sensorsquick/qmltiltsensor.cpp index 64ea3a98..4912c9f1 100644 --- a/src/sensorsquick/qmltiltsensor.cpp +++ b/src/sensorsquick/qmltiltsensor.cpp @@ -110,8 +110,7 @@ void QmlTiltSensor::calibrate() */ QmlTiltSensorReading::QmlTiltSensorReading(QTiltSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } diff --git a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp index 4b81aad6..d266649f 100644 --- a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp +++ b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp @@ -351,8 +351,7 @@ class QmlDummySensorReading : public QmlSensorReading { Q_OBJECT public: - QmlDummySensorReading(QSensor *sensor) : - QmlSensorReading(sensor), + QmlDummySensorReading() : m_reading(new QDummySensorReading(this)) {} @@ -376,7 +375,7 @@ public: } QSensor *sensor() const override { return m_sensor; } - QmlSensorReading *createReading() const override { return new QmlDummySensorReading(m_sensor); } + QmlSensorReading *createReading() const override { return new QmlDummySensorReading(); } void componentComplete() override { QmlSensor::componentComplete(); } |