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>

27 files changed, 0 insertions, 130 deletions

diff --git a/src/location/places/placemacro.h b/src/location/places/placemacro.h
index a90931f3..530f6200 100644
--- a/src/location/places/placemacro.h
+++ b/src/location/places/placemacro.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/QtGlobal>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #define Q_DECLARE_D_FUNC(Class) \
@@ -75,6 +73,4 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h
index 8f2652f2..54e73a9e 100644
--- a/src/location/places/qplace.h
+++ b/src/location/places/qplace.h
@@ -54,12 +54,8 @@
 #include <QtLocation/QPlaceAttribute>
 #include <QtLocation/QPlaceContactDetail>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QString;
 class QPlaceIcon;
 class QPlacePrivate;
@@ -141,6 +137,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlace)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h
index 51184b2e..6ac81642 100644
--- a/src/location/places/qplaceattribute.h
+++ b/src/location/places/qplaceattribute.h
@@ -48,12 +48,8 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceAttributePrivate;
 class Q_LOCATION_EXPORT QPlaceAttribute
 {
@@ -85,8 +81,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 Q_DECLARE_METATYPE(QPlaceAttribute)
 
 #endif
diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h
index 423f8109..62c2d9c0 100644
--- a/src/location/places/qplacecategory.h
+++ b/src/location/places/qplacecategory.h
@@ -49,12 +49,8 @@
 #include <QtCore/QMetaType>
 #include <QtLocation/qtlocation.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceIcon;
 
 class QPlaceCategoryPrivate;
@@ -97,6 +93,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceCategory)
 
-QT_END_HEADER
-
 #endif // QPLACECATEGORY_H
diff --git a/src/location/places/qplacecontactdetail.h b/src/location/places/qplacecontactdetail.h
index b36e7034..a5f946e0 100644
--- a/src/location/places/qplacecontactdetail.h
+++ b/src/location/places/qplacecontactdetail.h
@@ -48,8 +48,6 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceContactDetailPrivate;
@@ -85,8 +83,6 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 Q_DECLARE_METATYPE(QPlaceContactDetail)
 
 #endif
diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h
index 2d8348e6..6768ed38 100644
--- a/src/location/places/qplacecontent.h
+++ b/src/location/places/qplacecontent.h
@@ -47,12 +47,8 @@
 #include <QMetaType>
 #include <QSharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 #define Q_DECLARE_CONTENT_D_FUNC(Class) \
     inline Class##Private *d_func(); \
     inline const Class##Private *d_func() const;\
@@ -112,7 +108,5 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QPlaceContent)
 Q_DECLARE_METATYPE(QPlaceContent::Type)
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index 37cf7432..8d781a46 100644
--- a/src/location/places/qplacecontentreply.h
+++ b/src/location/places/qplacecontentreply.h
@@ -46,8 +46,6 @@
 #include <QtLocation/QPlaceContent>
 #include <QtLocation/QPlaceContentRequest>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceContentReplyPrivate;
@@ -79,6 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h
index 01aad475..b535a133 100644
--- a/src/location/places/qplacecontentrequest.h
+++ b/src/location/places/qplacecontentrequest.h
@@ -46,12 +46,8 @@
 
 #include <QtLocation/QPlaceContent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceContentRequestPrivate;
 
 class Q_LOCATION_EXPORT QPlaceContentRequest
@@ -84,6 +80,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index 0f3e7a3e..21d32b4b 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -45,8 +45,6 @@
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceDetailsReplyPrivate;
@@ -71,6 +69,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QPLACEDETAILSREPLY_H
diff --git a/src/location/places/qplaceeditorial.h b/src/location/places/qplaceeditorial.h
index 5101683a..4fc485af 100644
--- a/src/location/places/qplaceeditorial.h
+++ b/src/location/places/qplaceeditorial.h
@@ -44,12 +44,8 @@
 
 #include <QtLocation/QPlaceContent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceEditorialPrivate;
 
 class Q_LOCATION_EXPORT QPlaceEditorial : public QPlaceContent
@@ -77,6 +73,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QPLACEEDITORIAL_H
diff --git a/src/location/places/qplaceicon.h b/src/location/places/qplaceicon.h
index 2f7a7e7f..4043cc15 100644
--- a/src/location/places/qplaceicon.h
+++ b/src/location/places/qplaceicon.h
@@ -50,8 +50,6 @@
 #include <QtCore/QSize>
 #include <QtCore/QSharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceManager;
@@ -91,6 +89,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceIcon)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index 1b0276f6..dd8fb5d9 100644
--- a/src/location/places/qplaceidreply.h
+++ b/src/location/places/qplaceidreply.h
@@ -45,12 +45,8 @@
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceIdReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceIdReply : public QPlaceReply
 {
@@ -81,6 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h
index cb219ee5..8fff99f4 100644
--- a/src/location/places/qplaceimage.h
+++ b/src/location/places/qplaceimage.h
@@ -47,12 +47,8 @@
 #include <QtLocation/QPlaceSupplier>
 #include <QtLocation/QPlaceContent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceImagePrivate;
 class QUrl;
 
@@ -83,6 +79,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index c47bc854..786fdc1d 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -59,8 +59,6 @@
 #include <QObject>
 #include <QtLocation/QPlaceIcon>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceManagerEngine;
@@ -131,6 +129,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QPLACEMANAGER_H
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index 3cb968fc..ee019637 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -44,8 +44,6 @@
 
 #include <QtLocation/QPlaceManager>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceManagerEnginePrivate;
@@ -126,6 +124,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h
index af3e5273..0b3f6d85 100644
--- a/src/location/places/qplacematchreply.h
+++ b/src/location/places/qplacematchreply.h
@@ -45,8 +45,6 @@
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlaceMatchRequest>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceMatchReplyPrivate;
@@ -72,6 +70,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacematchrequest.h b/src/location/places/qplacematchrequest.h
index 202d2b7f..ae71ac8a 100644
--- a/src/location/places/qplacematchrequest.h
+++ b/src/location/places/qplacematchrequest.h
@@ -45,8 +45,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/QPlaceSearchResult>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceMatchRequestPrivate;
@@ -85,6 +83,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplaceratings.h b/src/location/places/qplaceratings.h
index c03ec736..da2e24c4 100644
--- a/src/location/places/qplaceratings.h
+++ b/src/location/places/qplaceratings.h
@@ -46,8 +46,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceRatingsPrivate;
@@ -86,6 +84,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceRatings)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index 47dc1077..c479e715 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -46,8 +46,6 @@
 #include <QtCore/QObject>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceReplyPrivate;
@@ -110,6 +108,4 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QPlaceReply::Error)
 Q_DECLARE_METATYPE(QPlaceReply *)
 
-QT_END_HEADER
-
 #endif // QPLACEREPLY_H
diff --git a/src/location/places/qplaceresult.h b/src/location/places/qplaceresult.h
index 8b407be5..703c2ed7 100644
--- a/src/location/places/qplaceresult.h
+++ b/src/location/places/qplaceresult.h
@@ -45,8 +45,6 @@
 #include <QtLocation/QPlace>
 #include <QtLocation/QPlaceSearchResult>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceResultPrivate;
@@ -81,6 +79,4 @@ Q_DECLARE_TYPEINFO(QPlaceResult, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h
index d77fb9a8..a69b72bb 100644
--- a/src/location/places/qplacereview.h
+++ b/src/location/places/qplacereview.h
@@ -44,12 +44,8 @@
 
 #include <QtLocation/QPlaceContent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QDateTime;
 class QPlaceReviewPrivate;
 
@@ -84,6 +80,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QPLACEREVIEW_H
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index 7c434af3..4266b988 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -46,12 +46,8 @@
 #include <QtLocation/QPlaceSearchResult>
 #include <QtLocation/QPlaceSearchRequest>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceSearchReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply
 {
@@ -75,6 +71,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
index f914311c..dea85112 100644
--- a/src/location/places/qplacesearchrequest.h
+++ b/src/location/places/qplacesearchrequest.h
@@ -47,12 +47,8 @@
 #include <QtLocation/QPlaceCategory>
 #include <QtLocation/qtlocation.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoShape;
 class QPlaceSearchRequestPrivate;
 
@@ -112,6 +108,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceSearchRequest::RelevanceHint)
 
-QT_END_HEADER
-
 #endif // QPLACESEARCHQUERY_H
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index 399a5ac8..f8f0a5fc 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -47,8 +47,6 @@
 #include <QString>
 #include <QtLocation/QPlace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #define Q_DECLARE_SEARCHRESULT_D_FUNC(Class) \
@@ -107,6 +105,4 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QPlaceSearchResult)
 Q_DECLARE_METATYPE(QPlaceSearchResult::SearchResultType)
 
-QT_END_HEADER
-
 #endif // QPLACESEARCHRESULT_H
diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h
index b1d68b2c..172d5efa 100644
--- a/src/location/places/qplacesearchsuggestionreply.h
+++ b/src/location/places/qplacesearchsuggestionreply.h
@@ -46,8 +46,6 @@
 
 #include <QStringList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceSearchSuggestionReplyPrivate;
@@ -72,6 +70,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacesupplier.h b/src/location/places/qplacesupplier.h
index da84bf2f..cd887b0a 100644
--- a/src/location/places/qplacesupplier.h
+++ b/src/location/places/qplacesupplier.h
@@ -46,8 +46,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/QPlaceIcon>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QUrl;
@@ -89,6 +87,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceSupplier)
 
-QT_END_HEADER
-
 #endif // QPLACESUPPLIER_H
diff --git a/src/location/places/qplaceuser.h b/src/location/places/qplaceuser.h
index 52b463bb..d5f6b042 100644
--- a/src/location/places/qplaceuser.h
+++ b/src/location/places/qplaceuser.h
@@ -46,8 +46,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceUserPrivate;
@@ -80,6 +78,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceUser)
 
-QT_END_HEADER
-
 #endif