diff options
Diffstat (limited to 'src/location/labs/qsg')
| -rw-r--r-- | src/location/labs/qsg/qmapcircleobjectqsg.cpp | 6 | ||||
| -rw-r--r-- | src/location/labs/qsg/qmapcircleobjectqsg_p_p.h | 2 | ||||
| -rw-r--r-- | src/location/labs/qsg/qmappolygonobjectqsg_p_p.h | 2 | ||||
| -rw-r--r-- | src/location/labs/qsg/qqsgmapobject_p.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/location/labs/qsg/qmapcircleobjectqsg.cpp b/src/location/labs/qsg/qmapcircleobjectqsg.cpp index 32f3030b..f79be136 100644 --- a/src/location/labs/qsg/qmapcircleobjectqsg.cpp +++ b/src/location/labs/qsg/qmapcircleobjectqsg.cpp @@ -66,7 +66,7 @@ void QMapCircleObjectPrivateQSG::updateCirclePath() { const QGeoProjectionWebMercator &p = static_cast<const QGeoProjectionWebMercator&>(m_map->geoProjection()); QList<QGeoCoordinate> path; - QDeclarativeCircleMapItem::calculatePeripheralPoints(path, center(), radius(), CircleSamples, m_leftBound); + QDeclarativeCircleMapItemPrivateCPU::calculatePeripheralPoints(path, center(), radius(), CircleSamples, m_leftBound); m_circlePath.clear(); for (const QGeoCoordinate &c : path) m_circlePath << p.geoToMapProjection(c); @@ -86,7 +86,7 @@ void QMapCircleObjectPrivateQSG::updateGeometry() QList<QDoubleVector2D> circlePath = m_circlePath; int pathCount = circlePath.size(); - bool preserve = QDeclarativeCircleMapItem::preserveCircleGeometry(circlePath, center(), radius(), p); + bool preserve = QDeclarativeCircleMapItemPrivateCPU::preserveCircleGeometry(circlePath, center(), radius(), p); // using leftBound_ instead of the analytically calculated circle_.boundingGeoRectangle().topLeft()); // to fix QTBUG-62154 m_geometry.markSourceDirty(); @@ -94,7 +94,7 @@ void QMapCircleObjectPrivateQSG::updateGeometry() m_geometry.setPreserveGeometry(preserve, m_leftBound); bool invertedCircle = false; - if (QDeclarativeCircleMapItem::crossEarthPole(center(), radius()) && circlePath.size() == pathCount) { + if (QDeclarativeCircleMapItemPrivateCPU::crossEarthPole(center(), radius()) && circlePath.size() == pathCount) { m_geometry.updateScreenPointsInvert(circlePath, *m_map); // invert fill area for really huge circles invertedCircle = true; } else { diff --git a/src/location/labs/qsg/qmapcircleobjectqsg_p_p.h b/src/location/labs/qsg/qmapcircleobjectqsg_p_p.h index 4e8162fa..6bbeb397 100644 --- a/src/location/labs/qsg/qmapcircleobjectqsg_p_p.h +++ b/src/location/labs/qsg/qmapcircleobjectqsg_p_p.h @@ -50,7 +50,7 @@ #include <QtLocation/private/qlocationglobal_p.h> #include <QtLocation/private/qgeomapobject_p_p.h> -#include <QtLocation/private/qdeclarativecirclemapitem_p.h> +#include <QtLocation/private/qdeclarativecirclemapitem_p_p.h> #include <QtLocation/private/qdeclarativepolygonmapitem_p.h> #include <QtLocation/private/qmapcircleobject_p.h> #include <QtLocation/private/qmapcircleobject_p_p.h> diff --git a/src/location/labs/qsg/qmappolygonobjectqsg_p_p.h b/src/location/labs/qsg/qmappolygonobjectqsg_p_p.h index 0f42a92e..8e6ae8a8 100644 --- a/src/location/labs/qsg/qmappolygonobjectqsg_p_p.h +++ b/src/location/labs/qsg/qmappolygonobjectqsg_p_p.h @@ -52,7 +52,7 @@ #include <QtLocation/private/qmappolygonobject_p.h> #include <QtLocation/private/qmappolygonobject_p_p.h> #include <QtLocation/private/qqsgmapobject_p.h> -#include <QtLocation/private/qdeclarativepolygonmapitem_p.h> +#include <QtLocation/private/qdeclarativepolygonmapitem_p_p.h> #include <QtCore/qscopedvaluerollback.h> QT_BEGIN_NAMESPACE diff --git a/src/location/labs/qsg/qqsgmapobject_p.h b/src/location/labs/qsg/qqsgmapobject_p.h index 52036805..0a717e62 100644 --- a/src/location/labs/qsg/qqsgmapobject_p.h +++ b/src/location/labs/qsg/qqsgmapobject_p.h @@ -51,7 +51,7 @@ #include <QtLocation/private/qlocationglobal_p.h> #include <QtQuick/QSGOpacityNode> #include <QtLocation/private/qgeomapobject_p.h> -#include <QtLocation/private/qdeclarativepolylinemapitem_p.h> +#include <QtLocation/private/qdeclarativepolylinemapitem_p_p.h> QT_BEGIN_NAMESPACE |