diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-12 10:17:24 +0300 |
---|---|---|
committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-19 08:25:33 +0300 |
commit | d70a9906fced63aa1b8502dbdac58d4c244ef956 (patch) | |
tree | 0db8326ab7dd36da26e08e0825be01f631cbc3c7 /src/plugins/sensors/iio-sensor-proxy/main.cpp | |
parent | 8eb9e3dd16c0057f81fa41c001722f31af32dfdf (diff) |
Rename subclass static variable which shadowed baseclass method
The 'type' static variable shadowed the 'QSensors::type()' method of
the baseclass. While this is easy to workaround it is better to
remove such naming clash.
Task-number: QTBUG-60246
Change-Id: Id0ddae978377ea4d4d0202a572c554c2541f9364
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/sensors/iio-sensor-proxy/main.cpp')
-rw-r--r-- | src/plugins/sensors/iio-sensor-proxy/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/sensors/iio-sensor-proxy/main.cpp b/src/plugins/sensors/iio-sensor-proxy/main.cpp index 580e2c46..0fc10b8e 100644 --- a/src/plugins/sensors/iio-sensor-proxy/main.cpp +++ b/src/plugins/sensors/iio-sensor-proxy/main.cpp @@ -61,12 +61,12 @@ public: void registerSensors() override { if (QDBusConnection::systemBus().interface()->isServiceRegistered("net.hadess.SensorProxy")) { - if (!QSensorManager::isBackendRegistered(QOrientationSensor::type, IIOSensorProxyOrientationSensor::id)) - QSensorManager::registerBackend(QOrientationSensor::type, IIOSensorProxyOrientationSensor::id, this); - if (!QSensorManager::isBackendRegistered(QLightSensor::type, IIOSensorProxyLightSensor::id)) - QSensorManager::registerBackend(QLightSensor::type, IIOSensorProxyLightSensor::id, this); - if (!QSensorManager::isBackendRegistered(QCompass::type, IIOSensorProxyCompass::id)) - QSensorManager::registerBackend(QCompass::type, IIOSensorProxyCompass::id, this); + if (!QSensorManager::isBackendRegistered(QOrientationSensor::sensorType, IIOSensorProxyOrientationSensor::id)) + QSensorManager::registerBackend(QOrientationSensor::sensorType, IIOSensorProxyOrientationSensor::id, this); + if (!QSensorManager::isBackendRegistered(QLightSensor::sensorType, IIOSensorProxyLightSensor::id)) + QSensorManager::registerBackend(QLightSensor::sensorType, IIOSensorProxyLightSensor::id, this); + if (!QSensorManager::isBackendRegistered(QCompass::sensorType, IIOSensorProxyCompass::id)) + QSensorManager::registerBackend(QCompass::sensorType, IIOSensorProxyCompass::id, this); } } |