summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-09-10 11:14:03 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-09-13 17:07:29 +0200
commita3204868017d1c7638412bf94257f754151e42e7 (patch)
tree20b3041db0759aaac43e23c25de0c7d406a54801 /src/plugins
parent8791d66b4116b4f4a942416ca290274da3653dee (diff)
Cleanup: use nullptr instead of 0
Change-Id: I2f713a9a88023c5e2b3d779ebe73c821c72dd0e3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp2
-rw-r--r--src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp6
-rw-r--r--src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp8
-rw-r--r--src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp4
-rw-r--r--src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp6
-rw-r--r--src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp4
8 files changed, 17 insertions, 17 deletions
diff --git a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
index 197b16cd..e88ccd7f 100644
--- a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
+++ b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
@@ -70,7 +70,7 @@ QGeoRoutingManagerEngine *GeoServiceProviderFactoryEsri::createRoutingManagerEng
*error = QGeoServiceProvider::MissingRequiredParameterError;
*errorString = tr("Esri plugin requires a 'esri.token' parameter.\n"
"Please visit https://developers.arcgis.com/authentication/accessing-arcgis-online-services/");
- return 0;
+ return nullptr;
}
}
diff --git a/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp
index 6f3c9c3f..78941693 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp
+++ b/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp
@@ -49,7 +49,7 @@ QGeoCodingManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createGeocoding
Q_UNUSED(error);
Q_UNUSED(errorString);
- return 0;
+ return nullptr;
}
QGeoMappingManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createMappingManagerEngine(
@@ -65,7 +65,7 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createRoutingM
Q_UNUSED(error);
Q_UNUSED(errorString);
- return 0;
+ return nullptr;
}
QPlaceManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createPlaceManagerEngine(
@@ -75,7 +75,7 @@ QPlaceManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createPlaceManagerE
Q_UNUSED(error);
Q_UNUSED(errorString);
- return 0;
+ return nullptr;
}
QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp b/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp
index fa9462f1..5eea12c7 100644
--- a/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp
@@ -63,7 +63,7 @@ QGeoCodingManagerEngine *QGeoServiceProviderFactoryMapbox::createGeocodingManage
} else {
*error = QGeoServiceProvider::MissingRequiredParameterError;
*errorString = msgAccessTokenParameter();
- return 0;
+ return nullptr;
}
}
@@ -77,7 +77,7 @@ QGeoMappingManagerEngine *QGeoServiceProviderFactoryMapbox::createMappingManager
} else {
*error = QGeoServiceProvider::MissingRequiredParameterError;
*errorString = msgAccessTokenParameter();
- return 0;
+ return nullptr;
}
}
@@ -91,7 +91,7 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactoryMapbox::createRoutingManager
} else {
*error = QGeoServiceProvider::MissingRequiredParameterError;
*errorString = msgAccessTokenParameter();
- return 0;
+ return nullptr;
}
}
@@ -105,7 +105,7 @@ QPlaceManagerEngine *QGeoServiceProviderFactoryMapbox::createPlaceManagerEngine(
} else {
*error = QGeoServiceProvider::MissingRequiredParameterError;
*errorString = msgAccessTokenParameter();
- return 0;
+ return nullptr;
}
}
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
index 51450fd5..9f12c1f5 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
@@ -96,10 +96,10 @@ QSGNode *QGeoMapMapboxGLPrivate::updateSceneGraph(QSGNode *node, QQuickWindow *w
if (m_viewportSize.isEmpty()) {
delete node;
- return 0;
+ return nullptr;
}
- QMapboxGL *map = 0;
+ QMapboxGL *map = nullptr;
if (!node) {
QOpenGLContext *currentCtx = QOpenGLContext::currentContext();
if (!currentCtx) {
diff --git a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
index a92d6644..db3ee36c 100644
--- a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
@@ -56,7 +56,7 @@ QGeoCodingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createGeocodingMana
Q_UNUSED(error);
Q_UNUSED(errorString);
- return 0;
+ return nullptr;
}
QGeoMappingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createMappingManagerEngine(
@@ -72,7 +72,7 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createRoutingManag
Q_UNUSED(error);
Q_UNUSED(errorString);
- return 0;
+ return nullptr;
}
QPlaceManagerEngine *QGeoServiceProviderFactoryMapboxGL::createPlaceManagerEngine(
@@ -82,7 +82,7 @@ QPlaceManagerEngine *QGeoServiceProviderFactoryMapboxGL::createPlaceManagerEngin
Q_UNUSED(error);
Q_UNUSED(errorString);
- return 0;
+ return nullptr;
}
QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index 9c433a30..c7edd1a1 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -103,7 +103,7 @@ namespace
checkUsageTerms(parameters, error, errorString);
if (*error != QGeoServiceProvider::NoError)
- return 0;
+ return nullptr;
QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
if (!networkManager)
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index b86383bf..d13fa8ee 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -79,7 +79,7 @@ QGeoTileFetcherNokia::QGeoTileFetcherNokia(const QVariantMap &parameters,
QGeoTiledMappingManagerEngineNokia *engine,
const QSize &tileSize,
int ppi)
-: QGeoTileFetcher(engine), m_engineNokia(engine), m_networkManager(networkManager), m_ppi(ppi), m_copyrightsReply(0),
+: QGeoTileFetcher(engine), m_engineNokia(engine), m_networkManager(networkManager), m_ppi(ppi), m_copyrightsReply(nullptr),
m_baseUriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.mapping.host"), MAP_TILES_HOST)),
m_aerialUriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.mapping.host.aerial"), MAP_TILES_HOST_AERIAL))
{
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
index 69c5932c..14772a9a 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
@@ -269,7 +269,7 @@ QPlaceDetailsReply *QPlaceManagerEngineNokiaV2::getPlaceDetails(const QString &p
QPlaceContentReply *QPlaceManagerEngineNokiaV2::getPlaceContent(const QPlaceContentRequest &request)
{
- QNetworkReply *networkReply = 0;
+ QNetworkReply *networkReply = nullptr;
if (request.contentContext().userType() == qMetaTypeId<QUrl>()) {
QUrl u = request.contentContext().value<QUrl>();
@@ -401,7 +401,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest
}
}
- QNetworkReply *networkReply = 0;
+ QNetworkReply *networkReply = nullptr;
if (query.searchContext().userType() == qMetaTypeId<QUrl>()) {
// provided search context