diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-11-22 10:34:55 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-11-28 06:36:10 +0000 |
| commit | 27f08fe55608d14368d6cdeb915b7609a1b8b9f2 (patch) | |
| tree | 8aa1396f374644d5b55d8582e644168482f4d25e | |
| parent | a4cc61fc30cb7dff15bf7ae2ff064530b40d72c5 (diff) | |
| download | qtlocation-27f08fe55608d14368d6cdeb915b7609a1b8b9f2.tar.gz | |
winrt: Minor code cleanup
- Use nullptr instead of 0
- Use recommended way of including Qt headers
Change-Id: I170dbb5aa41a2dd4d10ff99c421da8a037cbe153
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
4 files changed, 12 insertions, 11 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp index 046d862e..b1c1410f 100644 --- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp +++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp @@ -36,11 +36,12 @@ #include "qgeopositioninfosource_winrt_p.h" -#include <QCoreApplication> -#include <QMutex> -#include <qfunctions_winrt.h> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qfunctions_winrt.h> +#include <QtCore/qloggingcategory.h> +#include <QtCore/qmutex.h> #ifdef Q_OS_WINRT -#include <private/qeventdispatcher_winrt_p.h> +#include <QtCore/private/qeventdispatcher_winrt_p.h> #endif #include <functional> diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt_p.h b/src/plugins/position/winrt/qgeopositioninfosource_winrt_p.h index 9f3a1c7f..5d291fce 100644 --- a/src/plugins/position/winrt/qgeopositioninfosource_winrt_p.h +++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt_p.h @@ -51,7 +51,7 @@ #include "qgeopositioninfosource.h" #include "qgeopositioninfo.h" -#include <QTimer> +#include <QtCore/qtimer.h> #include <EventToken.h> #include <wrl.h> @@ -76,7 +76,7 @@ class QGeoPositionInfoSourceWinRT : public QGeoPositionInfoSource { Q_OBJECT public: - QGeoPositionInfoSourceWinRT(QObject *parent = 0); + QGeoPositionInfoSourceWinRT(QObject *parent = nullptr); ~QGeoPositionInfoSourceWinRT(); int init(); diff --git a/src/plugins/position/winrt/qgeopositioninfosourcefactory_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosourcefactory_winrt.cpp index e58744a0..adb63f04 100644 --- a/src/plugins/position/winrt/qgeopositioninfosourcefactory_winrt.cpp +++ b/src/plugins/position/winrt/qgeopositioninfosourcefactory_winrt.cpp @@ -42,7 +42,7 @@ QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryWinRT::positionInfoSource(Q QGeoPositionInfoSourceWinRT *src = new QGeoPositionInfoSourceWinRT(parent); if (src->init() < 0) { delete src; - src = 0; + src = nullptr; } return src; } @@ -50,11 +50,11 @@ QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryWinRT::positionInfoSource(Q QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryWinRT::satelliteInfoSource(QObject *parent) { Q_UNUSED(parent); - return 0; + return nullptr; } QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryWinRT::areaMonitor(QObject *parent) { Q_UNUSED(parent); - return 0; + return nullptr; } diff --git a/src/plugins/position/winrt/qgeopositioninfosourcefactory_winrt.h b/src/plugins/position/winrt/qgeopositioninfosourcefactory_winrt.h index 46cd3853..d09ddb64 100644 --- a/src/plugins/position/winrt/qgeopositioninfosourcefactory_winrt.h +++ b/src/plugins/position/winrt/qgeopositioninfosourcefactory_winrt.h @@ -37,8 +37,8 @@ #ifndef QGEOPOSITIONINFOSOURCEFACTORY_WINRT_H #define QGEOPOSITIONINFOSOURCEFACTORY_WINRT_H -#include <QObject> -#include <QGeoPositionInfoSourceFactory> +#include <QtCore/qobject.h> +#include <QtPositioning/qgeopositioninfosourcefactory.h> QT_BEGIN_NAMESPACE |