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/sensors/qirproximitysensor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sensors/qirproximitysensor.cpp') diff --git a/src/sensors/qirproximitysensor.cpp b/src/sensors/qirproximitysensor.cpp index 2be5a43a..85c8347e 100644 --- a/src/sensors/qirproximitysensor.cpp +++ b/src/sensors/qirproximitysensor.cpp @@ -121,7 +121,7 @@ bool QIRProximityFilter::filter(QSensorReading *reading) return filter(static_cast(reading)); } -char const * const QIRProximitySensor::type("QIRProximitySensor"); +char const * const QIRProximitySensor::sensorType("QIRProximitySensor"); /*! \class QIRProximitySensor @@ -144,7 +144,7 @@ char const * const QIRProximitySensor::type("QIRProximitySensor"); Construct the sensor as a child of \a parent. */ QIRProximitySensor::QIRProximitySensor(QObject *parent) - : QSensor(QIRProximitySensor::type, parent) + : QSensor(QIRProximitySensor::sensorType, parent) { } -- cgit v1.2.3