From d3d6cc54a46e1e7e72e3ca4cfcd837cea678478d Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Fri, 28 May 2021 09:11:11 +0300 Subject: Few cleanups and modernizations This commit introduces few source compatible changes: - Change obsoleted Q_ENUMS => Q_ENUM - Mark QSensor::type property as CONSTANT as it cannot change - Add change signal to QSensor::identifier and a testcase for it Task-number: QTBUG-92505 Change-Id: I6e3a652929d15bc5211448be2ae9254ed6d21118 Reviewed-by: Alex Blasche --- src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.h | 2 +- src/sensors/qaccelerometer.h | 3 +-- src/sensors/qambientlightsensor.h | 3 +-- src/sensors/qorientationsensor.h | 3 +-- src/sensors/qsensor.cpp | 3 +++ src/sensors/qsensor.h | 6 +++--- src/sensors/qtapsensor.h | 3 +-- src/sensorsquick/qmlaccelerometer_p.h | 2 +- src/sensorsquick/qmlsensor_p.h | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.h b/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.h index e3f4960b..2c63092c 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.h +++ b/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.h @@ -53,7 +53,6 @@ class QtSensorGestureSensorHandler : public QObject { Q_OBJECT - Q_ENUMS(SensorGestureSensors) public: explicit QtSensorGestureSensorHandler(QObject *parent = 0); @@ -64,6 +63,7 @@ public: IrProximity, Tap }; + Q_ENUM(SensorGestureSensors) static QtSensorGestureSensorHandler *instance(); qreal accelRange; diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h index 92c58167..0f91e2e4 100644 --- a/src/sensors/qaccelerometer.h +++ b/src/sensors/qaccelerometer.h @@ -77,7 +77,6 @@ class QAccelerometerPrivate; class Q_SENSORS_EXPORT QAccelerometer : public QSensor { Q_OBJECT - Q_ENUMS(AccelerationMode) Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode NOTIFY accelerationModeChanged) public: @@ -90,6 +89,7 @@ public: Gravity, User }; + Q_ENUM(AccelerationMode) AccelerationMode accelerationMode() const; void setAccelerationMode(AccelerationMode accelerationMode); @@ -108,4 +108,3 @@ private: QT_END_NAMESPACE #endif - diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h index b41fd71e..07fc6ffd 100644 --- a/src/sensors/qambientlightsensor.h +++ b/src/sensors/qambientlightsensor.h @@ -49,7 +49,6 @@ class QAmbientLightReadingPrivate; class Q_SENSORS_EXPORT QAmbientLightReading : public QSensorReading { Q_OBJECT - Q_ENUMS(LightLevel) Q_PROPERTY(LightLevel lightLevel READ lightLevel) DECLARE_READING(QAmbientLightReading) public: @@ -61,6 +60,7 @@ public: Bright, Sunny }; + Q_ENUM(LightLevel) LightLevel lightLevel() const; void setLightLevel(LightLevel lightLevel); @@ -90,4 +90,3 @@ private: QT_END_NAMESPACE #endif - diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index 1a54d800..2becf8f0 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -49,7 +49,6 @@ class QOrientationReadingPrivate; class Q_SENSORS_EXPORT QOrientationReading : public QSensorReading { Q_OBJECT - Q_ENUMS(Orientation) Q_PROPERTY(Orientation orientation READ orientation) DECLARE_READING(QOrientationReading) public: @@ -62,6 +61,7 @@ public: FaceUp, FaceDown }; + Q_ENUM(Orientation) Orientation orientation() const; void setOrientation(Orientation orientation); @@ -91,4 +91,3 @@ private: QT_END_NAMESPACE #endif - diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index ef1ef523..00105bd3 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -364,7 +364,10 @@ void QSensor::setIdentifier(const QByteArray &identifier) qWarning() << "ERROR: Cannot call QSensor::setIdentifier while connected to a backend!"; return; } + if (d->identifier == identifier) + return; d->identifier = identifier; + emit identifierChanged(); } /*! diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index c988a661..efa62c80 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -72,8 +72,8 @@ class Q_SENSORS_EXPORT QSensor : public QObject { friend class QSensorBackend; Q_OBJECT - Q_PROPERTY(QByteArray identifier READ identifier WRITE setIdentifier) - Q_PROPERTY(QByteArray type READ type) + Q_PROPERTY(QByteArray identifier READ identifier WRITE setIdentifier NOTIFY identifierChanged) + Q_PROPERTY(QByteArray type READ type CONSTANT) Q_PROPERTY(bool connectedToBackend READ isConnectedToBackend) Q_PROPERTY(qrangelist availableDataRates READ availableDataRates) Q_PROPERTY(int dataRate READ dataRate WRITE setDataRate NOTIFY dataRateChanged) @@ -203,6 +203,7 @@ Q_SIGNALS: void maxBufferSizeChanged(int maxBufferSize); void efficientBufferSizeChanged(int efficientBufferSize); void bufferSizeChanged(int bufferSize); + void identifierChanged(); protected: explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = Q_NULLPTR); @@ -294,4 +295,3 @@ Q_DECLARE_METATYPE(qrangelist) Q_DECLARE_METATYPE(qoutputrangelist) #endif - diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index 33922f38..369ab03d 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -49,7 +49,6 @@ class QTapReadingPrivate; class Q_SENSORS_EXPORT QTapReading : public QSensorReading { Q_OBJECT - Q_ENUMS(TapDirection) Q_PROPERTY(TapDirection tapDirection READ tapDirection) Q_PROPERTY(bool doubleTap READ isDoubleTap) DECLARE_READING(QTapReading) @@ -69,6 +68,7 @@ public: Y_Both = 0x0222, Z_Both = 0x0444 }; + Q_ENUM(TapDirection) TapDirection tapDirection() const; void setTapDirection(TapDirection tapDirection); @@ -112,4 +112,3 @@ private: QT_END_NAMESPACE #endif - diff --git a/src/sensorsquick/qmlaccelerometer_p.h b/src/sensorsquick/qmlaccelerometer_p.h index 9dcb2692..24a691d8 100644 --- a/src/sensorsquick/qmlaccelerometer_p.h +++ b/src/sensorsquick/qmlaccelerometer_p.h @@ -60,7 +60,6 @@ class QAccelerometer; class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAccelerometer : public QmlSensor { Q_OBJECT - Q_ENUMS(AccelerationMode) Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode NOTIFY accelerationModeChanged REVISION 1) QML_NAMED_ELEMENT(Accelerometer) @@ -75,6 +74,7 @@ public: Gravity, User }; + Q_ENUM(AccelerationMode) AccelerationMode accelerationMode() const; void setAccelerationMode(AccelerationMode accelerationMode); diff --git a/src/sensorsquick/qmlsensor_p.h b/src/sensorsquick/qmlsensor_p.h index f31ee1bf..930142b1 100644 --- a/src/sensorsquick/qmlsensor_p.h +++ b/src/sensorsquick/qmlsensor_p.h @@ -71,7 +71,6 @@ class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensor : public QObject, public QQmlParse { Q_OBJECT Q_DECLARE_PRIVATE(QmlSensor) - Q_ENUMS(AxesOrientationMode) Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier NOTIFY identifierChanged) Q_PROPERTY(QString type READ type NOTIFY typeChanged) @@ -104,6 +103,7 @@ public: AutomaticOrientation, UserOrientation }; + Q_ENUM(AxesOrientationMode) explicit QmlSensor(QObject *parent = 0); ~QmlSensor(); -- cgit v1.2.3