summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-09-14 22:06:49 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-09-19 14:52:49 +0200
commit8f057784da92ee46c0fc64220aeb19aec0a6389e (patch)
tree62a816738f5638c662e4b6fa70bf64454160c2c8 /tests
parentff4207b1a41db4d23d4d0183152776e73f252a3a (diff)
downloadqtlocation-8f057784da92ee46c0fc64220aeb19aec0a6389e.tar.gz
Cleanup: More nullptr instead of 0
Change-Id: I6316384be07f1d0634860c3ddcbe85455e218fed Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h2
-rw-r--r--tests/auto/geotestplugin/qgeotiledmap_test.h2
-rw-r--r--tests/auto/geotestplugin/qplacemanagerengine_test.h12
-rw-r--r--tests/auto/nokia_services/routing/tst_routing.cpp4
-rw-r--r--tests/auto/placemanager_utils/placemanager_utils.h2
-rw-r--r--tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h2
6 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
index 3c7c019a..92587c83 100644
--- a/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
+++ b/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
@@ -62,7 +62,7 @@ class QDeclarativeLocationTestModel : public QAbstractListModel, public QQmlPars
Q_INTERFACES(QQmlParserStatus)
public:
- QDeclarativeLocationTestModel(QObject* parent = 0);
+ QDeclarativeLocationTestModel(QObject* parent = nullptr);
~QDeclarativeLocationTestModel();
enum Roles {
diff --git a/tests/auto/geotestplugin/qgeotiledmap_test.h b/tests/auto/geotestplugin/qgeotiledmap_test.h
index a6299efe..7bb1ea27 100644
--- a/tests/auto/geotestplugin/qgeotiledmap_test.h
+++ b/tests/auto/geotestplugin/qgeotiledmap_test.h
@@ -48,7 +48,7 @@ class QGeoTiledMapTest: public QGeoTiledMap
public:
QGeoTiledMapTest(QGeoTiledMappingManagerEngine *engine,
const QGeoTiledMapTestOptions &options,
- QObject *parent = 0);
+ QObject *parent = nullptr);
protected slots:
void onCameraCenter_testChanged(QGeoMapParameter *param, const char *propertyName);
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 44aee74e..04ef0735 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -105,7 +105,7 @@ class PlaceReply : public QPlaceReply
friend class QPlaceManagerEngineTest;
public:
- PlaceReply(QObject *parent = 0)
+ PlaceReply(QObject *parent = nullptr)
: QPlaceReply(parent)
{ }
@@ -122,7 +122,7 @@ class ContentReply : public QPlaceContentReply
friend class QPlaceManagerEngineTest;
public:
- ContentReply(QObject *parent = 0)
+ ContentReply(QObject *parent = nullptr)
: QPlaceContentReply(parent)
{}
@@ -144,7 +144,7 @@ class DetailsReply : public QPlaceDetailsReply
friend class QPlaceManagerEngineTest;
public:
- DetailsReply(QObject *parent = 0)
+ DetailsReply(QObject *parent = nullptr)
: QPlaceDetailsReply(parent)
{ }
@@ -166,7 +166,7 @@ class IdReply : public QPlaceIdReply
friend class QPlaceManagerEngineTest;
public:
- IdReply(QPlaceIdReply::OperationType type, QObject *parent = 0)
+ IdReply(QPlaceIdReply::OperationType type, QObject *parent = nullptr)
: QPlaceIdReply(type, parent)
{ }
@@ -186,7 +186,7 @@ class PlaceSearchReply : public QPlaceSearchReply
Q_OBJECT
public:
- PlaceSearchReply(const QList<QPlaceSearchResult> &results, QObject *parent = 0)
+ PlaceSearchReply(const QList<QPlaceSearchResult> &results, QObject *parent = nullptr)
: QPlaceSearchReply(parent)
{
setResults(results);
@@ -208,7 +208,7 @@ class SuggestionReply : public QPlaceSearchSuggestionReply
Q_OBJECT
public:
- SuggestionReply(const QStringList &suggestions, QObject *parent = 0)
+ SuggestionReply(const QStringList &suggestions, QObject *parent = nullptr)
: QPlaceSearchSuggestionReply(parent)
{
setSuggestions(suggestions);
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp
index d653576a..3a516139 100644
--- a/tests/auto/nokia_services/routing/tst_routing.cpp
+++ b/tests/auto/nokia_services/routing/tst_routing.cpp
@@ -47,7 +47,7 @@ QT_USE_NAMESPACE
class MockGeoNetworkReply : public QNetworkReply
{
public:
- MockGeoNetworkReply( QObject* parent = 0);
+ MockGeoNetworkReply( QObject* parent = nullptr);
void abort() override;
void setFile(QFile* file);
@@ -111,7 +111,7 @@ void MockGeoNetworkReply::complete()
class MockGeoNetworkAccessManager : public QGeoNetworkAccessManager
{
public:
- MockGeoNetworkAccessManager(QObject* parent = 0);
+ MockGeoNetworkAccessManager(QObject* parent = nullptr);
QNetworkReply *get(const QNetworkRequest& request) override;
QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data) override;
diff --git a/tests/auto/placemanager_utils/placemanager_utils.h b/tests/auto/placemanager_utils/placemanager_utils.h
index 982bd858..960f0a2e 100644
--- a/tests/auto/placemanager_utils/placemanager_utils.h
+++ b/tests/auto/placemanager_utils/placemanager_utils.h
@@ -64,7 +64,7 @@ class PlaceManagerUtils : public QObject
{
Q_OBJECT
public:
- PlaceManagerUtils(QObject *parent = 0);
+ PlaceManagerUtils(QObject *parent = nullptr);
static bool doSavePlace(QPlaceManager *manager,
const QPlace &place,
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
index c9fe8349..e6cc7236 100644
--- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
+++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
@@ -43,7 +43,7 @@ class GeocodeReplyTest : public QGeoCodeReply
{
Q_OBJECT
public:
- GeocodeReplyTest(QObject *parent = 0) : QGeoCodeReply(parent) {}
+ GeocodeReplyTest(QObject *parent = nullptr) : QGeoCodeReply(parent) {}
void callAddLocation ( const QGeoLocation & location ) {addLocation(location);}
void callSetError ( Error error, const QString & errorString ) {setError(error, errorString);}