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

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

Change-Id: I0e08e7a53f20a016e403d9022e349b25ba38a7ec
Reviewed-by: Andrew Stanley-Jones <asj@cban.com>

13 files changed, 1 insertions, 43 deletions

diff --git a/src/serviceframework/databasemanager_jsondb_p.h b/src/serviceframework/databasemanager_jsondb_p.h
index 2cda5f65..64f34712 100644
--- a/src/serviceframework/databasemanager_jsondb_p.h
+++ b/src/serviceframework/databasemanager_jsondb_p.h
@@ -77,7 +77,6 @@ class QJsonDbRequest;
 class QJsonDbWatcher;
 QT_END_NAMESPACE_JSONDB
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
@@ -124,6 +123,5 @@ class Q_AUTOTEST_EXPORT DatabaseManager : public QObject
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/serviceframework/databasemanager_p.h b/src/serviceframework/databasemanager_p.h
index ceedda8a..3a258bf0 100644
--- a/src/serviceframework/databasemanager_p.h
+++ b/src/serviceframework/databasemanager_p.h
@@ -62,7 +62,6 @@
 #define Q_AUTOTEST_EXPORT
 #endif
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class DatabaseFileWatcher;
@@ -135,6 +134,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/serviceframework/ipc/qsignalintercepter_p.h b/src/serviceframework/ipc/qsignalintercepter_p.h
index 3a8762f8..3cc7400d 100644
--- a/src/serviceframework/ipc/qsignalintercepter_p.h
+++ b/src/serviceframework/ipc/qsignalintercepter_p.h
@@ -46,8 +46,6 @@
 #include <qvariant.h>
 #include <qlist.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSignalIntercepterPrivate;
@@ -83,6 +81,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/serviceframework/ipc/qslotinvoker_p.h b/src/serviceframework/ipc/qslotinvoker_p.h
index 526eab08..14e624b4 100644
--- a/src/serviceframework/ipc/qslotinvoker_p.h
+++ b/src/serviceframework/ipc/qslotinvoker_p.h
@@ -46,9 +46,8 @@
 #include <qvariant.h>
 #include <qlist.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
+
 class QSlotInvokerPrivate;
 class QSlotInvoker : public QObject
 {
@@ -79,6 +78,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/serviceframework/qservice.h b/src/serviceframework/qservice.h
index 136811cc..e73cdbe8 100644
--- a/src/serviceframework/qservice.h
+++ b/src/serviceframework/qservice.h
@@ -44,8 +44,6 @@
 
 #include "qserviceframeworkglobal.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 //QTM_SYNC_HEADER_EXPORT QService
@@ -72,5 +70,4 @@ namespace QService
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
 #endif //Q_SERVICE_H
diff --git a/src/serviceframework/qservicefilter.h b/src/serviceframework/qservicefilter.h
index 5de5a78f..c6a95f23 100644
--- a/src/serviceframework/qservicefilter.h
+++ b/src/serviceframework/qservicefilter.h
@@ -45,8 +45,6 @@
 #include "qserviceframeworkglobal.h"
 #include <QStringList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 class QDataStream;
 
@@ -115,5 +113,4 @@ Q_SERVICEFW_EXPORT QDataStream &operator>>(QDataStream &, QServiceFilter &);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
 #endif //QSERVICEFILTER_H
diff --git a/src/serviceframework/qserviceinterfacedescriptor.h b/src/serviceframework/qserviceinterfacedescriptor.h
index b582ba61..e57445fe 100644
--- a/src/serviceframework/qserviceinterfacedescriptor.h
+++ b/src/serviceframework/qserviceinterfacedescriptor.h
@@ -55,7 +55,6 @@ QT_USE_NAMESPACE
 #endif
 
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QDebug;
@@ -127,6 +126,4 @@ Q_SERVICEFW_EXPORT QDebug operator<<(QDebug, const QServiceInterfaceDescriptor &
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/serviceframework/qservicemanager.h b/src/serviceframework/qservicemanager.h
index c750baac..4853cab9 100644
--- a/src/serviceframework/qservicemanager.h
+++ b/src/serviceframework/qservicemanager.h
@@ -53,8 +53,6 @@
 #include <QStringList>
 #include <QDebug>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QServiceContext;
@@ -175,6 +173,4 @@ Q_OUTOFLINE_TEMPLATE T* QServiceManager::loadLocalTypedInterface(const QServiceI
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/serviceframework/qserviceoperations_p.h b/src/serviceframework/qserviceoperations_p.h
index 4a32d001..9f1549ac 100644
--- a/src/serviceframework/qserviceoperations_p.h
+++ b/src/serviceframework/qserviceoperations_p.h
@@ -58,8 +58,6 @@
 #include <QThread>
 #include <QAtomicInt>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QServiceManager;
@@ -91,6 +89,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSERVICEOPERATIONS_H
diff --git a/src/serviceframework/qserviceplugininterface.h b/src/serviceframework/qserviceplugininterface.h
index 46702276..2df57d48 100644
--- a/src/serviceframework/qserviceplugininterface.h
+++ b/src/serviceframework/qserviceplugininterface.h
@@ -45,10 +45,8 @@
 #include "qserviceframeworkglobal.h"
 #include <QtPlugin>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-
 class QServiceInterfaceDescriptor;
 
 class Q_SERVICEFW_EXPORT QServicePluginInterface
@@ -66,5 +64,4 @@ public:
 Q_DECLARE_INTERFACE(QServicePluginInterface, "com.nokia.qt.QServicePluginInterface/1.0")
 QT_END_NAMESPACE
 
-QT_END_HEADER
 #endif
diff --git a/src/serviceframework/qservicereply.h b/src/serviceframework/qservicereply.h
index 7b2558be..308104aa 100644
--- a/src/serviceframework/qservicereply.h
+++ b/src/serviceframework/qservicereply.h
@@ -48,8 +48,6 @@
 #include <QObject>
 #include <QMetaObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QServiceReplyPrivate;
@@ -121,6 +119,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSERVICEREPLY_H
diff --git a/src/serviceframework/qservicerequest_p.h b/src/serviceframework/qservicerequest_p.h
index a84e99a9..4c67f292 100644
--- a/src/serviceframework/qservicerequest_p.h
+++ b/src/serviceframework/qservicerequest_p.h
@@ -60,8 +60,6 @@
 
 #include <QString>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QServiceRequest
@@ -104,8 +102,6 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 Q_DECLARE_METATYPE(QServiceRequest)
 
 #endif // QSERVICEREQUEST_P_H
diff --git a/src/serviceframework/servicedatabase_p.h b/src/serviceframework/servicedatabase_p.h
index 546369e6..487271d3 100644
--- a/src/serviceframework/servicedatabase_p.h
+++ b/src/serviceframework/servicedatabase_p.h
@@ -60,8 +60,6 @@
 #include "qservicefilter.h"
 #include "dberror_p.h"
 
-
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QServiceInterfaceDescriptor;
@@ -136,6 +134,5 @@ Q_SIGNALS:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif /*QSERVICEDATABASE_H_*/