diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-06-10 20:38:50 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-06-16 16:08:59 +0200 |
commit | a0ed5f9f9c8acf1b4b631b69774ac67ac37739bc (patch) | |
tree | 83afaa8ebeb5abd6571b2842f7a68399e652b508 /src/location/declarativemaps/qdeclarativegeomapitemview.cpp | |
parent | 5164413d711409c64f153a2049d587580b15fe5e (diff) | |
download | qtlocation-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/location/declarativemaps/qdeclarativegeomapitemview.cpp')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitemview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp index f813cf91..0969a8ac 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp @@ -428,7 +428,7 @@ void QDeclarativeGeoMapItemView::transitionItemOut(QQuickItem *o) QDeclarativeGeoMapItemGroup *group = qobject_cast<QDeclarativeGeoMapItemGroup *>(o); if (group) { if (!group->m_transitionManager) { - QScopedPointer<QDeclarativeGeoMapItemTransitionManager>manager(new QDeclarativeGeoMapItemTransitionManager(group)); + std::unique_ptr<QDeclarativeGeoMapItemTransitionManager>manager(new QDeclarativeGeoMapItemTransitionManager(group)); group->m_transitionManager.swap(manager); group->m_transitionManager->m_view = this; } @@ -441,7 +441,7 @@ void QDeclarativeGeoMapItemView::transitionItemOut(QQuickItem *o) QDeclarativeGeoMapItemBase *item = qobject_cast<QDeclarativeGeoMapItemBase *>(o); if (item) { if (!item->m_transitionManager) { - QScopedPointer<QDeclarativeGeoMapItemTransitionManager> manager(new QDeclarativeGeoMapItemTransitionManager(item)); + std::unique_ptr<QDeclarativeGeoMapItemTransitionManager> manager(new QDeclarativeGeoMapItemTransitionManager(item)); item->m_transitionManager.swap(manager); item->m_transitionManager->m_view = this; } @@ -493,7 +493,7 @@ void QDeclarativeGeoMapItemView::addItemToMap(QDeclarativeGeoMapItemBase *item, m_map->addMapItem(item); if (m_enter) { if (!item->m_transitionManager) { - QScopedPointer<QDeclarativeGeoMapItemTransitionManager>manager(new QDeclarativeGeoMapItemTransitionManager(item)); + std::unique_ptr<QDeclarativeGeoMapItemTransitionManager>manager(new QDeclarativeGeoMapItemTransitionManager(item)); item->m_transitionManager.swap(manager); } item->m_transitionManager->m_view = this; @@ -521,7 +521,7 @@ void QDeclarativeGeoMapItemView::addItemViewToMap(QDeclarativeGeoMapItemView *it m_map->addMapItemView(item); if (m_enter) { if (!item->m_transitionManager) { - QScopedPointer<QDeclarativeGeoMapItemTransitionManager> manager(new QDeclarativeGeoMapItemTransitionManager(item)); + std::unique_ptr<QDeclarativeGeoMapItemTransitionManager> manager(new QDeclarativeGeoMapItemTransitionManager(item)); item->m_transitionManager.swap(manager); } item->m_transitionManager->m_view = this; @@ -541,7 +541,7 @@ void QDeclarativeGeoMapItemView::addItemGroupToMap(QDeclarativeGeoMapItemGroup * m_map->addMapItemGroup(item); if (m_enter) { if (!item->m_transitionManager) { - QScopedPointer<QDeclarativeGeoMapItemTransitionManager>manager(new QDeclarativeGeoMapItemTransitionManager(item)); + std::unique_ptr<QDeclarativeGeoMapItemTransitionManager>manager(new QDeclarativeGeoMapItemTransitionManager(item)); item->m_transitionManager.swap(manager); } item->m_transitionManager->m_view = this; |