diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-12 10:17:24 +0300 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-19 08:25:33 +0300 |
| commit | d70a9906fced63aa1b8502dbdac58d4c244ef956 (patch) | |
| tree | 0db8326ab7dd36da26e08e0825be01f631cbc3c7 /src/sensors/qtapsensor.cpp | |
| parent | 8eb9e3dd16c0057f81fa41c001722f31af32dfdf (diff) | |
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>
Diffstat (limited to 'src/sensors/qtapsensor.cpp')
| -rw-r--r-- | src/sensors/qtapsensor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<QTapReading*>(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) { } |