summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp2
-rw-r--r--src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp2
-rw-r--r--src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h6
-rw-r--r--src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp10
-rw-r--r--src/plugins/geoservices/osm/qgeofiletilecacheosm.h11
-rw-r--r--src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp16
-rw-r--r--src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h6
-rw-r--r--src/plugins/geoservices/osm/qgeotilefetcherosm.cpp15
-rw-r--r--src/plugins/geoservices/osm/qgeotilefetcherosm.h7
-rw-r--r--src/plugins/geoservices/osm/qgeotileproviderosm.cpp11
-rw-r--r--src/plugins/geoservices/osm/qgeotileproviderosm.h9
-rw-r--r--src/plugins/position/serialnmea/qiopipe.cpp2
-rw-r--r--src/plugins/position/serialnmea/qiopipe_p.h2
13 files changed, 51 insertions, 48 deletions
diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
index 53f650e3..f89bb7ef 100644
--- a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
@@ -119,7 +119,7 @@ QGeoTiledMappingManagerEngineMapbox::QGeoTiledMappingManagerEngineMapbox(const Q
}
}
- QVector<QString> mapIds;
+ QList<QString> mapIds;
for (int i=0; i < mapTypes.size(); ++i)
mapIds.push_back(mapTypes[i].name());
diff --git a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp
index 0b128556..9fe0da8c 100644
--- a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp
@@ -60,7 +60,7 @@ void QGeoTileFetcherMapbox::setUserAgent(const QByteArray &userAgent)
m_userAgent = userAgent;
}
-void QGeoTileFetcherMapbox::setMapIds(const QVector<QString> &mapIds)
+void QGeoTileFetcherMapbox::setMapIds(const QList<QString> &mapIds)
{
m_mapIds = mapIds;
}
diff --git a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h
index 47f3a8aa..6a653354 100644
--- a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h
@@ -37,7 +37,7 @@
#ifndef QGEOTILEFETCHERMAPBOX_H
#define QGEOTILEFETCHERMAPBOX_H
-#include <qvector.h>
+#include <qlist.h>
#include <QtLocation/private/qgeotilefetcher_p.h>
QT_BEGIN_NAMESPACE
@@ -53,7 +53,7 @@ public:
QGeoTileFetcherMapbox(int scaleFactor, QGeoTiledMappingManagerEngine *parent);
void setUserAgent(const QByteArray &userAgent);
- void setMapIds(const QVector<QString> &mapIds);
+ void setMapIds(const QList<QString> &mapIds);
void setFormat(const QString &format);
void setAccessToken(const QString &accessToken);
@@ -65,7 +65,7 @@ private:
QString m_format;
QString m_replyFormat;
QString m_accessToken;
- QVector<QString> m_mapIds;
+ QList<QString> m_mapIds;
int m_scaleFactor;
};
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
index 3bb1ea7b..3ca0255c 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
@@ -45,11 +45,13 @@
QT_BEGIN_NAMESPACE
-QGeoFileTileCacheOsm::QGeoFileTileCacheOsm(const QVector<QGeoTileProviderOsm *> &providers,
+QGeoFileTileCacheOsm::QGeoFileTileCacheOsm(const QList<QGeoTileProviderOsm *> &providers,
const QString &offlineDirectory,
- const QString &directory,
- QObject *parent)
-: QGeoFileTileCache(directory, parent), m_offlineDirectory(offlineDirectory), m_offlineData(false), m_providers(providers)
+ const QString &directory, QObject *parent)
+ : QGeoFileTileCache(directory, parent),
+ m_offlineDirectory(offlineDirectory),
+ m_offlineData(false),
+ m_providers(providers)
{
m_highDpi.resize(providers.size());
if (!offlineDirectory.isEmpty()) {
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
index da1fd0d3..a7a203c8 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
@@ -49,10 +49,9 @@ class QGeoFileTileCacheOsm : public QGeoFileTileCache
{
Q_OBJECT
public:
- QGeoFileTileCacheOsm(const QVector<QGeoTileProviderOsm *> &providers,
+ QGeoFileTileCacheOsm(const QList<QGeoTileProviderOsm *> &providers,
const QString &offlineDirectory = QString(),
- const QString &directory = QString(),
- QObject *parent = 0);
+ const QString &directory = QString(), QObject *parent = 0);
~QGeoFileTileCacheOsm();
QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec) override;
@@ -77,9 +76,9 @@ protected:
QDir m_offlineDirectory;
bool m_offlineData;
- QVector<QGeoTileProviderOsm *> m_providers;
- QVector<bool> m_highDpi;
- QVector<QDateTime> m_maxMapIdTimestamps;
+ QList<QGeoTileProviderOsm *> m_providers;
+ QList<bool> m_highDpi;
+ QList<QDateTime> m_maxMapIdTimestamps;
};
QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
index 22c32342..b9b3f476 100644
--- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
@@ -105,13 +105,13 @@ QGeoTiledMappingManagerEngineOsm::QGeoTiledMappingManagerEngineOsm(const QVarian
}
/* TileProviders setup */
- QVector<TileProvider *> providers_street;
- QVector<TileProvider *> providers_satellite;
- QVector<TileProvider *> providers_cycle;
- QVector<TileProvider *> providers_transit;
- QVector<TileProvider *> providers_nighttransit;
- QVector<TileProvider *> providers_terrain;
- QVector<TileProvider *> providers_hiking;
+ QList<TileProvider *> providers_street;
+ QList<TileProvider *> providers_satellite;
+ QList<TileProvider *> providers_cycle;
+ QList<TileProvider *> providers_transit;
+ QList<TileProvider *> providers_nighttransit;
+ QList<TileProvider *> providers_terrain;
+ QList<TileProvider *> providers_hiking;
if (highdpi) {
providers_street.push_back(new TileProvider(domain + "street-hires", true));
providers_satellite.push_back(new TileProvider(domain + "satellite-hires", true));
@@ -349,7 +349,7 @@ QGeoMap *QGeoTiledMappingManagerEngineOsm::createMap()
return map;
}
-const QVector<QGeoTileProviderOsm *> &QGeoTiledMappingManagerEngineOsm::providers()
+const QList<QGeoTileProviderOsm *> &QGeoTiledMappingManagerEngineOsm::providers()
{
return m_providers;
}
diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
index 12290c8f..adf4b161 100644
--- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
@@ -45,7 +45,7 @@
#include <QtLocation/QGeoServiceProvider>
#include <QtLocation/private/qgeotiledmappingmanagerengine_p.h>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -60,7 +60,7 @@ public:
~QGeoTiledMappingManagerEngineOsm();
QGeoMap *createMap() override;
- const QVector<QGeoTileProviderOsm *> &providers();
+ const QList<QGeoTileProviderOsm *> &providers();
QString customCopyright() const;
protected Q_SLOTS:
@@ -71,7 +71,7 @@ protected:
void updateMapTypes();
private:
- QVector<QGeoTileProviderOsm *> m_providers;
+ QList<QGeoTileProviderOsm *> m_providers;
QString m_customCopyright;
QString m_cacheDirectory;
QString m_offlineDirectory;
diff --git a/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp b/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
index 135654a9..49c41bcb 100644
--- a/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
@@ -48,7 +48,7 @@
QT_BEGIN_NAMESPACE
-static bool providersResolved(const QVector<QGeoTileProviderOsm *> &providers)
+static bool providersResolved(const QList<QGeoTileProviderOsm *> &providers)
{
foreach (const QGeoTileProviderOsm *provider, providers)
if (!provider->isResolved())
@@ -75,12 +75,13 @@ QGeoTileFetcherOsmPrivate::~QGeoTileFetcherOsmPrivate()
{
}
-
-QGeoTileFetcherOsm::QGeoTileFetcherOsm(const QVector<QGeoTileProviderOsm *> &providers,
- QNetworkAccessManager *nm,
- QGeoMappingManagerEngine *parent)
-: QGeoTileFetcher(*new QGeoTileFetcherOsmPrivate(), parent), m_userAgent("Qt Location based application"),
- m_providers(providers), m_nm(nm), m_ready(true)
+QGeoTileFetcherOsm::QGeoTileFetcherOsm(const QList<QGeoTileProviderOsm *> &providers,
+ QNetworkAccessManager *nm, QGeoMappingManagerEngine *parent)
+ : QGeoTileFetcher(*new QGeoTileFetcherOsmPrivate(), parent),
+ m_userAgent("Qt Location based application"),
+ m_providers(providers),
+ m_nm(nm),
+ m_ready(true)
{
m_nm->setParent(this);
foreach (QGeoTileProviderOsm *provider, m_providers) {
diff --git a/src/plugins/geoservices/osm/qgeotilefetcherosm.h b/src/plugins/geoservices/osm/qgeotilefetcherosm.h
index 682ff689..3de9d630 100644
--- a/src/plugins/geoservices/osm/qgeotilefetcherosm.h
+++ b/src/plugins/geoservices/osm/qgeotilefetcherosm.h
@@ -42,7 +42,7 @@
#include "qgeotileproviderosm.h"
#include <QtLocation/private/qgeotilefetcher_p.h>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -57,8 +57,7 @@ class QGeoTileFetcherOsm : public QGeoTileFetcher
friend class QGeoMapReplyOsm;
friend class QGeoTiledMappingManagerEngineOsm;
public:
- QGeoTileFetcherOsm(const QVector<QGeoTileProviderOsm *> &providers,
- QNetworkAccessManager *nm,
+ QGeoTileFetcherOsm(const QList<QGeoTileProviderOsm *> &providers, QNetworkAccessManager *nm,
QGeoMappingManagerEngine *parent);
void setUserAgent(const QByteArray &userAgent);
@@ -79,7 +78,7 @@ private:
void readyUpdated();
QByteArray m_userAgent;
- QVector<QGeoTileProviderOsm *> m_providers;
+ QList<QGeoTileProviderOsm *> m_providers;
QNetworkAccessManager *m_nm;
bool m_ready;
};
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
index dfe3d8e9..3f48ff5e 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
@@ -55,11 +55,14 @@ static void setSSL(QGeoMapType &mapType, bool isHTTPS)
metadata);
}
-QGeoTileProviderOsm::QGeoTileProviderOsm(QNetworkAccessManager *nm,
- const QGeoMapType &mapType,
- const QVector<TileProvider *> &providers,
+QGeoTileProviderOsm::QGeoTileProviderOsm(QNetworkAccessManager *nm, const QGeoMapType &mapType,
+ const QList<TileProvider *> &providers,
const QGeoCameraCapabilities &cameraCapabilities)
-: m_nm(nm), m_provider(nullptr), m_mapType(mapType), m_status(Idle), m_cameraCapabilities(cameraCapabilities)
+ : m_nm(nm),
+ m_provider(nullptr),
+ m_mapType(mapType),
+ m_status(Idle),
+ m_cameraCapabilities(cameraCapabilities)
{
for (int i = 0; i < providers.size(); ++i) {
TileProvider *p = providers[i];
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.h b/src/plugins/geoservices/osm/qgeotileproviderosm.h
index ab4e2294..c2eec6f9 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.h
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.h
@@ -40,7 +40,7 @@
#include <QtLocation/private/qgeomaptype_p.h>
#include <QtLocation/private/qgeocameracapabilities_p.h>
#include <QtCore/QUrl>
-#include <QtCore/QVector>
+#include <QtCore/QList>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>
#include <QtCore/QPointer>
@@ -141,9 +141,8 @@ public:
Resolving,
Resolved };
- QGeoTileProviderOsm(QNetworkAccessManager *nm,
- const QGeoMapType &mapType,
- const QVector<TileProvider *> &providers,
+ QGeoTileProviderOsm(QNetworkAccessManager *nm, const QGeoMapType &mapType,
+ const QList<TileProvider *> &providers,
const QGeoCameraCapabilities &cameraCapabilities);
~QGeoTileProviderOsm();
@@ -181,7 +180,7 @@ protected:
/* Data members */
QNetworkAccessManager *m_nm;
- QVector<TileProvider *> m_providerList;
+ QList<TileProvider *> m_providerList;
TileProvider *m_provider;
int m_providerId;
QGeoMapType m_mapType;
diff --git a/src/plugins/position/serialnmea/qiopipe.cpp b/src/plugins/position/serialnmea/qiopipe.cpp
index fab0b56b..75cd923c 100644
--- a/src/plugins/position/serialnmea/qiopipe.cpp
+++ b/src/plugins/position/serialnmea/qiopipe.cpp
@@ -82,7 +82,7 @@ bool QIOPipePrivate::readAvailableData() {
void QIOPipePrivate::pumpData(const QByteArray &ba)
{
if (m_proxying) {
- QVector<int> toRemove;
+ QList<int> toRemove;
for (int i = 0; i < childPipes.size(); ++i) {
const QPointer<QIOPipe> &cp = childPipes.at(i);
if (!cp) {
diff --git a/src/plugins/position/serialnmea/qiopipe_p.h b/src/plugins/position/serialnmea/qiopipe_p.h
index 472ab102..66453e10 100644
--- a/src/plugins/position/serialnmea/qiopipe_p.h
+++ b/src/plugins/position/serialnmea/qiopipe_p.h
@@ -105,7 +105,7 @@ public:
bool m_proxying = false;
QPointer<QIODevice> source;
- QVector<QPointer<QIOPipe>> childPipes;
+ QList<QPointer<QIOPipe>> childPipes;
};
#endif // QIOPIPE_P_H
View Lorry Controller Status