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/labs/qsg/qmapcircleobjectqsg.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/labs/qsg/qmapcircleobjectqsg.cpp')
| -rw-r--r-- | src/location/labs/qsg/qmapcircleobjectqsg.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/location/labs/qsg/qmapcircleobjectqsg.cpp b/src/location/labs/qsg/qmapcircleobjectqsg.cpp index 6935beff..3cf98907 100644 --- a/src/location/labs/qsg/qmapcircleobjectqsg.cpp +++ b/src/location/labs/qsg/qmapcircleobjectqsg.cpp @@ -70,7 +70,7 @@ QMapCircleObjectPrivateQSG::~QMapCircleObjectPrivateQSG() void QMapCircleObjectPrivateQSG::updateGeometry() { - if (!m_dataGL.isNull()) + if (m_dataGL) updateGeometryGL(); else updateGeometryCPU(); @@ -202,9 +202,9 @@ QGeoMapObjectPrivate *QMapCircleObjectPrivateQSG::clone() void QMapCircleObjectPrivateQSG::switchToGL() { - if (!m_dataGL.isNull()) + if (m_dataGL) return; - QScopedPointer<CircleDataGL> data(new CircleDataGL); + std::unique_ptr<CircleDataGL> data(new CircleDataGL); m_dataGL.swap(data); m_dataGL->markSourceDirty(); m_dataCPU.reset(nullptr); @@ -212,9 +212,9 @@ void QMapCircleObjectPrivateQSG::switchToGL() void QMapCircleObjectPrivateQSG::switchToCPU() { - if (!m_dataCPU.isNull()) + if (m_dataCPU) return; - QScopedPointer<CircleDataCPU> data(new CircleDataCPU); + std::unique_ptr<CircleDataCPU> data(new CircleDataCPU); m_dataCPU.swap(data); m_dataGL.reset(nullptr); } @@ -224,7 +224,7 @@ QSGNode *QMapCircleObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode, QSGNode *root, QQuickWindow * window) { - if (!m_dataGL.isNull()) + if (m_dataGL) return updateMapObjectNodeGL(oldNode, visibleNode, root, window); else return updateMapObjectNodeCPU(oldNode, visibleNode, root, window); @@ -337,7 +337,7 @@ void QMapCircleObjectPrivateQSG::setCenter(const QGeoCoordinate ¢er) else switchToCPU(); - if (!m_dataGL.isNull()) + if (m_dataGL) m_dataGL->markSourceDirty(); updateGeometry(); @@ -353,7 +353,7 @@ void QMapCircleObjectPrivateQSG::setRadius(qreal radius) else switchToCPU(); - if (!m_dataGL.isNull()) + if (m_dataGL) m_dataGL->markSourceDirty(); updateGeometry(); @@ -364,7 +364,7 @@ void QMapCircleObjectPrivateQSG::setRadius(qreal radius) void QMapCircleObjectPrivateQSG::setColor(const QColor &color) { QMapCircleObjectPrivateDefault::setColor(color); - if (!m_dataCPU.isNull()) + if (m_dataCPU) updateGeometry(); if (m_map) emit m_map->sgNodeChanged(); @@ -373,7 +373,7 @@ void QMapCircleObjectPrivateQSG::setColor(const QColor &color) void QMapCircleObjectPrivateQSG::setBorderColor(const QColor &color) { QMapCircleObjectPrivateDefault::setBorderColor(color); - if (!m_dataCPU.isNull()) + if (m_dataCPU) updateGeometry(); if (m_map) emit m_map->sgNodeChanged(); @@ -382,7 +382,7 @@ void QMapCircleObjectPrivateQSG::setBorderColor(const QColor &color) void QMapCircleObjectPrivateQSG::setBorderWidth(qreal width) { QMapCircleObjectPrivateDefault::setBorderWidth(width); - if (!m_dataCPU.isNull()) + if (m_dataCPU) updateGeometry(); if (m_map) emit m_map->sgNodeChanged(); |