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>

14 files changed, 25 insertions, 25 deletions

diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
index 1a4a1ade..8044ccac 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
@@ -452,12 +452,12 @@ void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldC
     // if old does not cross and new crosses, move to CPU.
     if (!QDeclarativeCircleMapItemPrivate::crossEarthPole(oldCenter, oldRadius)
             && !QDeclarativeCircleMapItemPrivate::crossEarthPole(newCenter, newRadius)) {
-        QScopedPointer<QDeclarativeCircleMapItemPrivate> d(static_cast<QDeclarativeCircleMapItemPrivate *>(new QDeclarativeCircleMapItemPrivateCPU(*this)));
-        m_d.swap(d);
+        std::unique_ptr<QDeclarativeCircleMapItemPrivate> d(static_cast<QDeclarativeCircleMapItemPrivate *>(new QDeclarativeCircleMapItemPrivateCPU(*this)));
+        std::swap(m_d, d);
     } else if (QDeclarativeCircleMapItemPrivate::crossEarthPole(oldCenter, oldRadius)
                && !QDeclarativeCircleMapItemPrivate::crossEarthPole(newCenter, newRadius)) { // else if old crosses and new does not cross, move back to OpenGL
-        QScopedPointer<QDeclarativeCircleMapItemPrivate> d(static_cast<QDeclarativeCircleMapItemPrivate *>(new QDeclarativeCircleMapItemPrivateOpenGL(*this)));
-        m_d.swap(d);
+        std::unique_ptr<QDeclarativeCircleMapItemPrivate> d(static_cast<QDeclarativeCircleMapItemPrivate *>(new QDeclarativeCircleMapItemPrivateOpenGL(*this)));
+        std::swap(m_d, d);
     }
 }
 
@@ -534,12 +534,12 @@ void QDeclarativeCircleMapItem::setBackend(QDeclarativeCircleMapItem::Backend b)
     if (b == m_backend)
         return;
     m_backend = b;
-    QScopedPointer<QDeclarativeCircleMapItemPrivate> d(
+    std::unique_ptr<QDeclarativeCircleMapItemPrivate> d(
             (m_backend == Software) ? static_cast<QDeclarativeCircleMapItemPrivate *>(
                     new QDeclarativeCircleMapItemPrivateCPU(*this))
                                     : static_cast<QDeclarativeCircleMapItemPrivate *>(
                                             new QDeclarativeCircleMapItemPrivateOpenGL(*this)));
-    m_d.swap(d);
+    std::swap(m_d, d);
     m_d->onGeoGeometryChanged();
     emit backendChanged();
 }
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
index cf8038c0..b02e8542 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
@@ -129,7 +129,7 @@ private:
     bool m_updatingGeometry;
     Backend m_backend = Software;
 
-    QScopedPointer<QDeclarativeCircleMapItemPrivate> m_d;
+    std::unique_ptr<QDeclarativeCircleMapItemPrivate> m_d;
 
     friend class QDeclarativeCircleMapItemPrivate;
     friend class QDeclarativeCircleMapItemPrivateCPU;
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index fd7e7351..d239934b 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -2428,7 +2428,7 @@ void QDeclarativeGeoMap::fitViewportToMapItemsRefine(const QList<QPointer<QDecla
 
             QRectF brect = item->boundingRect();
             brect = quickItem->matrix_->m_matrix.mapRect(brect);
-            QPointF transformedPosition = quickItem->matrix_->m_matrix * item->position();
+            QPointF transformedPosition = quickItem->matrix_->m_matrix.map(item->position());
             topLeftX = transformedPosition.x();
             topLeftY = transformedPosition.y();
             bottomRightX = topLeftX + brect.width();
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
index be7cfc77..de784a52 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
@@ -247,7 +247,7 @@ void QDeclarativeGeoMapCopyrightNotice::rasterizeHtmlAndUpdate()
     m_copyrightsImage.fill(qPremultiply(QColor(Qt::transparent).rgba()));
     QPainter painter(&m_copyrightsImage);
     QAbstractTextDocumentLayout::PaintContext ctx;
-    ctx.palette.setColor(QPalette::Text, QStringLiteral("black"));
+    ctx.palette.setColor(QPalette::Text, QColor::fromString("black"));
     m_copyrightsHtml->documentLayout()->draw(&painter, ctx);
 
     setImplicitSize(m_copyrightsImage.width(), m_copyrightsImage.height());
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
index 4d7234c7..d1166291 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
@@ -166,7 +166,7 @@ private:
 
     QDeclarativeGeoMapItemGroup *parentGroup_;
 
-    QScopedPointer<QDeclarativeGeoMapItemTransitionManager> m_transitionManager;
+    std::unique_ptr<QDeclarativeGeoMapItemTransitionManager> m_transitionManager;
     bool m_autoFadeIn = true;
     int m_lodThreshold = 0;
 
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h b/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h
index a125ba0c..58bf887d 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h
@@ -87,7 +87,7 @@ protected slots:
 private:
     QDeclarativeGeoMap *m_quickMap;
     QDeclarativeGeoMapItemGroup *m_parentGroup = nullptr;
-    QScopedPointer<QDeclarativeGeoMapItemTransitionManager> m_transitionManager;
+    std::unique_ptr<QDeclarativeGeoMapItemTransitionManager> m_transitionManager;
 
     friend class QDeclarativeGeoMapItemView;
     friend class QDeclarativeGeoMapItemTransitionManager;
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;
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
index 0b6a01b0..84b8b296 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
@@ -689,12 +689,12 @@ void QDeclarativePolygonMapItem::setBackend(QDeclarativePolygonMapItem::Backend
     if (b == m_backend)
         return;
     m_backend = b;
-    QScopedPointer<QDeclarativePolygonMapItemPrivate> d(
+    std::unique_ptr<QDeclarativePolygonMapItemPrivate> d(
             (m_backend == Software) ? static_cast<QDeclarativePolygonMapItemPrivate *>(
                     new QDeclarativePolygonMapItemPrivateCPU(*this))
                                     : static_cast<QDeclarativePolygonMapItemPrivate *>(
                                             new QDeclarativePolygonMapItemPrivateOpenGL(*this)));
-    m_d.swap(d);
+    std::swap(m_d, d);
     m_d->onGeoGeometryChanged();
     emit backendChanged();
 }
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
index 39e5225d..d3b8d67d 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
@@ -126,7 +126,7 @@ public:
 //    bool m_dirtyGeometry = false;
     bool m_updatingGeometry;
 
-    QScopedPointer<QDeclarativePolygonMapItemPrivate> m_d;
+    std::unique_ptr<QDeclarativePolygonMapItemPrivate> m_d;
 
     friend class QDeclarativePolygonMapItemPrivate;
     friend class QDeclarativePolygonMapItemPrivateCPU;
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index 278c3251..6c7dabd2 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -1215,7 +1215,7 @@ void QDeclarativePolylineMapItem::setBackend(QDeclarativePolylineMapItem::Backen
     if (b == m_backend)
         return;
     m_backend = b;
-    QScopedPointer<QDeclarativePolylineMapItemPrivate> d(
+    std::unique_ptr<QDeclarativePolylineMapItemPrivate> d(
             (m_backend == Software)
                     ? static_cast<QDeclarativePolylineMapItemPrivate *>(
                             new QDeclarativePolylineMapItemPrivateCPU(*this))
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index 2f6874d1..8f52c17a 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -160,7 +160,7 @@ public:
     bool m_dirtyMaterial;
     bool m_updatingGeometry;
 
-    QScopedPointer<QDeclarativePolylineMapItemPrivate> m_d;
+    std::unique_ptr<QDeclarativePolylineMapItemPrivate> m_d;
 
     friend class QDeclarativePolylineMapItemPrivate;
     friend class QDeclarativePolylineMapItemPrivateCPU;
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
index dc941a3f..2e24a112 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
@@ -188,13 +188,13 @@ void QDeclarativeRectangleMapItem::setBackend(QDeclarativeRectangleMapItem::Back
     if (b == m_backend)
         return;
     m_backend = b;
-    QScopedPointer<QDeclarativeRectangleMapItemPrivate> d(
+    std::unique_ptr<QDeclarativeRectangleMapItemPrivate> d(
             (m_backend == Software) ? static_cast<QDeclarativeRectangleMapItemPrivate *>(
                     new QDeclarativeRectangleMapItemPrivateCPU(*this))
                                     : static_cast<QDeclarativeRectangleMapItemPrivate *>(
                                             new QDeclarativeRectangleMapItemPrivateOpenGL(*this)));
 
-    m_d.swap(d);
+    std::swap(m_d, d);
     m_d->onGeoGeometryChanged();
     emit backendChanged();
 }
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
index 59b06822..0a5c5fa8 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
@@ -130,7 +130,7 @@ private:
     bool m_updatingGeometry;
     Backend m_backend = Software;
 
-    QScopedPointer<QDeclarativeRectangleMapItemPrivate> m_d;
+    std::unique_ptr<QDeclarativeRectangleMapItemPrivate> m_d;
 
     friend class QDeclarativeRectangleMapItemPrivate;
     friend class QDeclarativeRectangleMapItemPrivateCPU;
diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
index 4fd1448c..e46e5b26 100644
--- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp
+++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
@@ -1819,7 +1819,7 @@ void QQuickGeoMapGestureArea::startFlick(int dx, int dy, int timeMs)
     QPointF delta(dx, dy);
     QMatrix4x4 matBearing;
     matBearing.rotate(m_map->cameraData().bearing(), 0, 0, 1);
-    delta = matBearing * delta;
+    delta = matBearing.map(delta);
 
     double zoom = pow(2.0, m_declarativeMap->zoomLevel());
     double longitude = animationStartCoordinate.longitude() - (delta.x() / zoom);