summaryrefslogtreecommitdiffstats
path: root/src/sensors
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-24 23:55:02 +0200
committerKevin Funk <kfunk@kde.org>2021-06-02 14:08:10 +0200
commitd91e880b511816839ecb2773cad3815af696b14c (patch)
treeb296bd564b963a4d863b060a33d134366684c9b8 /src/sensors
parent5e48389d40f5d6cd1a394ac03c47942be01d2734 (diff)
Replace Q_NULLPTR with nullptr
Change-Id: I9885deb29ebcd5db51a00cbcc2f063bfc418e23f Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/sensors')
-rw-r--r--src/sensors/gestures/qsensorgesture.h2
-rw-r--r--src/sensors/gestures/qsensorgesturemanager.h2
-rw-r--r--src/sensors/gestures/qsensorgesturerecognizer.h2
-rw-r--r--src/sensors/qaccelerometer.h2
-rw-r--r--src/sensors/qaltimeter.h2
-rw-r--r--src/sensors/qambientlightsensor.h2
-rw-r--r--src/sensors/qambienttemperaturesensor.h2
-rw-r--r--src/sensors/qcompass.h2
-rw-r--r--src/sensors/qdistancesensor.h2
-rw-r--r--src/sensors/qgyroscope.h2
-rw-r--r--src/sensors/qholstersensor.h2
-rw-r--r--src/sensors/qhumiditysensor.h2
-rw-r--r--src/sensors/qirproximitysensor.h2
-rw-r--r--src/sensors/qlidsensor.h2
-rw-r--r--src/sensors/qlightsensor.h2
-rw-r--r--src/sensors/qmagnetometer.h2
-rw-r--r--src/sensors/qorientationsensor.h2
-rw-r--r--src/sensors/qpressuresensor.h2
-rw-r--r--src/sensors/qproximitysensor.h2
-rw-r--r--src/sensors/qrotationsensor.h2
-rw-r--r--src/sensors/qsensor.h8
-rw-r--r--src/sensors/qsensorbackend.h2
-rw-r--r--src/sensors/qtapsensor.h2
-rw-r--r--src/sensors/qtiltsensor.h2
24 files changed, 27 insertions, 27 deletions
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h
index 3c593be7..00f132c2 100644
--- a/src/sensors/gestures/qsensorgesture.h
+++ b/src/sensors/gestures/qsensorgesture.h
@@ -57,7 +57,7 @@ class Q_SENSORS_EXPORT QSensorGesture : public QObject
{
//Do not use Q_OBJECT here
public:
- explicit QSensorGesture(const QStringList &ids, QObject *parent = Q_NULLPTR);
+ explicit QSensorGesture(const QStringList &ids, QObject *parent = nullptr);
~QSensorGesture();
bool isActive();
diff --git a/src/sensors/gestures/qsensorgesturemanager.h b/src/sensors/gestures/qsensorgesturemanager.h
index 1ddc84c2..dde13e18 100644
--- a/src/sensors/gestures/qsensorgesturemanager.h
+++ b/src/sensors/gestures/qsensorgesturemanager.h
@@ -55,7 +55,7 @@ class Q_SENSORS_EXPORT QSensorGestureManager : public QObject
Q_DECLARE_PRIVATE(QSensorGestureManager)
public:
- explicit QSensorGestureManager(QObject *parent = Q_NULLPTR);
+ explicit QSensorGestureManager(QObject *parent = nullptr);
~QSensorGestureManager();
diff --git a/src/sensors/gestures/qsensorgesturerecognizer.h b/src/sensors/gestures/qsensorgesturerecognizer.h
index 27181983..4b855e12 100644
--- a/src/sensors/gestures/qsensorgesturerecognizer.h
+++ b/src/sensors/gestures/qsensorgesturerecognizer.h
@@ -53,7 +53,7 @@ class Q_SENSORS_EXPORT QSensorGestureRecognizer : public QObject
{
Q_OBJECT
public:
- explicit QSensorGestureRecognizer(QObject *parent = Q_NULLPTR);
+ explicit QSensorGestureRecognizer(QObject *parent = nullptr);
virtual ~QSensorGestureRecognizer();
virtual QString id() const = 0;
diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h
index 0f91e2e4..32bdaaa8 100644
--- a/src/sensors/qaccelerometer.h
+++ b/src/sensors/qaccelerometer.h
@@ -80,7 +80,7 @@ class Q_SENSORS_EXPORT QAccelerometer : public QSensor
Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode
NOTIFY accelerationModeChanged)
public:
- explicit QAccelerometer(QObject *parent = Q_NULLPTR);
+ explicit QAccelerometer(QObject *parent = nullptr);
virtual ~QAccelerometer();
// Keep this enum in sync with QmlAccelerometer::AccelerationMode
diff --git a/src/sensors/qaltimeter.h b/src/sensors/qaltimeter.h
index cf02c115..e62ce344 100644
--- a/src/sensors/qaltimeter.h
+++ b/src/sensors/qaltimeter.h
@@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QAltimeter : public QSensor
{
Q_OBJECT
public:
- explicit QAltimeter(QObject *parent = Q_NULLPTR);
+ explicit QAltimeter(QObject *parent = nullptr);
~QAltimeter();
QAltimeterReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h
index 07fc6ffd..d9b3ea7f 100644
--- a/src/sensors/qambientlightsensor.h
+++ b/src/sensors/qambientlightsensor.h
@@ -78,7 +78,7 @@ class Q_SENSORS_EXPORT QAmbientLightSensor : public QSensor
{
Q_OBJECT
public:
- explicit QAmbientLightSensor(QObject *parent = Q_NULLPTR);
+ explicit QAmbientLightSensor(QObject *parent = nullptr);
virtual ~QAmbientLightSensor();
QAmbientLightReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qambienttemperaturesensor.h b/src/sensors/qambienttemperaturesensor.h
index b048c200..9e17ba1f 100644
--- a/src/sensors/qambienttemperaturesensor.h
+++ b/src/sensors/qambienttemperaturesensor.h
@@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QAmbientTemperatureSensor : public QSensor
{
Q_OBJECT
public:
- explicit QAmbientTemperatureSensor(QObject *parent = Q_NULLPTR);
+ explicit QAmbientTemperatureSensor(QObject *parent = nullptr);
~QAmbientTemperatureSensor();
QAmbientTemperatureReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h
index 39812c1b..95c2de2f 100644
--- a/src/sensors/qcompass.h
+++ b/src/sensors/qcompass.h
@@ -72,7 +72,7 @@ class Q_SENSORS_EXPORT QCompass : public QSensor
{
Q_OBJECT
public:
- explicit QCompass(QObject *parent = Q_NULLPTR);
+ explicit QCompass(QObject *parent = nullptr);
virtual ~QCompass();
QCompassReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qdistancesensor.h b/src/sensors/qdistancesensor.h
index a7b40872..b50c0942 100644
--- a/src/sensors/qdistancesensor.h
+++ b/src/sensors/qdistancesensor.h
@@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QDistanceSensor : public QSensor
{
Q_OBJECT
public:
- explicit QDistanceSensor(QObject *parent = Q_NULLPTR);
+ explicit QDistanceSensor(QObject *parent = nullptr);
~QDistanceSensor();
QDistanceReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h
index 3c335dfe..d7247ade 100644
--- a/src/sensors/qgyroscope.h
+++ b/src/sensors/qgyroscope.h
@@ -76,7 +76,7 @@ class Q_SENSORS_EXPORT QGyroscope : public QSensor
{
Q_OBJECT
public:
- explicit QGyroscope(QObject *parent = Q_NULLPTR);
+ explicit QGyroscope(QObject *parent = nullptr);
virtual ~QGyroscope();
QGyroscopeReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qholstersensor.h b/src/sensors/qholstersensor.h
index 9a48fbf3..586e31b4 100644
--- a/src/sensors/qholstersensor.h
+++ b/src/sensors/qholstersensor.h
@@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QHolsterSensor : public QSensor
{
Q_OBJECT
public:
- explicit QHolsterSensor(QObject *parent = Q_NULLPTR);
+ explicit QHolsterSensor(QObject *parent = nullptr);
~QHolsterSensor();
QHolsterReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qhumiditysensor.h b/src/sensors/qhumiditysensor.h
index aa51df45..685d273a 100644
--- a/src/sensors/qhumiditysensor.h
+++ b/src/sensors/qhumiditysensor.h
@@ -75,7 +75,7 @@ class Q_SENSORS_EXPORT QHumiditySensor : public QSensor
{
Q_OBJECT
public:
- explicit QHumiditySensor(QObject *parent = Q_NULLPTR);
+ explicit QHumiditySensor(QObject *parent = nullptr);
~QHumiditySensor();
QHumidityReading *reading() const;
diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h
index aeaf9467..57ea978c 100644
--- a/src/sensors/qirproximitysensor.h
+++ b/src/sensors/qirproximitysensor.h
@@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor
{
Q_OBJECT
public:
- explicit QIRProximitySensor(QObject *parent = Q_NULLPTR);
+ explicit QIRProximitySensor(QObject *parent = nullptr);
virtual ~QIRProximitySensor();
QIRProximityReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qlidsensor.h b/src/sensors/qlidsensor.h
index 3182e84e..17d247df 100644
--- a/src/sensors/qlidsensor.h
+++ b/src/sensors/qlidsensor.h
@@ -76,7 +76,7 @@ class Q_SENSORS_EXPORT QLidSensor : public QSensor
{
Q_OBJECT
public:
- explicit QLidSensor(QObject *parent = Q_NULLPTR);
+ explicit QLidSensor(QObject *parent = nullptr);
~QLidSensor();
QLidReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h
index 642d79cf..6ba7e31a 100644
--- a/src/sensors/qlightsensor.h
+++ b/src/sensors/qlightsensor.h
@@ -71,7 +71,7 @@ class Q_SENSORS_EXPORT QLightSensor : public QSensor
Q_OBJECT
Q_PROPERTY(qreal fieldOfView READ fieldOfView NOTIFY fieldOfViewChanged)
public:
- explicit QLightSensor(QObject *parent = Q_NULLPTR);
+ explicit QLightSensor(QObject *parent = nullptr);
virtual ~QLightSensor();
QLightReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h
index e1ed9ede..a8d3cf7e 100644
--- a/src/sensors/qmagnetometer.h
+++ b/src/sensors/qmagnetometer.h
@@ -83,7 +83,7 @@ class Q_SENSORS_EXPORT QMagnetometer : public QSensor
Q_OBJECT
Q_PROPERTY(bool returnGeoValues READ returnGeoValues WRITE setReturnGeoValues NOTIFY returnGeoValuesChanged)
public:
- explicit QMagnetometer(QObject *parent = Q_NULLPTR);
+ explicit QMagnetometer(QObject *parent = nullptr);
virtual ~QMagnetometer();
QMagnetometerReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h
index 2becf8f0..c97a61c2 100644
--- a/src/sensors/qorientationsensor.h
+++ b/src/sensors/qorientationsensor.h
@@ -79,7 +79,7 @@ class Q_SENSORS_EXPORT QOrientationSensor : public QSensor
{
Q_OBJECT
public:
- explicit QOrientationSensor(QObject *parent = Q_NULLPTR);
+ explicit QOrientationSensor(QObject *parent = nullptr);
virtual ~QOrientationSensor();
QOrientationReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qpressuresensor.h b/src/sensors/qpressuresensor.h
index 9b9ebce0..18c4d698 100644
--- a/src/sensors/qpressuresensor.h
+++ b/src/sensors/qpressuresensor.h
@@ -71,7 +71,7 @@ class Q_SENSORS_EXPORT QPressureSensor : public QSensor
{
Q_OBJECT
public:
- explicit QPressureSensor(QObject *parent = Q_NULLPTR);
+ explicit QPressureSensor(QObject *parent = nullptr);
~QPressureSensor();
QPressureReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h
index 2c2829eb..437a75db 100644
--- a/src/sensors/qproximitysensor.h
+++ b/src/sensors/qproximitysensor.h
@@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QProximitySensor : public QSensor
{
Q_OBJECT
public:
- explicit QProximitySensor(QObject *parent = Q_NULLPTR);
+ explicit QProximitySensor(QObject *parent = nullptr);
virtual ~QProximitySensor();
QProximityReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h
index 20270ade..d62f5a8c 100644
--- a/src/sensors/qrotationsensor.h
+++ b/src/sensors/qrotationsensor.h
@@ -76,7 +76,7 @@ class Q_SENSORS_EXPORT QRotationSensor : public QSensor
Q_OBJECT
Q_PROPERTY(bool hasZ READ hasZ NOTIFY hasZChanged)
public:
- explicit QRotationSensor(QObject *parent = Q_NULLPTR);
+ explicit QRotationSensor(QObject *parent = nullptr);
virtual ~QRotationSensor();
QRotationReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index efa62c80..9fdaab17 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -114,7 +114,7 @@ public:
};
Q_ENUM(AxesOrientationMode)
- explicit QSensor(const QByteArray &type, QObject *parent = Q_NULLPTR);
+ explicit QSensor(const QByteArray &type, QObject *parent = nullptr);
virtual ~QSensor();
QByteArray identifier() const;
@@ -206,7 +206,7 @@ Q_SIGNALS:
void identifierChanged();
protected:
- explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = Q_NULLPTR);
+ explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = nullptr);
QSensorBackend *backend() const;
private:
@@ -260,7 +260,7 @@ private:
#define DECLARE_READING_D(classname, pclassname)\
public:\
- classname(QObject *parent = Q_NULLPTR);\
+ classname(QObject *parent = nullptr);\
virtual ~classname();\
void copyValuesFrom(QSensorReading *other) override;\
private:\
@@ -271,7 +271,7 @@ private:
#define IMPLEMENT_READING_D(classname, pclassname)\
classname::classname(QObject *parent)\
- : QSensorReading(parent, Q_NULLPTR)\
+ : QSensorReading(parent, nullptr)\
, d(new pclassname)\
{}\
classname::~classname() {}\
diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h
index 3837c143..f786a9d9 100644
--- a/src/sensors/qsensorbackend.h
+++ b/src/sensors/qsensorbackend.h
@@ -51,7 +51,7 @@ class Q_SENSORS_EXPORT QSensorBackend : public QObject
{
Q_OBJECT
public:
- explicit QSensorBackend(QSensor *sensor, QObject *parent = Q_NULLPTR);
+ explicit QSensorBackend(QSensor *sensor, QObject *parent = nullptr);
virtual ~QSensorBackend();
virtual void start() = 0;
diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h
index 369ab03d..ce546cc2 100644
--- a/src/sensors/qtapsensor.h
+++ b/src/sensors/qtapsensor.h
@@ -93,7 +93,7 @@ class Q_SENSORS_EXPORT QTapSensor : public QSensor
Q_PROPERTY(bool returnDoubleTapEvents READ returnDoubleTapEvents WRITE setReturnDoubleTapEvents
NOTIFY returnDoubleTapEventsChanged)
public:
- explicit QTapSensor(QObject *parent = Q_NULLPTR);
+ explicit QTapSensor(QObject *parent = nullptr);
virtual ~QTapSensor();
QTapReading *reading() const;
static char const * const sensorType;
diff --git a/src/sensors/qtiltsensor.h b/src/sensors/qtiltsensor.h
index 9f6532bd..61bb37e9 100644
--- a/src/sensors/qtiltsensor.h
+++ b/src/sensors/qtiltsensor.h
@@ -74,7 +74,7 @@ class Q_SENSORS_EXPORT QTiltSensor : public QSensor
{
Q_OBJECT
public:
- explicit QTiltSensor(QObject *parent = Q_NULLPTR);
+ explicit QTiltSensor(QObject *parent = nullptr);
~QTiltSensor();
QTiltReading *reading() const;
static char const * const sensorType;