From d70a9906fced63aa1b8502dbdac58d4c244ef956 Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Wed, 12 May 2021 10:17:24 +0300 Subject: 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 Reviewed-by: Lorn Potter --- src/plugins/sensors/android/main.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/plugins/sensors/android') 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 -- cgit v1.2.3