summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-10-28 11:16:26 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-11-02 10:05:54 +0200
commitc032c91ee9776568d5593a3619ce0ac355e3135e (patch)
treeb70399160809b8601124160c9ef567790e834e88 /src
parent74a1a23f33c9d83f64fdad8834398ec6fe875f43 (diff)
downloadqtlocation-c032c91ee9776568d5593a3619ce0ac355e3135e.tar.gz
Clean up: make getters in QDeclarativeGeoRouteQuery const
Declare lazily updated data as mutable. Change-Id: I43c445c569e6499d28c0b3686efdfb9cc146d496 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/location/declarativemaps/qdeclarativegeoroutemodel.cpp6
-rw-r--r--src/location/declarativemaps/qdeclarativegeoroutemodel_p.h12
2 files changed, 9 insertions, 9 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
index c1ab91ce..c6085284 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
@@ -783,7 +783,7 @@ void QDeclarativeGeoRouteQuery::componentComplete()
\sa setFeatureWeight, featureWeight
*/
-QList<int> QDeclarativeGeoRouteQuery::featureTypes()
+QList<int> QDeclarativeGeoRouteQuery::featureTypes() const
{
QList<int> list;
@@ -1454,7 +1454,7 @@ void QDeclarativeGeoRouteQuery::setRouteOptimizations(QDeclarativeGeoRouteQuery:
/*!
\internal
*/
-QGeoRouteRequest QDeclarativeGeoRouteQuery::routeRequest()
+QGeoRouteRequest QDeclarativeGeoRouteQuery::routeRequest() const
{
if (m_extraParametersChanged) {
m_extraParametersChanged = false;
@@ -1485,7 +1485,7 @@ QGeoRouteRequest QDeclarativeGeoRouteQuery::routeRequest()
\since 5.11
*/
-QVariantMap QDeclarativeGeoRouteQuery::extraParameters()
+QVariantMap QDeclarativeGeoRouteQuery::extraParameters() const
{
return routeRequest().extraParameters();
}
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
index 4183ebc3..ed5daa4b 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
@@ -316,8 +316,8 @@ public:
void classBegin() override {}
void componentComplete() override;
- QGeoRouteRequest routeRequest();
- QVariantMap extraParameters();
+ QGeoRouteRequest routeRequest() const;
+ QVariantMap extraParameters() const;
enum TravelMode {
CarTravel = QGeoRouteRequest::CarTravel,
@@ -375,7 +375,7 @@ public:
int numberAlternativeRoutes() const;
//QList<FeatureType> featureTypes();
- QList<int> featureTypes();
+ QList<int> featureTypes() const;
QVariantList waypoints() const;
@@ -462,11 +462,11 @@ protected:
private:
Q_INVOKABLE void doCoordinateChanged();
- QGeoRouteRequest request_;
+ mutable QGeoRouteRequest request_;
bool complete_ = false;
bool m_excludedAreaCoordinateChanged = false;
- bool m_extraParametersChanged = false;
- bool m_waypointsChanged = false;
+ mutable bool m_extraParametersChanged = false;
+ mutable bool m_waypointsChanged = false;
QList<QDeclarativeGeoWaypoint *> m_waypoints;
};