diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/sensors/ios/iosproximitysensor.mm | 5 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgesture.h | 1 | ||||
-rw-r--r-- | src/sensors/qaccelerometer.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qaltimeter.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qambientlightsensor.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qambienttemperaturesensor.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qcompass.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qdistancesensor.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qgyroscope.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qholstersensor.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qhumiditysensor.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qlidsensor.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qlightsensor.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qmagnetometer.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qorientationsensor.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qpressuresensor.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qproximitysensor.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qrotationsensor.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qsensor.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qsensorbackend.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qtapsensor.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qtiltsensor.cpp | 3 |
22 files changed, 33 insertions, 22 deletions
diff --git a/src/plugins/sensors/ios/iosproximitysensor.mm b/src/plugins/sensors/ios/iosproximitysensor.mm index eae85608..e596aa5b 100644 --- a/src/plugins/sensors/ios/iosproximitysensor.mm +++ b/src/plugins/sensors/ios/iosproximitysensor.mm @@ -49,11 +49,12 @@ int IOSProximitySensor::s_startCount = 0; @interface ProximitySensorCallback : NSObject { - IOSProximitySensor *m_iosProximitySensor; } @end -@implementation ProximitySensorCallback +@implementation ProximitySensorCallback { + IOSProximitySensor *m_iosProximitySensor; +} - (id)initWithQIOSProximitySensor:(IOSProximitySensor *)iosProximitySensor { diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h index dd95b3bd..de727954 100644 --- a/src/sensors/gestures/qsensorgesture.h +++ b/src/sensors/gestures/qsensorgesture.h @@ -74,6 +74,7 @@ public: private: QSensorGesturePrivate * d_ptr; + // ### fixme: Qt 6: Make public to enable Qt for Python bindings private: // Pretend to be a Q_OBJECT const QMetaObject *metaObject() const override; diff --git a/src/sensors/qaccelerometer.cpp b/src/sensors/qaccelerometer.cpp index bb65d80b..4f89f997 100644 --- a/src/sensors/qaccelerometer.cpp +++ b/src/sensors/qaccelerometer.cpp @@ -276,6 +276,6 @@ QAccelerometerReading *QAccelerometer::reading() const \since 5.1 */ -#include "moc_qaccelerometer.cpp" QT_END_NAMESPACE +#include "moc_qaccelerometer.cpp" diff --git a/src/sensors/qaltimeter.cpp b/src/sensors/qaltimeter.cpp index 1a986169..7092870d 100644 --- a/src/sensors/qaltimeter.cpp +++ b/src/sensors/qaltimeter.cpp @@ -146,5 +146,6 @@ QAltimeterReading *QAltimeter::reading() const return static_cast<QAltimeterReading*>(QSensor::reading()); } -#include "moc_qaltimeter.cpp" QT_END_NAMESPACE + +#include "moc_qaltimeter.cpp" diff --git a/src/sensors/qambientlightsensor.cpp b/src/sensors/qambientlightsensor.cpp index 92b17c8c..dd86ae2e 100644 --- a/src/sensors/qambientlightsensor.cpp +++ b/src/sensors/qambientlightsensor.cpp @@ -178,6 +178,6 @@ QAmbientLightReading *QAmbientLightSensor::reading() const return static_cast<QAmbientLightReading*>(QSensor::reading()); } -#include "moc_qambientlightsensor.cpp" QT_END_NAMESPACE +#include "moc_qambientlightsensor.cpp" diff --git a/src/sensors/qambienttemperaturesensor.cpp b/src/sensors/qambienttemperaturesensor.cpp index 6759e9f3..53cce0a9 100644 --- a/src/sensors/qambienttemperaturesensor.cpp +++ b/src/sensors/qambienttemperaturesensor.cpp @@ -148,5 +148,6 @@ QAmbientTemperatureReading *QAmbientTemperatureSensor::reading() const return static_cast<QAmbientTemperatureReading*>(QSensor::reading()); } -#include "moc_qambienttemperaturesensor.cpp" QT_END_NAMESPACE + +#include "moc_qambienttemperaturesensor.cpp" diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp index 5177a177..a24e08e2 100644 --- a/src/sensors/qcompass.cpp +++ b/src/sensors/qcompass.cpp @@ -188,6 +188,6 @@ QCompassReading *QCompass::reading() const return static_cast<QCompassReading*>(QSensor::reading()); } -#include "moc_qcompass.cpp" QT_END_NAMESPACE +#include "moc_qcompass.cpp" diff --git a/src/sensors/qdistancesensor.cpp b/src/sensors/qdistancesensor.cpp index 3226c584..916218f8 100644 --- a/src/sensors/qdistancesensor.cpp +++ b/src/sensors/qdistancesensor.cpp @@ -158,5 +158,6 @@ QDistanceReading *QDistanceSensor::reading() const return static_cast<QDistanceReading*>(QSensor::reading()); } -#include "moc_qdistancesensor.cpp" QT_END_NAMESPACE + +#include "moc_qdistancesensor.cpp" diff --git a/src/sensors/qgyroscope.cpp b/src/sensors/qgyroscope.cpp index cb1eb698..585da99b 100644 --- a/src/sensors/qgyroscope.cpp +++ b/src/sensors/qgyroscope.cpp @@ -200,6 +200,6 @@ QGyroscopeReading *QGyroscope::reading() const return static_cast<QGyroscopeReading*>(QSensor::reading()); } -#include "moc_qgyroscope.cpp" QT_END_NAMESPACE +#include "moc_qgyroscope.cpp" diff --git a/src/sensors/qholstersensor.cpp b/src/sensors/qholstersensor.cpp index b28815a6..8bb14748 100644 --- a/src/sensors/qholstersensor.cpp +++ b/src/sensors/qholstersensor.cpp @@ -152,5 +152,6 @@ QHolsterReading *QHolsterSensor::reading() const return static_cast<QHolsterReading*>(QSensor::reading()); } -#include "moc_qholstersensor.cpp" QT_END_NAMESPACE + +#include "moc_qholstersensor.cpp" diff --git a/src/sensors/qhumiditysensor.cpp b/src/sensors/qhumiditysensor.cpp index aaf60b65..e566c6a6 100644 --- a/src/sensors/qhumiditysensor.cpp +++ b/src/sensors/qhumiditysensor.cpp @@ -177,5 +177,6 @@ QHumidityReading *QHumiditySensor::reading() const return static_cast<QHumidityReading*>(QSensor::reading()); } -#include "moc_qhumiditysensor.cpp" QT_END_NAMESPACE + +#include "moc_qhumiditysensor.cpp" diff --git a/src/sensors/qlidsensor.cpp b/src/sensors/qlidsensor.cpp index a759afd9..893987b7 100644 --- a/src/sensors/qlidsensor.cpp +++ b/src/sensors/qlidsensor.cpp @@ -178,5 +178,6 @@ QLidReading *QLidSensor::reading() const return static_cast<QLidReading*>(QSensor::reading()); } -#include "moc_qlidsensor.cpp" QT_END_NAMESPACE + +#include "moc_qlidsensor.cpp" diff --git a/src/sensors/qlightsensor.cpp b/src/sensors/qlightsensor.cpp index a7892f3a..efff15f9 100644 --- a/src/sensors/qlightsensor.cpp +++ b/src/sensors/qlightsensor.cpp @@ -185,6 +185,6 @@ void QLightSensor::setFieldOfView(qreal fieldOfView) } } -#include "moc_qlightsensor.cpp" QT_END_NAMESPACE +#include "moc_qlightsensor.cpp" diff --git a/src/sensors/qmagnetometer.cpp b/src/sensors/qmagnetometer.cpp index 0e28b5aa..ac2231ec 100644 --- a/src/sensors/qmagnetometer.cpp +++ b/src/sensors/qmagnetometer.cpp @@ -271,6 +271,6 @@ void QMagnetometer::setReturnGeoValues(bool returnGeoValues) } } -#include "moc_qmagnetometer.cpp" QT_END_NAMESPACE +#include "moc_qmagnetometer.cpp" diff --git a/src/sensors/qorientationsensor.cpp b/src/sensors/qorientationsensor.cpp index d2147a6f..91d10749 100644 --- a/src/sensors/qorientationsensor.cpp +++ b/src/sensors/qorientationsensor.cpp @@ -201,6 +201,6 @@ QOrientationReading *QOrientationSensor::reading() const return static_cast<QOrientationReading*>(QSensor::reading()); } -#include "moc_qorientationsensor.cpp" QT_END_NAMESPACE +#include "moc_qorientationsensor.cpp" diff --git a/src/sensors/qpressuresensor.cpp b/src/sensors/qpressuresensor.cpp index 8877f8c5..643f1fa1 100644 --- a/src/sensors/qpressuresensor.cpp +++ b/src/sensors/qpressuresensor.cpp @@ -178,5 +178,6 @@ QPressureReading *QPressureSensor::reading() const return static_cast<QPressureReading*>(QSensor::reading()); } -#include "moc_qpressuresensor.cpp" QT_END_NAMESPACE + +#include "moc_qpressuresensor.cpp" diff --git a/src/sensors/qproximitysensor.cpp b/src/sensors/qproximitysensor.cpp index 53af4c40..b568e6cd 100644 --- a/src/sensors/qproximitysensor.cpp +++ b/src/sensors/qproximitysensor.cpp @@ -157,6 +157,6 @@ QProximityReading *QProximitySensor::reading() const return static_cast<QProximityReading*>(QSensor::reading()); } -#include "moc_qproximitysensor.cpp" QT_END_NAMESPACE +#include "moc_qproximitysensor.cpp" diff --git a/src/sensors/qrotationsensor.cpp b/src/sensors/qrotationsensor.cpp index 6c9559ea..44424b50 100644 --- a/src/sensors/qrotationsensor.cpp +++ b/src/sensors/qrotationsensor.cpp @@ -261,6 +261,6 @@ void QRotationSensor::setHasZ(bool hasZ) } } -#include "moc_qrotationsensor.cpp" QT_END_NAMESPACE +#include "moc_qrotationsensor.cpp" diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index 8eab8872..d8bb0bee 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -1389,6 +1389,7 @@ void QSensorReading::copyValuesFrom(QSensorReading *other) \sa DECLARE_READING() */ -#include "moc_qsensor.cpp" QT_END_NAMESPACE +#include "moc_qsensor.cpp" + diff --git a/src/sensors/qsensorbackend.cpp b/src/sensors/qsensorbackend.cpp index bb1a8855..31e2e811 100644 --- a/src/sensors/qsensorbackend.cpp +++ b/src/sensors/qsensorbackend.cpp @@ -350,6 +350,6 @@ void QSensorBackend::sensorError(int error) Q_EMIT d->m_sensor->sensorError(error); } -#include "moc_qsensorbackend.cpp" QT_END_NAMESPACE +#include "moc_qsensorbackend.cpp" diff --git a/src/sensors/qtapsensor.cpp b/src/sensors/qtapsensor.cpp index b26e596f..9889a8c2 100644 --- a/src/sensors/qtapsensor.cpp +++ b/src/sensors/qtapsensor.cpp @@ -269,6 +269,6 @@ void QTapSensor::setReturnDoubleTapEvents(bool returnDoubleTapEvents) } } -#include "moc_qtapsensor.cpp" QT_END_NAMESPACE +#include "moc_qtapsensor.cpp" diff --git a/src/sensors/qtiltsensor.cpp b/src/sensors/qtiltsensor.cpp index d904527c..310ed36c 100644 --- a/src/sensors/qtiltsensor.cpp +++ b/src/sensors/qtiltsensor.cpp @@ -181,5 +181,6 @@ void QTiltSensor::calibrate() QMetaObject::invokeMethod(backend(), "calibrate", Qt::DirectConnection); } -#include "moc_qtiltsensor.cpp" QT_END_NAMESPACE + +#include "moc_qtiltsensor.cpp" |