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/qtapsensor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sensors/qtapsensor.cpp') diff --git a/src/sensors/qtapsensor.cpp b/src/sensors/qtapsensor.cpp index 9889a8c2..dbfcbaa2 100644 --- a/src/sensors/qtapsensor.cpp +++ b/src/sensors/qtapsensor.cpp @@ -194,7 +194,7 @@ bool QTapFilter::filter(QSensorReading *reading) return filter(static_cast(reading)); } -char const * const QTapSensor::type("QTapSensor"); +char const * const QTapSensor::sensorType("QTapSensor"); /*! \class QTapSensor @@ -217,7 +217,7 @@ char const * const QTapSensor::type("QTapSensor"); Construct the sensor as a child of \a parent. */ QTapSensor::QTapSensor(QObject *parent) - : QSensor(QTapSensor::type, *new QTapSensorPrivate, parent) + : QSensor(QTapSensor::sensorType, *new QTapSensorPrivate, parent) { } -- cgit v1.2.3