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

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

Change-Id: I7971cca9d51e7eb1e395e348efb471982e355527
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>

31 files changed, 0 insertions, 124 deletions

diff --git a/src/bluetooth/qbluetooth.h b/src/bluetooth/qbluetooth.h
index 96326999..f32693c9 100644
--- a/src/bluetooth/qbluetooth.h
+++ b/src/bluetooth/qbluetooth.h
@@ -45,8 +45,6 @@
 
 #include "qbluetoothglobal.h"
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 namespace QBluetooth {
@@ -66,6 +64,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(SecurityFlags)
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QBLUETOOTH_H
diff --git a/src/bluetooth/qbluetoothaddress.h b/src/bluetooth/qbluetoothaddress.h
index 9ff05ee1..08fbc821 100644
--- a/src/bluetooth/qbluetoothaddress.h
+++ b/src/bluetooth/qbluetoothaddress.h
@@ -48,8 +48,6 @@
 #include <QtCore/QString>
 #include <QtCore/QMetaType>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothAddressPrivate;
@@ -85,6 +83,4 @@ QTBLUETOOTH_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QtBluetooth::QBluetoothAddress)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothaddress_p.h b/src/bluetooth/qbluetoothaddress_p.h
index b686305c..d2d7b2f9 100644
--- a/src/bluetooth/qbluetoothaddress_p.h
+++ b/src/bluetooth/qbluetoothaddress_p.h
@@ -44,8 +44,6 @@
 
 #include "qbluetoothaddress.h"
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothAddressPrivate
@@ -60,6 +58,4 @@ public:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h
index b1cd20e3..9524f2fb 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h
@@ -48,8 +48,6 @@
 
 #include <qbluetoothdeviceinfo.h>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothDeviceDiscoveryAgentPrivate;
@@ -109,6 +107,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 2b6df045..e9f3d9f3 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -58,8 +58,6 @@ QT_END_NAMESPACE
 #include <QTimer>
 #endif
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothDeviceDiscoveryAgentPrivate
@@ -120,6 +118,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h
index aa7a41e6..94b340c8 100644
--- a/src/bluetooth/qbluetoothdeviceinfo.h
+++ b/src/bluetooth/qbluetoothdeviceinfo.h
@@ -46,8 +46,6 @@
 
 #include <QString>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothDeviceInfoPrivate;
@@ -244,6 +242,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothdeviceinfo_p.h b/src/bluetooth/qbluetoothdeviceinfo_p.h
index f30f1d17..fd10f10f 100644
--- a/src/bluetooth/qbluetoothdeviceinfo_p.h
+++ b/src/bluetooth/qbluetoothdeviceinfo_p.h
@@ -48,8 +48,6 @@
 
 #include <QString>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothDeviceInfoPrivate
@@ -75,6 +73,4 @@ public:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothhostinfo.h b/src/bluetooth/qbluetoothhostinfo.h
index 01869c5d..e27e2c52 100644
--- a/src/bluetooth/qbluetoothhostinfo.h
+++ b/src/bluetooth/qbluetoothhostinfo.h
@@ -45,8 +45,6 @@
 #include "qbluetoothglobal.h"
 #include "qbluetoothaddress.h"
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothHostInfoPrivate;
@@ -71,6 +69,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothhostinfo_p.h b/src/bluetooth/qbluetoothhostinfo_p.h
index 7eda9042..569be476 100644
--- a/src/bluetooth/qbluetoothhostinfo_p.h
+++ b/src/bluetooth/qbluetoothhostinfo_p.h
@@ -44,8 +44,6 @@
 
 #include "qbluetoothhostinfo.h"
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothHostInfoPrivate
@@ -59,6 +57,4 @@ public:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h
index 7aefbec5..5f664355 100644
--- a/src/bluetooth/qbluetoothlocaldevice.h
+++ b/src/bluetooth/qbluetoothlocaldevice.h
@@ -51,8 +51,6 @@
 
 #include "qbluetoothhostinfo.h"
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothLocalDevicePrivate;
@@ -123,6 +121,4 @@ Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::HostMode)
 Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::Pairing)
 Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::Error)
 
-QT_END_HEADER
-
 #endif // QBLUETOOTHLOCALDEVICE_H
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index b20f0bc5..8a631739 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -64,8 +64,6 @@ QT_END_NAMESPACE
 #include "qnx/ppshelpers_p.h"
 #endif
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothAddress;
@@ -146,6 +144,4 @@ class QBluetoothLocalDevicePrivate : public QObject
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QBLUETOOTHLOCALDEVICE_P_H
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h
index 7e75d814..b2a9a7c4 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.h
@@ -49,8 +49,6 @@
 #include <qbluetoothserviceinfo.h>
 #include <qbluetoothuuid.h>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothAddress;
@@ -113,6 +111,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index e97e801d..f51ac9ce 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -65,8 +65,6 @@ QT_END_NAMESPACE
 #include <unistd.h>
 #endif
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothDeviceDiscoveryAgent;
@@ -160,6 +158,4 @@ protected:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h
index e84cfbbe..1e746d69 100644
--- a/src/bluetooth/qbluetoothserviceinfo.h
+++ b/src/bluetooth/qbluetoothserviceinfo.h
@@ -52,8 +52,6 @@
 
 #include <QtCore/QDebug>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothServiceInfoPrivate;
@@ -232,6 +230,4 @@ inline QList<QBluetoothUuid> QBluetoothServiceInfo::serviceClassUuids() const
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothserviceinfo_p.h b/src/bluetooth/qbluetoothserviceinfo_p.h
index 2fe9d997..8396cac0 100644
--- a/src/bluetooth/qbluetoothserviceinfo_p.h
+++ b/src/bluetooth/qbluetoothserviceinfo_p.h
@@ -50,8 +50,6 @@
 
 class OrgBluezServiceInterface;
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothServiceInfo;
@@ -94,6 +92,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index b1f39616..d9199a9d 100644
--- a/src/bluetooth/qbluetoothsocket.h
+++ b/src/bluetooth/qbluetoothsocket.h
@@ -50,8 +50,6 @@
 #include <QIODevice>
 #include <QtNetwork/QAbstractSocket>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothSocketPrivate;
@@ -177,6 +175,4 @@ Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketState);
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h
index 2f422bd7..8e439ab2 100644
--- a/src/bluetooth/qbluetoothsocket_p.h
+++ b/src/bluetooth/qbluetoothsocket_p.h
@@ -57,8 +57,6 @@
 
 QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothServiceDiscoveryAgent;
@@ -188,6 +186,4 @@ static inline void convertAddress(quint8 (&from)[6], quint64 &to)
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h
index 1fd93231..ffb92e2c 100644
--- a/src/bluetooth/qbluetoothtransfermanager.h
+++ b/src/bluetooth/qbluetoothtransfermanager.h
@@ -49,8 +49,6 @@
 
 QT_FORWARD_DECLARE_CLASS(QIODevice)
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothTransferReply;
@@ -79,6 +77,4 @@ signals:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QBLUETOOTHTRANSFERMANAGER_H
diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h
index 0a8348ee..f217ad0c 100644
--- a/src/bluetooth/qbluetoothtransferreply.h
+++ b/src/bluetooth/qbluetoothtransferreply.h
@@ -47,8 +47,6 @@
 #include <qbluetoothtransferrequest.h>
 #include <qbluetoothtransfermanager.h>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothTransferReplyPrivate;
@@ -107,6 +105,4 @@ QTBLUETOOTH_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QtBluetooth::QBluetoothTransferReply *);
 
-QT_END_HEADER
-
 #endif // QBLUETOOTHTRANSFERREPLY_H
diff --git a/src/bluetooth/qbluetoothtransferreply_bluez_p.h b/src/bluetooth/qbluetoothtransferreply_bluez_p.h
index 5b84e6e4..542fbb5b 100644
--- a/src/bluetooth/qbluetoothtransferreply_bluez_p.h
+++ b/src/bluetooth/qbluetoothtransferreply_bluez_p.h
@@ -50,8 +50,6 @@
 
 #include "qbluetoothtransferreply.h"
 
-QT_BEGIN_HEADER
-
 class OrgOpenobexClientInterface;
 class OrgOpenobexManagerInterface;
 class AgentAdaptor;
@@ -123,6 +121,4 @@ public slots:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QBLUETOOTHTRANSFERREPLY_H
diff --git a/src/bluetooth/qbluetoothtransferreply_p.h b/src/bluetooth/qbluetoothtransferreply_p.h
index 94cdd967..0e841f07 100644
--- a/src/bluetooth/qbluetoothtransferreply_p.h
+++ b/src/bluetooth/qbluetoothtransferreply_p.h
@@ -44,8 +44,6 @@
 
 #include "qbluetoothtransferreply.h"
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyPrivate
@@ -64,6 +62,4 @@ public:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QBLUETOOTHTRANSFERREPLY_H
diff --git a/src/bluetooth/qbluetoothtransferrequest.h b/src/bluetooth/qbluetoothtransferrequest.h
index 7713eb37..90344696 100644
--- a/src/bluetooth/qbluetoothtransferrequest.h
+++ b/src/bluetooth/qbluetoothtransferrequest.h
@@ -47,8 +47,6 @@
 #include <QtCore/QtGlobal>
 #include <QtCore/QVariant>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothAddress;
@@ -88,6 +86,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QBLUETOOTHTRANSFERREQUEST_H
diff --git a/src/bluetooth/qbluetoothtransferrequest_p.h b/src/bluetooth/qbluetoothtransferrequest_p.h
index c2824766..af8142cd 100644
--- a/src/bluetooth/qbluetoothtransferrequest_p.h
+++ b/src/bluetooth/qbluetoothtransferrequest_p.h
@@ -45,8 +45,6 @@
 #include "qbluetoothglobal.h"
 #include "qbluetoothtransferrequest.h"
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothAddress;
@@ -62,6 +60,4 @@ public:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QBLUETOOTHTRANSFERREQUESTPRIVATE_H
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index 0620aff4..5936e583 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -50,8 +50,6 @@
 
 #include <QtCore/QDebug>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 struct quint128
@@ -177,6 +175,4 @@ QTBLUETOOTH_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QtBluetooth::QBluetoothUuid)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/ql2capserver.h b/src/bluetooth/ql2capserver.h
index 769a29bf..25277515 100644
--- a/src/bluetooth/ql2capserver.h
+++ b/src/bluetooth/ql2capserver.h
@@ -50,8 +50,6 @@
 #include <qbluetooth.h>
 #include <qbluetoothsocket.h>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QL2capServerPrivate;
@@ -99,6 +97,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/ql2capserver_p.h b/src/bluetooth/ql2capserver_p.h
index fe92cee5..0f11ea8d 100644
--- a/src/bluetooth/ql2capserver_p.h
+++ b/src/bluetooth/ql2capserver_p.h
@@ -49,8 +49,6 @@
 QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
 #endif
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothAddress;
@@ -89,6 +87,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/ql2capsocket.h b/src/bluetooth/ql2capsocket.h
index 742d8287..2f0a5d38 100644
--- a/src/bluetooth/ql2capsocket.h
+++ b/src/bluetooth/ql2capsocket.h
@@ -47,8 +47,6 @@
 
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QL2capSocket : public QBluetoothSocket
@@ -73,6 +71,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QL2CAPSOCKET_H
diff --git a/src/bluetooth/qnx/ppshelpers_p.h b/src/bluetooth/qnx/ppshelpers_p.h
index d1e8ceac..c87a9b1b 100644
--- a/src/bluetooth/qnx/ppshelpers_p.h
+++ b/src/bluetooth/qnx/ppshelpers_p.h
@@ -72,8 +72,6 @@
 #define BT_SPP_SERVER_SUBTYPE 1
 #define BT_SPP_CLIENT_SUBTYPE 2
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class BBSocketNotifier : public QObject
@@ -130,6 +128,4 @@ void ppsUnreguisterForEvent(const QString &evt, QObject *obj);
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // PPSHELPERS_H
diff --git a/src/bluetooth/qrfcommserver.h b/src/bluetooth/qrfcommserver.h
index 1f54d25c..7831b0b7 100644
--- a/src/bluetooth/qrfcommserver.h
+++ b/src/bluetooth/qrfcommserver.h
@@ -50,8 +50,6 @@
 #include <qbluetooth.h>
 #include <qbluetoothsocket.h>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QRfcommServerPrivate;
@@ -98,6 +96,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qrfcommserver_p.h b/src/bluetooth/qrfcommserver_p.h
index bbb37c8e..af08514b 100644
--- a/src/bluetooth/qrfcommserver_p.h
+++ b/src/bluetooth/qrfcommserver_p.h
@@ -55,8 +55,6 @@
 QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
 #endif
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QBluetoothAddress;
@@ -111,6 +109,4 @@ private Q_SLOTS:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/bluetooth/qrfcommsocket.h b/src/bluetooth/qrfcommsocket.h
index 7f60bcbd..52d10f8b 100644
--- a/src/bluetooth/qrfcommsocket.h
+++ b/src/bluetooth/qrfcommsocket.h
@@ -44,8 +44,6 @@
 
 #include <qbluetoothsocket.h>
 
-QT_BEGIN_HEADER
-
 QTBLUETOOTH_BEGIN_NAMESPACE
 
 class QRfcommSocket : public QBluetoothSocket
@@ -61,6 +59,4 @@ private:
 
 QTBLUETOOTH_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QRFCOMMSOCKET_H