summaryrefslogtreecommitdiff
path: root/src/location/maps
diff options
context:
space:
mode:
Diffstat (limited to 'src/location/maps')
-rw-r--r--src/location/maps/qgeocameratiles.cpp10
-rw-r--r--src/location/maps/qgeofiletilecache.cpp2
-rw-r--r--src/location/maps/qgeofiletilecache_p.h2
-rw-r--r--src/location/maps/qgeomaneuver.cpp4
-rw-r--r--src/location/maps/qgeomaneuver_p.h4
-rw-r--r--src/location/maps/qgeomap.cpp4
-rw-r--r--src/location/maps/qgeomap_p.h4
-rw-r--r--src/location/maps/qgeomap_p_p.h2
-rw-r--r--src/location/maps/qgeomapparameter.cpp2
-rw-r--r--src/location/maps/qgeomapparameter_p.h2
-rw-r--r--src/location/maps/qgeorouteparserosrmv5.cpp10
-rw-r--r--src/location/maps/qgeoserviceprovider.cpp2
-rw-r--r--src/location/maps/qgeoserviceprovider_p.h2
-rw-r--r--src/location/maps/qgeotiledmap.cpp4
-rw-r--r--src/location/maps/qgeotiledmap_p_p.h4
-rw-r--r--src/location/maps/qgeotiledmapscene_p_p.h2
16 files changed, 29 insertions, 31 deletions
diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp
index 1a401b53..21b45cc6 100644
--- a/src/location/maps/qgeocameratiles.cpp
+++ b/src/location/maps/qgeocameratiles.cpp
@@ -506,22 +506,20 @@ QGeoCameraTilesPrivate::ClippedFootprint QGeoCameraTilesPrivate::clipFootprintTo
PolygonVector results = footprint;
- if (clipY0) {
+ if (clipY0)
results = splitPolygonAtAxisValue(results, 1, 0.0).second;
- }
- if (clipY1) {
+ if (clipY1)
results = splitPolygonAtAxisValue(results, 1, side).first;
- }
- for (const QDoubleVector3D &p: results) {
+ for (const QDoubleVector3D &p : qAsConst(results)) {
if ((p.x() < 0.0) || (qFuzzyIsNull(p.x())))
clipX0 = true;
if ((p.x() > side) || (qFuzzyCompare(side, p.x())))
clipX1 = true;
}
- for (const QDoubleVector3D &v : results) {
+ for (const QDoubleVector3D &v : qAsConst(results)) {
minX = qMin(v.x(), minX);
maxX = qMax(v.x(), maxX);
}
diff --git a/src/location/maps/qgeofiletilecache.cpp b/src/location/maps/qgeofiletilecache.cpp
index 251b3237..9c0b9504 100644
--- a/src/location/maps/qgeofiletilecache.cpp
+++ b/src/location/maps/qgeofiletilecache.cpp
@@ -335,7 +335,7 @@ void QGeoFileTileCache::clearMapId(const int mapId)
QDir dir(directory_);
QStringList formats;
formats << QLatin1String("*.*");
- QStringList files = dir.entryList(formats, QDir::Files);
+ const QStringList files = dir.entryList(formats, QDir::Files);
qWarning() << "Old tile data detected. Cache eviction left out "<< files.size() << "tiles";
for (const QString &tileFileName : files) {
QGeoTileSpec spec = filenameToTileSpec(tileFileName);
diff --git a/src/location/maps/qgeofiletilecache_p.h b/src/location/maps/qgeofiletilecache_p.h
index 3def14e7..bc5c849c 100644
--- a/src/location/maps/qgeofiletilecache_p.h
+++ b/src/location/maps/qgeofiletilecache_p.h
@@ -110,7 +110,7 @@ public:
int minTextureUsage() const override;
int textureUsage() const override;
void clearAll() override;
- void clearMapId(const int mapId);
+ void clearMapId(int mapId);
void setCostStrategyDisk(CostStrategy costStrategy) override;
CostStrategy costStrategyDisk() const override;
void setCostStrategyMemory(CostStrategy costStrategy) override;
diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 4cb6b6fb..26d3592f 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -370,7 +370,7 @@ QString QGeoManeuverPrivate::id() const
return QString();
}
-void QGeoManeuverPrivate::setId(const QString id)
+void QGeoManeuverPrivate::setId(const QString &id)
{
Q_UNUSED(id);
}
@@ -488,7 +488,7 @@ QString QGeoManeuverPrivateDefault::id() const
return m_id;
}
-void QGeoManeuverPrivateDefault::setId(const QString id)
+void QGeoManeuverPrivateDefault::setId(const QString &id)
{
m_id = id;
}
diff --git a/src/location/maps/qgeomaneuver_p.h b/src/location/maps/qgeomaneuver_p.h
index 918169fc..8ce368e0 100644
--- a/src/location/maps/qgeomaneuver_p.h
+++ b/src/location/maps/qgeomaneuver_p.h
@@ -74,7 +74,7 @@ public:
virtual void setValid(bool valid);
virtual QString id() const;
- virtual void setId(const QString id);
+ virtual void setId(const QString &id);
virtual QGeoCoordinate position() const;
virtual void setPosition(const QGeoCoordinate &position);
@@ -113,7 +113,7 @@ public:
virtual void setValid(bool valid) override;
virtual QString id() const override;
- virtual void setId(const QString id) override;
+ virtual void setId(const QString &id) override;
virtual QGeoCoordinate position() const override;
virtual void setPosition(const QGeoCoordinate &position) override;
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index 9766a5b7..f6b3edca 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -157,7 +157,7 @@ const QGeoCameraData &QGeoMap::cameraData() const
return d->m_cameraData;
}
-void QGeoMap::setActiveMapType(const QGeoMapType type)
+void QGeoMap::setActiveMapType(const QGeoMapType &type)
{
Q_D(QGeoMap);
if (type == d->m_activeMapType)
@@ -168,7 +168,7 @@ void QGeoMap::setActiveMapType(const QGeoMapType type)
emit activeMapTypeChanged();
}
-const QGeoMapType QGeoMap::activeMapType() const
+QGeoMapType QGeoMap::activeMapType() const
{
Q_D(const QGeoMap);
return d->m_activeMapType;
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h
index 295a5aba..331359ad 100644
--- a/src/location/maps/qgeomap_p.h
+++ b/src/location/maps/qgeomap_p.h
@@ -117,8 +117,8 @@ public:
QGeoCameraCapabilities cameraCapabilities() const;
virtual Capabilities capabilities() const;
- void setActiveMapType(const QGeoMapType mapType);
- const QGeoMapType activeMapType() const;
+ void setActiveMapType(const QGeoMapType &mapType);
+ QGeoMapType activeMapType() const;
// returns the minimum zoom at the current viewport size
double minimumZoom() const;
diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h
index 97707ccb..eaa62989 100644
--- a/src/location/maps/qgeomap_p_p.h
+++ b/src/location/maps/qgeomap_p_p.h
@@ -98,7 +98,7 @@ protected:
virtual void changeViewportSize(const QSize &size) = 0; // called by QGeoMap::setSize()
virtual void changeCameraData(const QGeoCameraData &oldCameraData) = 0; // called by QGeoMap::setCameraData()
- virtual void changeActiveMapType(const QGeoMapType mapType) = 0; // called by QGeoMap::setActiveMapType()
+ virtual void changeActiveMapType(const QGeoMapType &mapType) = 0; // called by QGeoMap::setActiveMapType()
virtual double mapWidth() const;
virtual double mapHeight() const;
diff --git a/src/location/maps/qgeomapparameter.cpp b/src/location/maps/qgeomapparameter.cpp
index fb069bf2..aef520e0 100644
--- a/src/location/maps/qgeomapparameter.cpp
+++ b/src/location/maps/qgeomapparameter.cpp
@@ -101,7 +101,7 @@ QVariantMap QGeoMapParameter::toVariantMap() const
return res;
}
-bool QGeoMapParameter::hasProperty(const char *propertyName)
+bool QGeoMapParameter::hasProperty(const char *propertyName) const
{
return metaObject()->indexOfProperty(propertyName) != -1
|| dynamicPropertyNames().indexOf(QByteArray(propertyName)) != -1;
diff --git a/src/location/maps/qgeomapparameter_p.h b/src/location/maps/qgeomapparameter_p.h
index 36226ef4..ab3bc9c3 100644
--- a/src/location/maps/qgeomapparameter_p.h
+++ b/src/location/maps/qgeomapparameter_p.h
@@ -76,7 +76,7 @@ public:
void updateProperty(const char *propertyName, QVariant value);
QVariantMap toVariantMap() const;
- bool hasProperty(const char *propertyName);
+ bool hasProperty(const char *propertyName) const;
Q_SIGNALS:
void propertyUpdated(QGeoMapParameter *param, const char *propertyName);
diff --git a/src/location/maps/qgeorouteparserosrmv5.cpp b/src/location/maps/qgeorouteparserosrmv5.cpp
index 151e065f..4225a1dd 100644
--- a/src/location/maps/qgeorouteparserosrmv5.cpp
+++ b/src/location/maps/qgeorouteparserosrmv5.cpp
@@ -921,8 +921,8 @@ QGeoRouteReply::Error QGeoRouteParserOsrmV5Private::parseReply(QList<QGeoRoute>
return QGeoRouteReply::ParseError;
}
- QJsonArray osrmRoutes = object.value(QLatin1String("routes")).toArray();
- for (const QJsonValueRef r : osrmRoutes) {
+ const QJsonArray osrmRoutes = object.value(QLatin1String("routes")).toArray();
+ for (const QJsonValueConstRef r : osrmRoutes) {
if (!r.isObject())
continue;
QJsonObject routeObject = r.toObject();
@@ -938,7 +938,7 @@ QGeoRouteReply::Error QGeoRouteParserOsrmV5Private::parseReply(QList<QGeoRoute>
bool error = false;
QList<QGeoRouteSegment> segments;
- QJsonArray legs = routeObject.value(QLatin1String("legs")).toArray();
+ const QJsonArray legs = routeObject.value(QLatin1String("legs")).toArray();
QList<QGeoRouteLeg> routeLegs;
QGeoRoute route;
for (int legIndex = 0; legIndex < legs.size(); ++legIndex) {
@@ -949,14 +949,14 @@ QGeoRouteReply::Error QGeoRouteParserOsrmV5Private::parseReply(QList<QGeoRoute>
error = true;
break;
}
- QJsonObject leg = l.toObject();
+ const QJsonObject leg = l.toObject();
if (!leg.value(QLatin1String("steps")).isArray()) { // Invalid steps field
error = true;
break;
}
const double legDistance = leg.value(QLatin1String("distance")).toDouble();
const double legTravelTime = leg.value(QLatin1String("duration")).toDouble();
- QJsonArray steps = leg.value(QLatin1String("steps")).toArray();
+ const QJsonArray steps = leg.value(QLatin1String("steps")).toArray();
QGeoRouteSegment segment;
for (int stepIndex = 0; stepIndex < steps.size(); ++stepIndex) {
const QJsonValue &s = steps.at(stepIndex);
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index 4a82b3b6..dcf8d043 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -275,7 +275,7 @@ QGeoServiceProvider::~QGeoServiceProvider()
* Ideally, the enumName would be a template parameter, but strings
* are not a valid const expr. :( */
template <class Flags>
-Flags QGeoServiceProviderPrivate::features(const char *enumName)
+Flags QGeoServiceProviderPrivate::features(const char *enumName) const
{
const QMetaObject *mo = &QGeoServiceProvider::staticMetaObject;
const QMetaEnum en = mo->enumerator(
diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h
index 5994c33d..1ebc4f5e 100644
--- a/src/location/maps/qgeoserviceprovider_p.h
+++ b/src/location/maps/qgeoserviceprovider_p.h
@@ -85,7 +85,7 @@ public:
Manager *manager(QGeoServiceProvider::Error *error,
QString *errorString, Manager **manager);
template <class Flags>
- Flags features(const char *enumName);
+ Flags features(const char *enumName) const;
QGeoServiceProviderFactory *factory;
QGeoServiceProviderFactoryV2 *factoryV2 = nullptr;
diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp
index 37e7b791..2e2911b1 100644
--- a/src/location/maps/qgeotiledmap.cpp
+++ b/src/location/maps/qgeotiledmap.cpp
@@ -277,7 +277,7 @@ void QGeoTiledMapPrivate::prefetchTiles()
}
}
-QGeoMapType QGeoTiledMapPrivate::activeMapType()
+QGeoMapType QGeoTiledMapPrivate::activeMapType() const
{
return m_visibleTiles->activeMapType();
}
@@ -382,7 +382,7 @@ QRectF QGeoTiledMapPrivate::visibleArea() const
return m_visibleArea;
}
-void QGeoTiledMapPrivate::changeActiveMapType(const QGeoMapType mapType)
+void QGeoTiledMapPrivate::changeActiveMapType(const QGeoMapType &mapType)
{
m_visibleTiles->setTileSize(m_cameraCapabilities.tileSize());
m_prefetchTiles->setTileSize(m_cameraCapabilities.tileSize());
diff --git a/src/location/maps/qgeotiledmap_p_p.h b/src/location/maps/qgeotiledmap_p_p.h
index 6c5f01fb..58e66ce5 100644
--- a/src/location/maps/qgeotiledmap_p_p.h
+++ b/src/location/maps/qgeotiledmap_p_p.h
@@ -82,13 +82,13 @@ public:
void updateTile(const QGeoTileSpec &spec);
void prefetchTiles();
- QGeoMapType activeMapType();
+ QGeoMapType activeMapType() const;
void onCameraCapabilitiesChanged(const QGeoCameraCapabilities &oldCameraCapabilities);
protected:
void changeViewportSize(const QSize& size) override;
void changeCameraData(const QGeoCameraData &cameraData) override;
- void changeActiveMapType(const QGeoMapType mapType) override;
+ void changeActiveMapType(const QGeoMapType &mapType) override;
void changeTileVersion(int version);
void clearScene();
diff --git a/src/location/maps/qgeotiledmapscene_p_p.h b/src/location/maps/qgeotiledmapscene_p_p.h
index 4c087d43..d1e735f2 100644
--- a/src/location/maps/qgeotiledmapscene_p_p.h
+++ b/src/location/maps/qgeotiledmapscene_p_p.h
@@ -144,7 +144,7 @@ public:
bool buildGeometry(const QGeoTileSpec &spec, QSGImageNode *imageNode, bool &overzooming);
void updateTileBounds(const QSet<QGeoTileSpec> &tiles);
void setupCamera();
- inline bool isTiltedOrRotated() { return (m_cameraData.tilt() > 0.0) || (m_cameraData.bearing() > 0.0); }
+ inline bool isTiltedOrRotated() const { return (m_cameraData.tilt() > 0.0) || (m_cameraData.bearing() > 0.0); }
public:
View Lorry Controller Status