make QtLocation work while Qt is compiled with namespace

Task-number: QTBUG-19972

22 files changed, 80 insertions, 16 deletions

diff --git a/src/plugins/geoservices/nokia/jsonparser.h b/src/plugins/geoservices/nokia/jsonparser.h
index 5ea0a690..d39f4771 100644
--- a/src/plugins/geoservices/nokia/jsonparser.h
+++ b/src/plugins/geoservices/nokia/jsonparser.h
@@ -53,6 +53,8 @@
 #include <QString>
 #include <QRegExp>
 
+QT_BEGIN_NAMESPACE
+
 class JSONParser
 {
 public:
@@ -238,4 +240,6 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #endif // JSONPARSER_H
diff --git a/src/plugins/geoservices/nokia/marclanguagecodes.h b/src/plugins/geoservices/nokia/marclanguagecodes.h
index 5f2accac..57bc57cd 100644
--- a/src/plugins/geoservices/nokia/marclanguagecodes.h
+++ b/src/plugins/geoservices/nokia/marclanguagecodes.h
@@ -53,6 +53,8 @@
 // http://www.loc.gov/marc/languages/language_code.html
 // Order matches QLocale::Language
 
+QT_BEGIN_NAMESPACE
+
 static const unsigned char marc_language_code_list[] =
     "\0\0\0" // Unused
     "\0\0\0" // C
@@ -271,5 +273,6 @@ static const unsigned char marc_language_code_list[] =
     "\0\0\0" // Shambala
     ;
 
+QT_END_NAMESPACE
 
 #endif /* MARCLANGUAGECODES_H_ */
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
index 900ee479..e4cc33d3 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
@@ -51,6 +51,8 @@
 #include <QXmlStreamReader>
 #include <QIODevice>
 
+QT_BEGIN_NAMESPACE
+
 QGeoCodeXmlParser::QGeoCodeXmlParser()
         : m_reader(0)
 {
@@ -574,3 +576,4 @@ bool QGeoCodeXmlParser::parseCoordinate(QGeoCoordinate *coordinate, const QStrin
     return true;
 }
 
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.h b/src/plugins/geoservices/nokia/qgeocodexmlparser.h
index c866d93f..d82965aa 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.h
@@ -53,15 +53,15 @@
 #include <QList>
 #include <QXmlStreamReader>
 
-class QIODevice;
 
 #include <qgeocoordinate.h>
 #include <qgeoboundingbox.h>
 #include <qgeoplace.h>
 #include <qgeoaddress.h>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QIODevice;
 class QGeoCodeXmlParser
 {
 public:
@@ -87,4 +87,6 @@ private:
     QString m_errorString;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
index 80b907c2..3bd6b708 100644
--- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
@@ -69,8 +69,12 @@
 #define DISK_CACHE_ENABLED 1
 #endif
 
+QT_BEGIN_NAMESPACE
+
 #if defined(Q_OS_SYMBIAN)
 #include <f32file.h>
+
+
 QChar QGeoMappingManagerEngineNokia::findFirstInternalFlashDrive()
 {
     QChar flashDrive;
@@ -300,3 +304,4 @@ QString QGeoMappingManagerEngineNokia::mapTypeToStr(QGraphicsGeoMap::MapType typ
         return "normal.day";
 }
 
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
index 89f145dc..70c6cfe1 100644
--- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
@@ -54,11 +54,11 @@
 #include <qgeoserviceprovider.h>
 #include <qgeotiledmappingmanagerengine.h>
 
+QT_BEGIN_NAMESPACE
+
 class QNetworkAccessManager;
 class QNetworkDiskCache;
 
-QTM_USE_NAMESPACE
-
 class QGeoMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine
 {
     Q_OBJECT
@@ -89,4 +89,6 @@ private:
     QString m_referer;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
index 30f583e3..1f11d72a 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
@@ -51,6 +51,8 @@
 #include <QNetworkCacheMetaData>
 #include <QDateTime>
 
+QT_BEGIN_NAMESPACE
+
 QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTiledMapRequest &request, QObject *parent)
         : QGeoTiledMapReply(request, parent),
         m_reply(reply)
@@ -135,3 +137,5 @@ void QGeoMapReplyNokia::networkError(QNetworkReply::NetworkError error)
     m_reply->deleteLater();
     m_reply = 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
index 6bc6e405..ee0195bb 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
@@ -52,7 +52,7 @@
 #include <qgeotiledmapreply.h>
 #include <QNetworkReply>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapReplyNokia : public QGeoTiledMapReply
 {
@@ -75,4 +75,6 @@ private:
     QNetworkReply *m_reply;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
index 1a61f878..c2ea29c5 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
@@ -51,6 +51,8 @@
 
 #include <qgeorouterequest.h>
 
+QT_BEGIN_NAMESPACE
+
 QGeoRouteReplyNokia::QGeoRouteReplyNokia(const QGeoRouteRequest &request, QNetworkReply *reply, QObject *parent)
         : QGeoRouteReply(request, parent),
         m_reply(reply)
@@ -120,3 +122,5 @@ void QGeoRouteReplyNokia::networkError(QNetworkReply::NetworkError error)
     m_reply->deleteLater();
     m_reply = 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
index 0fcd11a4..38b4e534 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
@@ -52,7 +52,7 @@
 #include <qgeoroutereply.h>
 #include <QNetworkReply>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRouteReplyNokia : public QGeoRouteReply
 {
@@ -71,4 +71,6 @@ private:
     QNetworkReply *m_reply;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
index ba6e5227..e8d2f328 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
@@ -53,6 +53,8 @@
 #include <QStringList>
 #include <QString>
 
+QT_BEGIN_NAMESPACE
+
 QGeoRouteXmlParser::QGeoRouteXmlParser(const QGeoRouteRequest &request)
         : m_request(request),
         m_reader(0)
@@ -558,3 +560,5 @@ bool QGeoRouteXmlParser::parseBoundingBox(QGeoBoundingBox &bounds)
 
     return false;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
index d6269358..02ef640b 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
@@ -54,8 +54,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 
-class QIODevice;
-
 #include <qgeoroute.h>
 #include <qgeoroutesegment.h>
 #include <qgeocoordinate.h>
@@ -63,7 +61,9 @@ class QIODevice;
 #include <qgeorouterequest.h>
 #include <qgeomaneuver.h>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
+class QIODevice;
+
 
 class QGeoManeuverContainer
 {
@@ -114,4 +114,5 @@ private:
     QList<QGeoRouteSegmentContainer> segments;
 };
 
+QT_END_NAMESPACE
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 4590f38b..f92e20ac 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -54,6 +54,8 @@
 #include <QUrl>
 #include <qgeoboundingbox.h>
 
+QT_BEGIN_NAMESPACE
+
 QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(const QMap<QString, QVariant> &parameters, QGeoServiceProvider::Error *error, QString *errorString)
         : QGeoRoutingManagerEngine(parameters),
         m_host("prd.lbsp.navteq.com"),
@@ -475,3 +477,5 @@ void QGeoRoutingManagerEngineNokia::routeError(QGeoRouteReply::Error error, cons
 
     emit this->error(reply, error, errorString);
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index f0e4a173..0dd17b0c 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -55,7 +55,7 @@
 #include <qgeoroutingmanagerengine.h>
 #include <QNetworkAccessManager>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine
 {
@@ -89,4 +89,6 @@ private:
     QString m_referer;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
index 388283be..91db792a 100644
--- a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
@@ -56,6 +56,8 @@
 #include <QUrl>
 #include <QMap>
 
+QT_BEGIN_NAMESPACE
+
 QGeoSearchManagerEngineNokia::QGeoSearchManagerEngineNokia(const QMap<QString, QVariant> &parameters, QGeoServiceProvider::Error *error, QString *errorString)
         : QGeoSearchManagerEngine(parameters),
         m_host("loc.desktop.maps.svc.ovi.com"),
@@ -315,3 +317,5 @@ QString QGeoSearchManagerEngineNokia::languageToMarc(QLocale::Language language)
 
     return code;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
index f0b112e1..0ca23e61 100644
--- a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
@@ -58,7 +58,7 @@
 #include <QLocale>
 
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSearchManagerEngineNokia : public QGeoSearchManagerEngine
 {
@@ -95,4 +95,6 @@ private:
     QString m_referer;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp
index fd43c5bc..c3f157c4 100644
--- a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp
@@ -49,6 +49,8 @@
 #include "qgeosearchreply_nokia.h"
 #include "qgeocodexmlparser.h"
 
+QT_BEGIN_NAMESPACE
+
 QGeoSearchReplyNokia::QGeoSearchReplyNokia(QNetworkReply *reply, int limit, int offset, QGeoBoundingArea *viewport, QObject *parent)
         : QGeoSearchReply(parent),
         m_reply(reply)
@@ -129,3 +131,5 @@ void QGeoSearchReplyNokia::networkError(QNetworkReply::NetworkError error)
     m_reply->deleteLater();
     m_reply = 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h
index f97ec55d..9c47dd6b 100644
--- a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h
@@ -52,7 +52,7 @@
 #include <qgeosearchreply.h>
 #include <QNetworkReply>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSearchReplyNokia : public QGeoSearchReply
 {
@@ -71,4 +71,6 @@ private:
     QNetworkReply *m_reply;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index 5b8e65d3..ae6d9a1a 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -55,6 +55,8 @@
 #include <QtPlugin>
 #include <QNetworkProxy>
 
+QT_BEGIN_NAMESPACE
+
 QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia() {}
 
 QGeoServiceProviderFactoryNokia::~QGeoServiceProviderFactoryNokia() {}
@@ -94,3 +96,5 @@ const QString QGeoServiceProviderFactoryNokia::defaultToken("152022572f0e44e0748
 const QString QGeoServiceProviderFactoryNokia::defaultReferer("qtlocationapi");
 
 Q_EXPORT_PLUGIN2(qtgeoservices_nokia, QGeoServiceProviderFactoryNokia)
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
index c0117302..0013f40d 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
@@ -52,7 +52,7 @@
 #include <qgeoserviceproviderfactory.h>
 #include <QObject>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoServiceProviderFactoryNokia : public QObject, public QGeoServiceProviderFactory
 {
@@ -79,4 +79,6 @@ public:
     static const QString defaultReferer;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
index 9a3d06be..72918f25 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
@@ -55,7 +55,7 @@
 #include <QNetworkAccessManager>
 #include <QNetworkProxy>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
  Constructs a new tiled map data object, which stores the map data required by
@@ -185,7 +185,7 @@ QString QGeoTiledMapDataNokia::getViewCopyright()
 /*!
  \reimp
  */
-void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem *option)
+void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/)
 {
     QRect viewport = painter->combinedTransform().inverted().mapRect(painter->viewport());
 
@@ -234,3 +234,5 @@ void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyle
         lastCopyright
     );
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
index 38d6004f..8fd01c00 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
@@ -52,7 +52,7 @@
 #include <QPixmap>
 #include <QNetworkReply>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMappingManagerEngineNokia;
 
@@ -92,4 +92,6 @@ private slots:
     void copyrightReplyFinished(QNetworkReply*);
 };
 
+QT_END_NAMESPACE
+
 #endif // QGEOMAPDATA_NOKIA_H