summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-06-10 20:38:50 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-06-16 16:08:59 +0200
commita0ed5f9f9c8acf1b4b631b69774ac67ac37739bc (patch)
tree83afaa8ebeb5abd6571b2842f7a68399e652b508 /src/plugins/geoservices/osm/qgeotileproviderosm.cpp
parent5164413d711409c64f153a2049d587580b15fe5e (diff)
downloadqtlocation-a0ed5f9f9c8acf1b4b631b69774ac67ac37739bc.tar.gz
Silence build warnings, fix build errors
Replace various deprecated APIs with their supported Qt 6 versions. Most notably, replace QScopedPointer with std::unique_ptr, as the code frequently use deprecated QScopedPointer::swap. Change-Id: If9cb0be89423fd310073709eb390401d74240153 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/geoservices/osm/qgeotileproviderosm.cpp')
-rw-r--r--src/plugins/geoservices/osm/qgeotileproviderosm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
index a0e261b8..d3bbbefb 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
@@ -267,11 +267,11 @@ void QGeoTileProviderOsm::addProvider(TileProvider *provider)
{
if (!provider)
return;
- QScopedPointer<TileProvider> p(provider);
+ std::unique_ptr<TileProvider> p(provider);
if (provider->status() == TileProvider::Invalid)
return; // if the provider is already resolved and invalid, no point in adding it.
- provider = p.take();
+ provider = p.release();
provider->setNetworkManager(m_nm);
provider->setParent(this);
m_providerList.append(provider);