Fixed -qtnamespace compilation issues.

Forward declaration of classes should come after QT_BEGIN_NAMESPACE, if
the declared classes are expected to be inside the qtnamespace.

Change-Id: I68884ec6f6f08ead6a125f3bc099a342ac62c78a
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

9 files changed, 18 insertions, 19 deletions

diff --git a/src/imports/location/qdeclarativepositionsource_p.h b/src/imports/location/qdeclarativepositionsource_p.h
index 26b7ecda..f7619ab2 100644
--- a/src/imports/location/qdeclarativepositionsource_p.h
+++ b/src/imports/location/qdeclarativepositionsource_p.h
@@ -49,10 +49,10 @@
 #include <QtQml/qqml.h>
 #include "qdeclarativeposition_p.h"
 
-class QFile;
-
 QT_BEGIN_NAMESPACE
 
+class QFile;
+
 class QDeclarativePositionSource : public QObject
 {
     Q_OBJECT
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h
index 8d986d20..93187073 100644
--- a/src/location/maps/qgeomappingmanagerengine_p.h
+++ b/src/location/maps/qgeomappingmanagerengine_p.h
@@ -63,11 +63,11 @@
 #include "qgeomappingmanager.h"
 #include "qgeocameracapabilities_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class QGeoTileSpec;
 class QGeoTiledMapReply;
 
-QT_BEGIN_NAMESPACE
-
 class QGeoMappingManagerEnginePrivate
 {
 public:
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index 23eba010..b50e15a1 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -63,13 +63,13 @@
 #include <QHash>
 #include "qgeomaptype.h"
 
+QT_BEGIN_NAMESPACE
+
 class QGeoTileSpec;
 class QGeoTiledMapReply;
 class QGeoTileCache;
 class QGeoTiledMappingManagerEngine;
 
-QT_BEGIN_NAMESPACE
-
 class QGeoTileFetcherPrivate
 {
 public:
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsoncategoriesparser.h b/src/plugins/geoservices/nokia/placesv1/qplacejsoncategoriesparser.h
index f4fb500a..4233064c 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacejsoncategoriesparser.h
+++ b/src/plugins/geoservices/nokia/placesv1/qplacejsoncategoriesparser.h
@@ -56,11 +56,11 @@
 #include <qplacecategory.h>
 #include "qplacejsonparser_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class QJSEngine;
 class QJSValue;
 
-QT_BEGIN_NAMESPACE
-
 struct PlaceCategoryNode
 {
 public:
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsonmediaparser.h b/src/plugins/geoservices/nokia/placesv1/qplacejsonmediaparser.h
index 5501fc90..4fd4e233 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacejsonmediaparser.h
+++ b/src/plugins/geoservices/nokia/placesv1/qplacejsonmediaparser.h
@@ -55,11 +55,11 @@
 #include <qplaceimage.h>
 #include "qplacejsonparser_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class QJSEngine;
 class QJSValue;
 
-QT_BEGIN_NAMESPACE
-
 class QPlaceJSonMediaParser : public QPlaceJSonParser
 {
     Q_OBJECT
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsonrecommendationparser.h b/src/plugins/geoservices/nokia/placesv1/qplacejsonrecommendationparser.h
index 5ff02518..a2c90f94 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacejsonrecommendationparser.h
+++ b/src/plugins/geoservices/nokia/placesv1/qplacejsonrecommendationparser.h
@@ -55,11 +55,10 @@
 #include <qplacesearchresult.h>
 #include "qplacejsonparser_p.h"
 
-class QJSEngine;
-class QJSValue;
-
 QT_BEGIN_NAMESPACE
 
+class QJSEngine;
+class QJSValue;
 class QPlaceManager;
 
 class QPlaceJSonRecommendationParser : public QPlaceJSonParser
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsonreviewparser.h b/src/plugins/geoservices/nokia/placesv1/qplacejsonreviewparser.h
index da8b7dc2..4d3cbf7c 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacejsonreviewparser.h
+++ b/src/plugins/geoservices/nokia/placesv1/qplacejsonreviewparser.h
@@ -55,10 +55,10 @@
 #include <qplacesearchresult.h>
 #include "qplacejsonparser_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class QJSEngine;
 class QJSValue;
-
-QT_BEGIN_NAMESPACE
 class QPlaceManager;
 
 class QPlaceJSonReviewParser : public QPlaceJSonParser
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsonsearchparser.h b/src/plugins/geoservices/nokia/placesv1/qplacejsonsearchparser.h
index fb673315..2c4ec9e4 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacejsonsearchparser.h
+++ b/src/plugins/geoservices/nokia/placesv1/qplacejsonsearchparser.h
@@ -57,11 +57,11 @@
 
 #include "qplacejsonparser_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class QJSEngine;
 class QJSValue;
 
-QT_BEGIN_NAMESPACE
-
 class QPlaceJSonSearchParser : public QPlaceJSonParser
 {
     Q_OBJECT
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsontextpredictionparser.h b/src/plugins/geoservices/nokia/placesv1/qplacejsontextpredictionparser.h
index 7969752e..af4320d7 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacejsontextpredictionparser.h
+++ b/src/plugins/geoservices/nokia/placesv1/qplacejsontextpredictionparser.h
@@ -54,10 +54,10 @@
 
 #include "qplacejsonparser_p.h"
 
-class QJSEngine;
-
 QT_BEGIN_NAMESPACE
 
+class QJSEngine;
+
 class QPlaceJSonTextPredictionParser : public QPlaceJSonParser
 {
     Q_OBJECT