diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
| commit | f8e256271f919c36c8d97eae27b1d11678294e70 (patch) | |
| tree | 774152d663a540dbf0ceb2f1ccb8385842a6e471 /src/sensors/qsensor.h | |
| parent | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (diff) | |
| parent | 1e42bf9e28ee0578277047735a5be24fc68abb2c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/sensors/doc/src/compatmap.qdoc
Change-Id: I7bd464cbd506f630798091fef3896050ade7b3f8
Diffstat (limited to 'src/sensors/qsensor.h')
| -rw-r--r-- | src/sensors/qsensor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index a02cc279..cf8de767 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -116,7 +116,7 @@ public: UserOrientation }; - explicit QSensor(const QByteArray &type, QObject *parent = 0); + explicit QSensor(const QByteArray &type, QObject *parent = Q_NULLPTR); virtual ~QSensor(); QByteArray identifier() const; @@ -207,7 +207,7 @@ Q_SIGNALS: void bufferSizeChanged(int bufferSize); protected: - explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = 0); + explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = Q_NULLPTR); QSensorBackend *backend() const; private: @@ -261,7 +261,7 @@ private: #define DECLARE_READING_D(classname, pclassname)\ public:\ - classname(QObject *parent = 0);\ + classname(QObject *parent = Q_NULLPTR);\ virtual ~classname();\ void copyValuesFrom(QSensorReading *other);\ private:\ @@ -272,7 +272,7 @@ private: #define IMPLEMENT_READING_D(classname, pclassname)\ classname::classname(QObject *parent)\ - : QSensorReading(parent, 0)\ + : QSensorReading(parent, Q_NULLPTR)\ , d(new pclassname)\ {}\ classname::~classname() {}\ |