diff options
Diffstat (limited to 'src/plugins/geoservices/nokia')
28 files changed, 74 insertions, 74 deletions
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp b/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp index 2bd6a095..7d7a7b8a 100644 --- a/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp +++ b/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp @@ -131,7 +131,7 @@ void QPlaceContentReplyImplV1::resultReady(const QPlaceJSonParser::Error &errorI { if (errorId == QPlaceJSonParser::NoError) { if (request().contentType() == QPlaceContent::ImageType) { - QPlaceJSonMediaParser * mediaParser = qobject_cast<QPlaceJSonMediaParser*>(parser); + QPlaceJSonMediaParser * mediaParser = qobject_cast<QPlaceJSonMediaParser *>(parser); QList<QPlaceImage> imageOjects = mediaParser->resultMedia(); QPlaceContent::Collection collection; for (int i=0; i < imageOjects.count(); ++i) @@ -139,7 +139,7 @@ void QPlaceContentReplyImplV1::resultReady(const QPlaceJSonParser::Error &errorI setContent(collection); setTotalCount(mediaParser->allMediaCount()); } else if (request().contentType() == QPlaceContent::ReviewType) { - QPlaceJSonReviewParser *reviewParser = qobject_cast<QPlaceJSonReviewParser*>(parser); + QPlaceJSonReviewParser *reviewParser = qobject_cast<QPlaceJSonReviewParser *>(parser); QList<QPlaceReview> reviewObjects = reviewParser->results(); QPlaceContent::Collection collection; for (int i=0; i < reviewObjects.count(); ++i) diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp b/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp index 7269b788..009a0749 100644 --- a/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp +++ b/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp @@ -700,7 +700,7 @@ void QPlaceJSonDetailsParser::processPremiumContentMediaObjects(const QJSValue & int insertionIndex = 0; if (!images.keys().isEmpty()) insertionIndex = images.keys().last() + 1; - images.insert(insertionIndex,*obj); + images.insert(insertionIndex, *obj); targetPlace->setContent(QPlaceContent::ImageType, images); delete obj; } @@ -822,7 +822,7 @@ void QPlaceJSonDetailsParser::processAdContentMediaObjects(const QJSValue &conte if (it.name() != "length") { QPlaceImage *obj = processAdContentMediaObject(it.value()); if (obj) { - images.insert(insertionIndex,*obj); + images.insert(insertionIndex, *obj); insertionIndex++; delete obj; } diff --git a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp index fb44d15c..258c1505 100644 --- a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp +++ b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp @@ -116,7 +116,7 @@ QPlaceRestManager *QPlaceRestManager::instance() /*! Sets the network access manager used for requests. */ -void QPlaceRestManager::setNetworkAccessManager(QGeoNetworkAccessManager* manager) +void QPlaceRestManager::setNetworkAccessManager(QGeoNetworkAccessManager *manager) { if (manager) { delete mManager; diff --git a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h index bea2bee4..90eb3521 100644 --- a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h +++ b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h @@ -68,7 +68,7 @@ class QPlaceRestManager : public QObject public: static QPlaceRestManager *instance(); - void setNetworkAccessManager(QGeoNetworkAccessManager* networkManager); + void setNetworkAccessManager(QGeoNetworkAccessManager *networkManager); QPlaceRestReply *sendPlaceRequest(const QString &placeId); QPlaceRestReply *sendPlaceImagesRequest(const QString &placeId, const QPlaceContentRequest ¶ms); diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp index 282809ff..6b06fef0 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp @@ -64,7 +64,7 @@ QGeoCodeXmlParser::~QGeoCodeXmlParser() delete m_reader; } -bool QGeoCodeXmlParser::parse(QIODevice* source) +bool QGeoCodeXmlParser::parse(QIODevice *source) { if (m_reader) delete m_reader; diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.h b/src/plugins/geoservices/nokia/qgeocodexmlparser.h index fffbecda..120c80a8 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.h +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.h @@ -68,7 +68,7 @@ public: QGeoCodeXmlParser(); ~QGeoCodeXmlParser(); - bool parse(QIODevice* source); + bool parse(QIODevice *source); QList<QGeoLocation> results() const; QString errorString() const; diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp index a8488ac6..c37cadf9 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE QGeocodingManagerEngineNokia::QGeocodingManagerEngineNokia( - QGeoNetworkAccessManager* networkManager, + QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) @@ -116,7 +116,7 @@ QString QGeocodingManagerEngineNokia::getAuthenticationString() const } -QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address, +QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address, const QGeoBoundingArea &bounds) { QString requestString = "http://"; @@ -185,7 +185,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address, return geocode(requestString, bounds); } -QGeocodeReply* QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate &coordinate, +QGeocodeReply *QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate &coordinate, const QGeoBoundingArea &bounds) { QString requestString = "http://"; @@ -205,7 +205,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate return geocode(requestString, bounds); } -QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QString &address, +QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QString &address, int limit, int offset, const QGeoBoundingArea &bounds) @@ -235,7 +235,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QString &address, return geocode(requestString, bounds, limit, offset); } -QGeocodeReply* QGeocodingManagerEngineNokia::geocode(QString requestString, +QGeocodeReply *QGeocodingManagerEngineNokia::geocode(QString requestString, const QGeoBoundingArea &bounds, int limit, int offset) @@ -270,7 +270,7 @@ QString QGeocodingManagerEngineNokia::trimDouble(double degree, int decimalDigit void QGeocodingManagerEngineNokia::placesFinished() { - QGeocodeReply *reply = qobject_cast<QGeocodeReply*>(sender()); + QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender()); if (!reply) return; @@ -285,12 +285,12 @@ void QGeocodingManagerEngineNokia::placesFinished() void QGeocodingManagerEngineNokia::placesError(QGeocodeReply::Error error, const QString &errorString) { - QGeocodeReply *reply = qobject_cast<QGeocodeReply*>(sender()); + QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender()); if (!reply) return; - if (receivers(SIGNAL(error(QGeocodeReply*, QGeocodeReply::Error, QString))) == 0) { + if (receivers(SIGNAL(error(QGeocodeReply *, QGeocodeReply::Error, QString))) == 0) { reply->deleteLater(); return; } diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h index 4bcf0479..d021191d 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h @@ -66,18 +66,18 @@ class QGeocodingManagerEngineNokia : public QGeocodingManagerEngine { Q_OBJECT public: - QGeocodingManagerEngineNokia(QGeoNetworkAccessManager* networkManager, + QGeocodingManagerEngineNokia(QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeocodingManagerEngineNokia(); - QGeocodeReply* geocode(const QGeoAddress &address, + QGeocodeReply *geocode(const QGeoAddress &address, const QGeoBoundingArea &bounds); - QGeocodeReply* reverseGeocode(const QGeoCoordinate &coordinate, + QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate, const QGeoBoundingArea &bounds); - QGeocodeReply* geocode(const QString &searchString, + QGeocodeReply *geocode(const QString &searchString, int limit, int offset, const QGeoBoundingArea &bounds); @@ -88,7 +88,7 @@ private Q_SLOTS: private: static QString trimDouble(double degree, int decimalDigits = 10); - QGeocodeReply* geocode(QString requestString, const QGeoBoundingArea &bounds, int limit = -1, int offset = 0); + QGeocodeReply *geocode(QString requestString, const QGeoBoundingArea &bounds, int limit = -1, int offset = 0); QString languageToMarc(QLocale::Language language); QString getAuthenticationString() const; diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp index 118a2d24..b9b0bbf9 100644 --- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp +++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp @@ -89,7 +89,7 @@ void QGeoIntrinsicNetworkAccessManager::configure(const QMap<QString, QVariant> } } -QNetworkReply* QGeoIntrinsicNetworkAccessManager::get(const QNetworkRequest& request) +QNetworkReply *QGeoIntrinsicNetworkAccessManager::get(const QNetworkRequest &request) { return m_networkManager->get(request); } diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h index c1b85c9d..267b7f2e 100644 --- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h +++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h @@ -56,14 +56,14 @@ public: explicit QGeoIntrinsicNetworkAccessManager(QObject *parent = 0); QGeoIntrinsicNetworkAccessManager(const QMap<QString, QVariant> ¶meters, const QString &token = QString(), QObject *parent = 0); - virtual QNetworkReply* get(const QNetworkRequest& request); + virtual QNetworkReply *get(const QNetworkRequest &request); virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data); private: void configure(const QMap<QString, QVariant> ¶meters); const QString m_customProxyToken; - QNetworkAccessManager* m_networkManager; + QNetworkAccessManager *m_networkManager; }; QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp index b249a194..60a18c3c 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp @@ -78,7 +78,7 @@ QGeoMapReplyNokia::~QGeoMapReplyNokia() { } -QNetworkReply* QGeoMapReplyNokia::networkReply() const +QNetworkReply *QGeoMapReplyNokia::networkReply() const { return m_reply; } diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h index bf5f9384..70fd8570 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h @@ -65,7 +65,7 @@ public: void abort(); - QNetworkReply* networkReply() const; + QNetworkReply *networkReply() const; private Q_SLOTS: void replyDestroyed(); diff --git a/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h index 73a4c208..8bc7ecb1 100644 --- a/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h +++ b/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h @@ -55,11 +55,11 @@ class QGeoNetworkAccessManager : public QObject Q_OBJECT public: virtual ~QGeoNetworkAccessManager() {} - virtual QNetworkReply* get(const QNetworkRequest& request) = 0; + virtual QNetworkReply *get(const QNetworkRequest &request) = 0; virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data) = 0; protected: - QGeoNetworkAccessManager(QObject* parent) : QObject(parent) {} + QGeoNetworkAccessManager(QObject *parent) : QObject(parent) {} }; QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index 9eabc593..7c98ea79 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -74,7 +74,7 @@ QGeoRouteXmlParser::~QGeoRouteXmlParser() delete m_reader; } -bool QGeoRouteXmlParser::parse(QIODevice* source) +bool QGeoRouteXmlParser::parse(QIODevice *source) { if (m_reader) delete m_reader; @@ -522,7 +522,7 @@ bool QGeoRouteXmlParser::parseLink() return true; } -bool QGeoRouteXmlParser::parseGeoPoints(const QString& strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName) +bool QGeoRouteXmlParser::parseGeoPoints(const QString &strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName) { QStringList rawPoints = strPoints.split(' '); diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h index c798b233..ee659192 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h @@ -99,7 +99,7 @@ public: QGeoRouteXmlParser(const QGeoRouteRequest &request); ~QGeoRouteXmlParser(); - bool parse(QIODevice* source); + bool parse(QIODevice *source); QList<QGeoRoute> results() const; QString errorString() const; @@ -110,7 +110,7 @@ private: bool parseCoordinates(QGeoCoordinate &coord); bool parseMode(QGeoRoute *route); bool parseSummary(QGeoRoute *route); - bool parseGeoPoints(const QString& strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName); + bool parseGeoPoints(const QString &strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName); bool parseLeg(); bool parseManeuver(); bool parseLink(); diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index 8fa7d33a..f4295f57 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia( - QGeoNetworkAccessManager* networkManager, + QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) @@ -124,7 +124,7 @@ QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia( QGeoRoutingManagerEngineNokia::~QGeoRoutingManagerEngineNokia() {} -QGeoRouteReply* QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteRequest& request) +QGeoRouteReply *QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteRequest &request) { QString reqString = calculateRouteRequestString(request); @@ -150,7 +150,7 @@ QGeoRouteReply* QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteReq return reply; } -QGeoRouteReply* QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position) +QGeoRouteReply *QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position) { QString reqString = updateRouteRequestString(route, position); @@ -453,7 +453,7 @@ QString QGeoRoutingManagerEngineNokia::trimDouble(double degree, int decimalDigi void QGeoRoutingManagerEngineNokia::routeFinished() { - QGeoRouteReply *reply = qobject_cast<QGeoRouteReply*>(sender()); + QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender()); if (!reply) return; @@ -468,7 +468,7 @@ void QGeoRoutingManagerEngineNokia::routeFinished() void QGeoRoutingManagerEngineNokia::routeError(QGeoRouteReply::Error error, const QString &errorString) { - QGeoRouteReply *reply = qobject_cast<QGeoRouteReply*>(sender()); + QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender()); if (!reply) return; diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h index 8e9b9ef9..f5bb9541 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h @@ -62,14 +62,14 @@ class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine { Q_OBJECT public: - QGeoRoutingManagerEngineNokia(QGeoNetworkAccessManager* networkInterface, + QGeoRoutingManagerEngineNokia(QGeoNetworkAccessManager *networkInterface, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeoRoutingManagerEngineNokia(); - QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request); - QGeoRouteReply* updateRoute(const QGeoRoute &route, const QGeoCoordinate &position); + QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request); + QGeoRouteReply *updateRoute(const QGeoRoute &route, const QGeoCoordinate &position); private Q_SLOTS: void routeFinished(); diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp index 2f2a4dc4..d031d1cd 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp @@ -80,7 +80,7 @@ static bool isValidParameter(const QString ¶m) static QGeoNetworkAccessManager *tryGetNetworkAccessManager(const QVariantMap ¶meters) { - return static_cast<QGeoNetworkAccessManager*>(qvariant_cast<void*>(parameters.value(QStringLiteral("nam")))); + return static_cast<QGeoNetworkAccessManager *>(qvariant_cast<void *>(parameters.value(QStringLiteral("nam")))); } QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia() @@ -89,42 +89,42 @@ QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia() QGeoServiceProviderFactoryNokia::~QGeoServiceProviderFactoryNokia() {} -QGeocodingManagerEngine* QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine( +QGeocodingManagerEngine *QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine( const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { informOnceAboutUsageTermsIfNecessary(parameters); - QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters); + QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters); if (!networkManager) networkManager = new QGeoIntrinsicNetworkAccessManager(parameters); return new QGeocodingManagerEngineNokia(networkManager, parameters, error, errorString); } -QGeoMappingManagerEngine* QGeoServiceProviderFactoryNokia::createMappingManagerEngine( +QGeoMappingManagerEngine *QGeoServiceProviderFactoryNokia::createMappingManagerEngine( const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { informOnceAboutUsageTermsIfNecessary(parameters); - QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters); + QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters); if (!networkManager) networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("mapping.proxy")); return new QGeoTiledMappingManagerEngineNokia(networkManager, parameters, error, errorString); } -QGeoRoutingManagerEngine* QGeoServiceProviderFactoryNokia::createRoutingManagerEngine( +QGeoRoutingManagerEngine *QGeoServiceProviderFactoryNokia::createRoutingManagerEngine( const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { informOnceAboutUsageTermsIfNecessary(parameters); - QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters); + QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters); if (!networkManager) networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("routing.proxy")); @@ -138,7 +138,7 @@ QPlaceManagerEngine *QGeoServiceProviderFactoryNokia::createPlaceManagerEngine( { informOnceAboutUsageTermsIfNecessary(parameters); - QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters); + QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters); if (!networkManager) networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("places.proxy")); diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h index ed9ad35c..917117de 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h @@ -67,13 +67,13 @@ public: QGeoServiceProviderFactoryNokia(); ~QGeoServiceProviderFactoryNokia(); - QGeocodingManagerEngine* createGeocodingManagerEngine(const QVariantMap ¶meters, + QGeocodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; - QGeoMappingManagerEngine* createMappingManagerEngine(const QVariantMap ¶meters, + QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; - QGeoRoutingManagerEngine* createRoutingManagerEngine(const QVariantMap ¶meters, + QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp index a436315b..e71d4378 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp @@ -80,7 +80,7 @@ void QGeoTiledMapDataNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visible const int shadowWidth = 2; const int fontSize = 10; - QGeoTiledMappingManagerEngineNokia *engineNokia = static_cast<QGeoTiledMappingManagerEngineNokia*>(engine()); + QGeoTiledMappingManagerEngineNokia *engineNokia = static_cast<QGeoTiledMappingManagerEngineNokia *>(engine()); QString copyrightsString = engineNokia->evaluateCopyrightsText(activeMapType().style(), mapController()->zoom(), visibleTiles); if (width() > 0 && height() > 0 && (lastCopyrightsString.isNull() || copyrightsString != lastCopyrightsString)) { diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index 76305e57..15c67ded 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( - QGeoNetworkAccessManager* networkManager, + QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) @@ -110,7 +110,7 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( if (parameters.contains(QLatin1String("mapping.cache.directory"))) cacheDir = parameters.value(QLatin1String("mapping.cache.directory")).toString(); - QGeoTileCache* tileCache = createTileCacheWithDir(cacheDir); + QGeoTileCache *tileCache = createTileCacheWithDir(cacheDir); if (parameters.contains(QLatin1String("mapping.cache.disk.size"))) { bool ok = false; diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h index 91171e03..92b634cd 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h @@ -70,13 +70,13 @@ class QGeoTiledMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine Q_OBJECT public: - QGeoTiledMappingManagerEngineNokia(QGeoNetworkAccessManager* networkManager, + QGeoTiledMappingManagerEngineNokia(QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeoTiledMappingManagerEngineNokia(); - virtual QGeoMapData* createMapData(); + virtual QGeoMapData *createMapData(); QString evaluateCopyrightsText(const QGeoMapType::MapStyle mapStyle, const int zoomLevel, const QSet<QGeoTileSpec> &tiles); diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp index c8ff5ad6..c33000c3 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp @@ -66,13 +66,13 @@ QT_BEGIN_NAMESPACE -const char* MAPTILES_HOST = "1-4.maptile.lbs.ovi.com"; -const char* MAPTILES_HOST_CN = "a-k.maptile.maps.svc.nokia.com.cn"; +const char *MAPTILES_HOST = "1-4.maptile.lbs.ovi.com"; +const char *MAPTILES_HOST_CN = "a-k.maptile.maps.svc.nokia.com.cn"; -QGeoTileFetcherNokia::QGeoTileFetcherNokia(QGeoNetworkAccessManager* networkManager, +QGeoTileFetcherNokia::QGeoTileFetcherNokia(QGeoNetworkAccessManager *networkManager, QGeoTiledMappingManagerEngine *engine) : QGeoTileFetcher(engine), - m_engineNokia(static_cast<QGeoTiledMappingManagerEngineNokia*>(engine)), + m_engineNokia(static_cast<QGeoTiledMappingManagerEngineNokia *>(engine)), m_networkManager(networkManager), m_firstSubdomain(QChar::Null), m_copyrightsReply(0), @@ -120,7 +120,7 @@ bool QGeoTileFetcherNokia::init() return true; } -QGeoTiledMapReply* QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec) +QGeoTiledMapReply *QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec) { // TODO add error detection for if request.connectivityMode() != QGraphicsGeoMap::OnlineMode QString rawRequest = getRequestString(spec); @@ -128,9 +128,9 @@ QGeoTiledMapReply* QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec) QNetworkRequest netRequest((QUrl(rawRequest))); // The extra pair of parens disambiguates this from a function declaration netRequest.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); - QNetworkReply* netReply = m_networkManager->get(netRequest); + QNetworkReply *netReply = m_networkManager->get(netRequest); - QGeoTiledMapReply* mapReply = new QGeoMapReplyNokia(netReply, spec); + QGeoTiledMapReply *mapReply = new QGeoMapReplyNokia(netReply, spec); return mapReply; } diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h index 3280e870..6a51e8de 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h @@ -74,18 +74,18 @@ class QGeoTileFetcherNokia : public QGeoTileFetcher Q_OBJECT public: - QGeoTileFetcherNokia(QGeoNetworkAccessManager* networkManager, QGeoTiledMappingManagerEngine *engine); + QGeoTileFetcherNokia(QGeoNetworkAccessManager *networkManager, QGeoTiledMappingManagerEngine *engine); ~QGeoTileFetcherNokia(); bool init(); - QGeoTiledMapReply* getTileImage(const QGeoTileSpec &spec); + QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec); - const QString& host() const; + const QString &host() const; QChar firstSubdomain() const; unsigned char maxSubdomains() const; - const QString& token() const; - const QString& applicationId() const; + const QString &token() const; + const QString &applicationId() const; void setParams(const QMap<QString, QVariant> ¶meters); void setTileSize(QSize tileSize); @@ -96,7 +96,7 @@ public Q_SLOTS: #ifdef USE_CHINA_NETWORK_REGISTRATION private Q_SLOTS: - void currentMobileCountryCodeChanged(int interface, const QString& mcc); + void currentMobileCountryCodeChanged(int interface, const QString &mcc); #endif private: @@ -107,7 +107,7 @@ private: static QString sizeToStr(const QSize &size); static QString mapIdToStr(int mapId); - void setHost(const QString& host); + void setHost(const QString &host); QGeoTiledMappingManagerEngineNokia *m_engineNokia; QGeoNetworkAccessManager *m_networkManager; diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp index 97a1340e..19d6d94b 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp @@ -64,7 +64,7 @@ QT_USE_NAMESPACE QPlaceManagerEngineNokiaV1::QPlaceManagerEngineNokiaV1( - QGeoNetworkAccessManager* networkManager, + QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h index dff8adb7..45a11859 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h @@ -64,7 +64,7 @@ class QPlaceManagerEngineNokiaV1 : public QPlaceManagerEngine Q_OBJECT public: - QPlaceManagerEngineNokiaV1(QGeoNetworkAccessManager* networkManager, + QPlaceManagerEngineNokiaV1(QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString); diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index 25a12ff7..6a465441 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -93,7 +93,7 @@ static const char * const placesServerInternational = "http://api.places.lbs.map static const char * const placesServerChina = "http://api.places.lbs.maps.nokia.com.cn/places"; QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2( - QGeoNetworkAccessManager* networkManager, + QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h index 3ed4af61..60539aa5 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h @@ -77,7 +77,7 @@ class QPlaceManagerEngineNokiaV2 : public QPlaceManagerEngine Q_OBJECT public: - QPlaceManagerEngineNokiaV2(QGeoNetworkAccessManager* networkManager, + QPlaceManagerEngineNokiaV2(QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString); |