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>

9 files changed, 67 insertions, 69 deletions

diff --git a/src/plugins/sensors/android/main.cpp b/src/plugins/sensors/android/main.cpp
index 85853cd2..2d6f74ef 100644
--- a/src/plugins/sensors/android/main.cpp
+++ b/src/plugins/sensors/android/main.cpp
@@ -77,7 +77,7 @@ public:
             switch (sensor) {
             case ASENSOR_TYPE_ACCELEROMETER:
                 m_accelerationModes |= AndroidAccelerometer::Accelerometer;
-                QSensorManager::registerBackend(QAccelerometer::type, QByteArray::number(sensor), this);
+                QSensorManager::registerBackend(QAccelerometer::sensorType, QByteArray::number(sensor), this);
                 accelerometer = true;
                 break;
             case ASENSOR_TYPE_GRAVITY:
@@ -87,26 +87,26 @@ public:
                 m_accelerationModes |= AndroidAccelerometer::LinearAcceleration;
                 break;
             case ASENSOR_TYPE_AMBIENT_TEMPERATURE:
-                QSensorManager::registerBackend(QAmbientTemperatureSensor::type, QByteArray::number(sensor), this);
+                QSensorManager::registerBackend(QAmbientTemperatureSensor::sensorType, QByteArray::number(sensor), this);
                 break;
             case ASENSOR_TYPE_GYROSCOPE:
-                QSensorManager::registerBackend(QGyroscope::type, QByteArray::number(sensor), this);
+                QSensorManager::registerBackend(QGyroscope::sensorType, QByteArray::number(sensor), this);
                 break;
             case ASENSOR_TYPE_LIGHT:
-                QSensorManager::registerBackend(QLightSensor::type, QByteArray::number(sensor), this);
+                QSensorManager::registerBackend(QLightSensor::sensorType, QByteArray::number(sensor), this);
                 break;
             case ASENSOR_TYPE_MAGNETIC_FIELD:
-                QSensorManager::registerBackend(QMagnetometer::type, QByteArray::number(sensor), this);
+                QSensorManager::registerBackend(QMagnetometer::sensorType, QByteArray::number(sensor), this);
                 magnetometer = true;
                 break;
             case ASENSOR_TYPE_PRESSURE:
-                QSensorManager::registerBackend(QPressureSensor::type, QByteArray::number(sensor), this);
+                QSensorManager::registerBackend(QPressureSensor::sensorType, QByteArray::number(sensor), this);
                 break;
             case ASENSOR_TYPE_PROXIMITY:
-                QSensorManager::registerBackend(QProximitySensor::type, QByteArray::number(sensor), this);
+                QSensorManager::registerBackend(QProximitySensor::sensorType, QByteArray::number(sensor), this);
                 break;
             case ASENSOR_TYPE_ROTATION_VECTOR:
-                QSensorManager::registerBackend(QRotationSensor::type, QByteArray::number(sensor), this);
+                QSensorManager::registerBackend(QRotationSensor::sensorType, QByteArray::number(sensor), this);
                 break;
 
             case ASENSOR_TYPE_RELATIVE_HUMIDITY:
@@ -128,7 +128,7 @@ public:
             }
         }
         if (accelerometer && magnetometer)
-            QSensorManager::registerBackend(QCompass::type, AndroidCompassId, this);
+            QSensorManager::registerBackend(QCompass::sensorType, AndroidCompassId, this);
     }
 
     QSensorBackend *createBackend(QSensor *sensor) override
diff --git a/src/plugins/sensors/dummy/main.cpp b/src/plugins/sensors/dummy/main.cpp
index 13dd732e..2c515637 100644
--- a/src/plugins/sensors/dummy/main.cpp
+++ b/src/plugins/sensors/dummy/main.cpp
@@ -53,8 +53,8 @@ class dummySensorPlugin : public QObject, public QSensorPluginInterface, public
 public:
     void registerSensors() override
     {
-        QSensorManager::registerBackend(QAccelerometer::type, dummyaccelerometer::id, this);
-        QSensorManager::registerBackend(QAmbientLightSensor::type, dummylightsensor::id, this);
+        QSensorManager::registerBackend(QAccelerometer::sensorType, dummyaccelerometer::id, this);
+        QSensorManager::registerBackend(QAmbientLightSensor::sensorType, dummylightsensor::id, this);
     }
 
     QSensorBackend *createBackend(QSensor *sensor) override
diff --git a/src/plugins/sensors/generic/main.cpp b/src/plugins/sensors/generic/main.cpp
index 44bfff09..0ec87e61 100644
--- a/src/plugins/sensors/generic/main.cpp
+++ b/src/plugins/sensors/generic/main.cpp
@@ -68,44 +68,44 @@ public:
 
     void sensorsChanged() override
     {
-        if (!QSensor::defaultSensorForType(QAccelerometer::type).isEmpty()) {
+        if (!QSensor::defaultSensorForType(QAccelerometer::sensorType).isEmpty()) {
             // There is an accelerometer available. Register the backends
 #ifdef QTSENSORS_GENERICORIENTATIONSENSOR
-            if (!QSensorManager::isBackendRegistered(QOrientationSensor::type, genericorientationsensor::id))
-                QSensorManager::registerBackend(QOrientationSensor::type, genericorientationsensor::id, this);
+            if (!QSensorManager::isBackendRegistered(QOrientationSensor::sensorType, genericorientationsensor::id))
+                QSensorManager::registerBackend(QOrientationSensor::sensorType, genericorientationsensor::id, this);
 #endif
 #ifdef QTSENSORS_GENERICROTATIONSENSOR
-            if (!QSensorManager::isBackendRegistered(QRotationSensor::type, genericrotationsensor::id))
-                QSensorManager::registerBackend(QRotationSensor::type, genericrotationsensor::id, this);
+            if (!QSensorManager::isBackendRegistered(QRotationSensor::sensorType, genericrotationsensor::id))
+                QSensorManager::registerBackend(QRotationSensor::sensorType, genericrotationsensor::id, this);
 #endif
 #ifdef QTSENSORS_GENERICTILTSENSOR
-            if (!QSensorManager::isBackendRegistered(QTiltSensor::type, GenericTiltSensor::id))
-                QSensorManager::registerBackend(QTiltSensor::type, GenericTiltSensor::id, this);
+            if (!QSensorManager::isBackendRegistered(QTiltSensor::sensorType, GenericTiltSensor::id))
+                QSensorManager::registerBackend(QTiltSensor::sensorType, GenericTiltSensor::id, this);
 #endif
         } else {
 #ifdef QTSENSORS_GENERICORIENTATIONSENSOR
-            if (QSensorManager::isBackendRegistered(QOrientationSensor::type, genericorientationsensor::id))
-                QSensorManager::unregisterBackend(QOrientationSensor::type, genericorientationsensor::id);
+            if (QSensorManager::isBackendRegistered(QOrientationSensor::sensorType, genericorientationsensor::id))
+                QSensorManager::unregisterBackend(QOrientationSensor::sensorType, genericorientationsensor::id);
 #endif
 #ifdef QTSENSORS_GENERICROTATIONSENSOR
-            if (QSensorManager::isBackendRegistered(QRotationSensor::type, genericrotationsensor::id))
-                QSensorManager::unregisterBackend(QRotationSensor::type, genericrotationsensor::id);
+            if (QSensorManager::isBackendRegistered(QRotationSensor::sensorType, genericrotationsensor::id))
+                QSensorManager::unregisterBackend(QRotationSensor::sensorType, genericrotationsensor::id);
 #endif
 #ifdef QTSENSORS_GENERICTILTSENSOR
-            if (QSensorManager::isBackendRegistered(QTiltSensor::type, GenericTiltSensor::id))
-                QSensorManager::unregisterBackend(QTiltSensor::type, GenericTiltSensor::id);
+            if (QSensorManager::isBackendRegistered(QTiltSensor::sensorType, GenericTiltSensor::id))
+                QSensorManager::unregisterBackend(QTiltSensor::sensorType, GenericTiltSensor::id);
 #endif
         }
 
-        if (!QSensor::defaultSensorForType(QLightSensor::type).isEmpty()) {
+        if (!QSensor::defaultSensorForType(QLightSensor::sensorType).isEmpty()) {
 #ifdef QTSENSORS_GENERICALSSENSOR
-            if (!QSensorManager::isBackendRegistered(QAmbientLightSensor::type, genericalssensor::id))
-                QSensorManager::registerBackend(QAmbientLightSensor::type, genericalssensor::id, this);
+            if (!QSensorManager::isBackendRegistered(QAmbientLightSensor::sensorType, genericalssensor::id))
+                QSensorManager::registerBackend(QAmbientLightSensor::sensorType, genericalssensor::id, this);
 #endif
         } else {
 #ifdef QTSENSORS_GENERICALSSENSOR
-            if (QSensorManager::isBackendRegistered(QAmbientLightSensor::type, genericalssensor::id))
-                QSensorManager::unregisterBackend(QAmbientLightSensor::type, genericalssensor::id);
+            if (QSensorManager::isBackendRegistered(QAmbientLightSensor::sensorType, genericalssensor::id))
+                QSensorManager::unregisterBackend(QAmbientLightSensor::sensorType, genericalssensor::id);
 #endif
         }
     }
@@ -134,4 +134,3 @@ public:
 };
 
 #include "main.moc"
-
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);
         }
     }
 
diff --git a/src/plugins/sensors/ios/main.mm b/src/plugins/sensors/ios/main.mm
index d6b98192..13c71961 100644
--- a/src/plugins/sensors/ios/main.mm
+++ b/src/plugins/sensors/ios/main.mm
@@ -62,19 +62,19 @@ public:
     void registerSensors() override
     {
 #ifdef HAVE_COREMOTION
-        QSensorManager::registerBackend(QAccelerometer::type, IOSAccelerometer::id, this);
+        QSensorManager::registerBackend(QAccelerometer::sensorType, IOSAccelerometer::id, this);
         if ([QIOSMotionManager sharedManager].gyroAvailable)
-            QSensorManager::registerBackend(QGyroscope::type, IOSGyroscope::id, this);
+            QSensorManager::registerBackend(QGyroscope::sensorType, IOSGyroscope::id, this);
         if ([QIOSMotionManager sharedManager].magnetometerAvailable)
-            QSensorManager::registerBackend(QMagnetometer::type, IOSMagnetometer::id, this);
+            QSensorManager::registerBackend(QMagnetometer::sensorType, IOSMagnetometer::id, this);
 #endif
 #ifdef HAVE_COMPASS
         if ([CLLocationManager headingAvailable])
-            QSensorManager::registerBackend(QCompass::type, IOSCompass::id, this);
+            QSensorManager::registerBackend(QCompass::sensorType, IOSCompass::id, this);
 #endif
 #ifdef HAVE_UIDEVICE
         if (IOSProximitySensor::available())
-            QSensorManager::registerBackend(QProximitySensor::type, IOSProximitySensor::id, this);
+            QSensorManager::registerBackend(QProximitySensor::sensorType, IOSProximitySensor::id, this);
 #endif
     }
 
diff --git a/src/plugins/sensors/linux/main.cpp b/src/plugins/sensors/linux/main.cpp
index a82ab821..6531d9d3 100644
--- a/src/plugins/sensors/linux/main.cpp
+++ b/src/plugins/sensors/linux/main.cpp
@@ -55,8 +55,8 @@ public:
     void registerSensors() override
     {
         QString path = QString::fromLatin1(qgetenv("QT_ACCEL_FILEPATH"));
-        if (!path.isEmpty() && !QSensorManager::isBackendRegistered(QAccelerometer::type, LinuxSysAccelerometer::id))
-            QSensorManager::registerBackend(QAccelerometer::type, LinuxSysAccelerometer::id, this);
+        if (!path.isEmpty() && !QSensorManager::isBackendRegistered(QAccelerometer::sensorType, LinuxSysAccelerometer::id))
+            QSensorManager::registerBackend(QAccelerometer::sensorType, LinuxSysAccelerometer::id, this);
     }
 
     QSensorBackend *createBackend(QSensor *sensor) override
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
index 27a07ad6..7a5a7cd8 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
@@ -92,7 +92,7 @@ void SensorfwSensorBase::start()
     if (m_sensorInterface) {
         // dataRate
         QByteArray type = sensor()->type();
-        if (type != QTapSensor::type && type != QProximitySensor::type) {
+        if (type != QTapSensor::sensorType && type != QProximitySensor::sensorType) {
             int dataRate = sensor()->dataRate();
             int interval = dataRate > 0 ? 1000 / dataRate : 0;
             // for testing maximum speed
@@ -291,8 +291,8 @@ bool SensorfwSensorBase::initSensorInterface(QString const &name)
     // TODO deztructor: Leaking abstraction detected. Just copied code
     // from initSensor<>() here, need to
     QByteArray type = sensor()->type();
-    if ((type == QAmbientLightSensor::type) // SensorFW returns lux values, plugin enumerated values
-        || (type == QIRProximitySensor::type) // SensorFW returns raw reflectance values, plugin % of max reflectance
+    if ((type == QAmbientLightSensor::sensorType) // SensorFW returns lux values, plugin enumerated values
+        || (type == QIRProximitySensor::sensorType) // SensorFW returns raw reflectance values, plugin % of max reflectance
         || (name == "accelerometersensor") // SensorFW returns milliGs, plugin m/s^2
         || (name == "magnetometersensor") // SensorFW returns nanoTeslas, plugin Teslas
         || (name == "gyroscopesensor")) // SensorFW returns DSPs, plugin milliDSPs
@@ -330,4 +330,3 @@ bool SensorfwSensorBase::isFeatureSupported(QSensor::Feature feature) const
 
     return false;
 }
-
diff --git a/src/plugins/sensors/sensortag/main.cpp b/src/plugins/sensors/sensortag/main.cpp
index e6dc54e5..9ad5cd71 100644
--- a/src/plugins/sensors/sensortag/main.cpp
+++ b/src/plugins/sensors/sensortag/main.cpp
@@ -63,29 +63,29 @@ public:
 
     void registerSensors()
     {
-        if (!QSensorManager::isBackendRegistered(QAccelerometer::type, SensorTagAccelerometer::id))
-            QSensorManager::registerBackend(QAccelerometer::type, SensorTagAccelerometer::id, this);
+        if (!QSensorManager::isBackendRegistered(QAccelerometer::sensorType, SensorTagAccelerometer::id))
+            QSensorManager::registerBackend(QAccelerometer::sensorType, SensorTagAccelerometer::id, this);
 
-        if (!QSensorManager::isBackendRegistered(QAmbientLightSensor::type, SensorTagAls::id))
-            QSensorManager::registerBackend(QAmbientLightSensor::type, SensorTagAls::id, this);
+        if (!QSensorManager::isBackendRegistered(QAmbientLightSensor::sensorType, SensorTagAls::id))
+            QSensorManager::registerBackend(QAmbientLightSensor::sensorType, SensorTagAls::id, this);
 
-        if (!QSensorManager::isBackendRegistered(QLightSensor::type, SensorTagLightSensor::id))
-            QSensorManager::registerBackend(QLightSensor::type, SensorTagLightSensor::id, this);
+        if (!QSensorManager::isBackendRegistered(QLightSensor::sensorType, SensorTagLightSensor::id))
+            QSensorManager::registerBackend(QLightSensor::sensorType, SensorTagLightSensor::id, this);
 
-        if (!QSensorManager::isBackendRegistered(QAmbientTemperatureSensor::type, SensorTagTemperatureSensor::id))
-            QSensorManager::registerBackend(QAmbientTemperatureSensor::type, SensorTagTemperatureSensor::id, this);
+        if (!QSensorManager::isBackendRegistered(QAmbientTemperatureSensor::sensorType, SensorTagTemperatureSensor::id))
+            QSensorManager::registerBackend(QAmbientTemperatureSensor::sensorType, SensorTagTemperatureSensor::id, this);
 
-        if (!QSensorManager::isBackendRegistered(QHumiditySensor::type, SensorTagHumiditySensor::id))
-            QSensorManager::registerBackend(QHumiditySensor::type, SensorTagHumiditySensor::id, this);
+        if (!QSensorManager::isBackendRegistered(QHumiditySensor::sensorType, SensorTagHumiditySensor::id))
+            QSensorManager::registerBackend(QHumiditySensor::sensorType, SensorTagHumiditySensor::id, this);
 
-        if (!QSensorManager::isBackendRegistered(QPressureSensor::type, SensorTagPressureSensor::id))
-            QSensorManager::registerBackend(QPressureSensor::type, SensorTagPressureSensor::id, this);
+        if (!QSensorManager::isBackendRegistered(QPressureSensor::sensorType, SensorTagPressureSensor::id))
+            QSensorManager::registerBackend(QPressureSensor::sensorType, SensorTagPressureSensor::id, this);
 
-        if (!QSensorManager::isBackendRegistered(QGyroscope::type, SensorTagGyroscope::id))
-            QSensorManager::registerBackend(QGyroscope::type, SensorTagGyroscope::id, this);
+        if (!QSensorManager::isBackendRegistered(QGyroscope::sensorType, SensorTagGyroscope::id))
+            QSensorManager::registerBackend(QGyroscope::sensorType, SensorTagGyroscope::id, this);
 
-        if (!QSensorManager::isBackendRegistered(QMagnetometer::type, SensorTagMagnetometer::id))
-            QSensorManager::registerBackend(QMagnetometer::type, SensorTagMagnetometer::id, this);
+        if (!QSensorManager::isBackendRegistered(QMagnetometer::sensorType, SensorTagMagnetometer::id))
+            QSensorManager::registerBackend(QMagnetometer::sensorType, SensorTagMagnetometer::id, this);
     }
 
     QSensorBackend *createBackend(QSensor *sensor)
diff --git a/src/plugins/sensors/winrt/main.cpp b/src/plugins/sensors/winrt/main.cpp
index cae34037..e66e0ade 100644
--- a/src/plugins/sensors/winrt/main.cpp
+++ b/src/plugins/sensors/winrt/main.cpp
@@ -62,12 +62,12 @@ public:
 
     void registerSensors() override
     {
-        QSensorManager::registerBackend(QAccelerometer::type, QByteArrayLiteral("WinRtAccelerometer"), this);
-        QSensorManager::registerBackend(QCompass::type, QByteArrayLiteral("WinRtCompass"), this);
-        QSensorManager::registerBackend(QGyroscope::type, QByteArrayLiteral("WinRtGyroscope"), this);
-        QSensorManager::registerBackend(QRotationSensor::type, QByteArrayLiteral("WinRtRotationSensor"), this);
-        QSensorManager::registerBackend(QAmbientLightSensor::type, QByteArrayLiteral("WinRtAmbientLightSensor"), this);
-        QSensorManager::registerBackend(QOrientationSensor::type, QByteArrayLiteral("WinRtOrientationSensor"), this);
+        QSensorManager::registerBackend(QAccelerometer::sensorType, QByteArrayLiteral("WinRtAccelerometer"), this);
+        QSensorManager::registerBackend(QCompass::sensorType, QByteArrayLiteral("WinRtCompass"), this);
+        QSensorManager::registerBackend(QGyroscope::sensorType, QByteArrayLiteral("WinRtGyroscope"), this);
+        QSensorManager::registerBackend(QRotationSensor::sensorType, QByteArrayLiteral("WinRtRotationSensor"), this);
+        QSensorManager::registerBackend(QAmbientLightSensor::sensorType, QByteArrayLiteral("WinRtAmbientLightSensor"), this);
+        QSensorManager::registerBackend(QOrientationSensor::sensorType, QByteArrayLiteral("WinRtOrientationSensor"), this);
     }
 
     QSensorBackend *createBackend(QSensor *sensor) override