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>

1 files changed, 5 insertions, 6 deletions

diff --git a/examples/sensors/grue/plugin/main.cpp b/examples/sensors/grue/plugin/main.cpp
index 4c5da15d..6bf86450 100644
--- a/examples/sensors/grue/plugin/main.cpp
+++ b/examples/sensors/grue/plugin/main.cpp
@@ -68,13 +68,13 @@ public:
 
     void sensorsChanged() override
     {
-        if (!QSensor::defaultSensorForType(QAmbientLightSensor::type).isEmpty()) {
+        if (!QSensor::defaultSensorForType(QAmbientLightSensor::sensorType).isEmpty()) {
             // There is a light sensor available. Register the backend
-            if (!QSensorManager::isBackendRegistered(GrueSensor::type, gruesensorimpl::id))
-                QSensorManager::registerBackend(GrueSensor::type, gruesensorimpl::id, this);
+            if (!QSensorManager::isBackendRegistered(GrueSensor::sensorType, gruesensorimpl::id))
+                QSensorManager::registerBackend(GrueSensor::sensorType, gruesensorimpl::id, this);
         } else {
-            if (QSensorManager::isBackendRegistered(GrueSensor::type, gruesensorimpl::id))
-                QSensorManager::unregisterBackend(GrueSensor::type, gruesensorimpl::id);
+            if (QSensorManager::isBackendRegistered(GrueSensor::sensorType, gruesensorimpl::id))
+                QSensorManager::unregisterBackend(GrueSensor::sensorType, gruesensorimpl::id);
         }
     }
 
@@ -88,4 +88,3 @@ public:
 };
 
 #include "main.moc"
-