Remove use of QT_{BEGIN,END}_HEADER macros.

These macros were removed from Qt Core and they are no longer defined
causing Qt Location to fail to build.

Change-Id: Ibed30daa1a802957cebe95a577dfe86f0f643970
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>

22 files changed, 0 insertions, 108 deletions

diff --git a/src/location/maps/qcache3q_p.h b/src/location/maps/qcache3q_p.h
index d41223ee..5a2d1899 100644
--- a/src/location/maps/qcache3q_p.h
+++ b/src/location/maps/qcache3q_p.h
@@ -58,8 +58,6 @@
 #include <QtCore/qsharedpointer.h>
 #include <QDebug>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template <class Key, class T>
@@ -475,6 +473,4 @@ inline QSharedPointer<T> QCache3Q<Key,T,EvPolicy>::operator[](const Key &key) co
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QCACHE3Q_H
diff --git a/src/location/maps/qdoublevector2d_p.h b/src/location/maps/qdoublevector2d_p.h
index b5bbe521..f66a95a2 100644
--- a/src/location/maps/qdoublevector2d_p.h
+++ b/src/location/maps/qdoublevector2d_p.h
@@ -57,8 +57,6 @@
 
 #include <QtCore/qmetatype.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDoubleVector3D;
@@ -235,6 +233,4 @@ QDataStream &operator>>(QDataStream &, QDoubleVector2D &);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qdoublevector3d_p.h b/src/location/maps/qdoublevector3d_p.h
index c33c57ec..e237287d 100644
--- a/src/location/maps/qdoublevector3d_p.h
+++ b/src/location/maps/qdoublevector3d_p.h
@@ -57,8 +57,6 @@
 
 #include <QtCore/qmetatype.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDoubleVector2D;
@@ -289,6 +287,4 @@ QDataStream &operator>>(QDataStream &, QDoubleVector3D &);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index fb33a144..9d492a0e 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -46,8 +46,6 @@
 #include <QtCore/QList>
 #include <QtLocation/QGeoLocation>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoShape;
@@ -107,6 +105,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index dfd80b96..94b2d50a 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -49,12 +49,8 @@
 #include <QList>
 #include <QMap>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QLocale;
 
 class QGeocodingManagerEngine;
@@ -98,6 +94,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index d4ce005a..5b727b48 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -46,8 +46,6 @@
 #include <QtLocation/qlocationglobal.h>
 #include <QtLocation/QGeocodeReply>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoAddress;
@@ -93,6 +91,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index 88efe7ac..75cabe94 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -45,12 +45,8 @@
 #include <qshareddata.h>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QString;
 
 class QGeoCoordinate;
@@ -110,6 +106,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h
index 9a68ad56..fd1a8ae6 100644
--- a/src/location/maps/qgeomappingmanager_p.h
+++ b/src/location/maps/qgeomappingmanager_p.h
@@ -59,8 +59,6 @@
 #include <QtLocation/qlocationglobal.h>
 #include "qgeomaptype_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoMap;
@@ -110,6 +108,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h
index 458f26b3..903ac14b 100644
--- a/src/location/maps/qgeomappingmanagerengine_p.h
+++ b/src/location/maps/qgeomappingmanagerengine_p.h
@@ -65,12 +65,8 @@
 #include "qgeomaptype_p.h"
 #include "qgeomappingmanager_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QLocale;
 
 class QGeoRectangle;
@@ -129,6 +125,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeomaptype_p.h b/src/location/maps/qgeomaptype_p.h
index f39b4d02..99e5baf0 100644
--- a/src/location/maps/qgeomaptype_p.h
+++ b/src/location/maps/qgeomaptype_p.h
@@ -57,8 +57,6 @@
 #include <QString>
 #include <QSharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoMapTypePrivate;
@@ -101,6 +99,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QGEOMAPTYPE_H
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index 21e0d987..0eb163f9 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -49,12 +49,8 @@
 #include <QList>
 #include <QHash>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoRectangle;
 class QGeoRouteSegment;
 
@@ -102,6 +98,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index d3a40290..dc22b0a2 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -47,12 +47,8 @@
 #include <QList>
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoRouteRequest;
 class QGeoRouteReplyPrivate;
 
@@ -100,6 +96,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index 0e10463b..16793130 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -48,12 +48,8 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoCoordinate;
 class QGeoRectangle;
 class QGeoRouteRequestPrivate;
@@ -167,6 +163,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::ManeuverDetails)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h
index 7e167ed1..a2af9dbe 100644
--- a/src/location/maps/qgeoroutesegment.h
+++ b/src/location/maps/qgeoroutesegment.h
@@ -46,12 +46,8 @@
 #include <QList>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoCoordinate;
 class QGeoManeuver;
 class QGeoRouteSegmentPrivate;
@@ -95,6 +91,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index a8c04da2..d9ff6816 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -48,12 +48,8 @@
 #include <QObject>
 #include <QMap>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QLocale;
 
 class QGeoRoutingManagerEngine;
@@ -97,6 +93,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 29b15568..fa05b984 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -48,12 +48,8 @@
 #include <QObject>
 #include <QMap>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QLocale;
 
 class QGeoRoutingManagerEnginePrivate;
@@ -106,6 +102,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index 8d7bcf53..155aa196 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -47,8 +47,6 @@
 #include <QtCore/QObject>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QLocale;
@@ -167,6 +165,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoServiceProvider::PlacesFeatures)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index 7f4b9ca5..924e5f28 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -48,8 +48,6 @@
 #include <QMap>
 #include <QString>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoServiceProviderFactory
@@ -76,6 +74,4 @@ Q_DECLARE_INTERFACE(QGeoServiceProviderFactory,
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index 244ca3b7..22e8b867 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -56,8 +56,6 @@
 #include "qgeomaptype_p.h"
 #include "qgeomappingmanagerengine_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoTiledMappingManagerEnginePrivate;
@@ -130,6 +128,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoTiledMappingManagerEngine::CacheAreas)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeotiledmapreply_p.h b/src/location/maps/qgeotiledmapreply_p.h
index 55e0e6d6..1bf8727d 100644
--- a/src/location/maps/qgeotiledmapreply_p.h
+++ b/src/location/maps/qgeotiledmapreply_p.h
@@ -57,12 +57,8 @@
 
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoTileSpec;
 class QGeoTiledMapReplyPrivate;
 
@@ -115,6 +111,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index 4177f2fa..45e38e05 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -58,8 +58,6 @@
 #include "qgeomaptype_p.h"
 #include "qgeotiledmappingmanagerengine_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoMapRequestOptions;
@@ -110,6 +108,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeotilespec_p.h b/src/location/maps/qgeotilespec_p.h
index 212443c5..ae2db7b6 100644
--- a/src/location/maps/qgeotilespec_p.h
+++ b/src/location/maps/qgeotilespec_p.h
@@ -59,8 +59,6 @@
 
 #include <QSharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoTileSpecPrivate;
@@ -104,6 +102,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoTileSpec)
 
-QT_END_HEADER
-
 #endif // QGEOTILESPEC_H