diff options
58 files changed, 1 insertions, 228 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 diff --git a/src/nfc/maemo6/socketrequestor_p.h b/src/nfc/maemo6/socketrequestor_p.h index 59d58411..baa5f825 100644 --- a/src/nfc/maemo6/socketrequestor_p.h +++ b/src/nfc/maemo6/socketrequestor_p.h @@ -57,8 +57,6 @@ QT_FORWARD_DECLARE_CLASS(QDBusVariant) class DBusConnection; -QT_BEGIN_HEADER - class SocketRequestor : public QObject { Q_OBJECT @@ -85,6 +83,4 @@ private: const QString m_adaptor; }; -QT_END_HEADER - #endif // SOCKETREQUESTOR_P_H diff --git a/src/nfc/qdeclarativendefrecord.h b/src/nfc/qdeclarativendefrecord.h index 10ca0a07..5ca77173 100644 --- a/src/nfc/qdeclarativendefrecord.h +++ b/src/nfc/qdeclarativendefrecord.h @@ -46,8 +46,6 @@ #include <QtCore/QMetaType> #include <QtNfc/QNdefRecord> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QDeclarativeNdefRecordPrivate; @@ -95,6 +93,4 @@ static bool _q_##className##_registered = qRegisterNdefRecordType<className>(typ QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVENDEFRECORD_P_H diff --git a/src/nfc/qllcpserver.h b/src/nfc/qllcpserver.h index 9c130940..eda33e40 100644 --- a/src/nfc/qllcpserver.h +++ b/src/nfc/qllcpserver.h @@ -46,8 +46,6 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QLlcpSocket> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QLlcpServerPrivate; @@ -84,6 +82,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QLLCPSERVER_H diff --git a/src/nfc/qllcpserver_qnx_p.h b/src/nfc/qllcpserver_qnx_p.h index 363d0978..9d7d7cf6 100644 --- a/src/nfc/qllcpserver_qnx_p.h +++ b/src/nfc/qllcpserver_qnx_p.h @@ -45,8 +45,6 @@ #include "qllcpserver.h" #include "nfc/nfc.h" -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QLlcpServerPrivate : public QObject @@ -82,6 +80,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QLLCPSERVER_QNX_P_H diff --git a/src/nfc/qllcpsocket.h b/src/nfc/qllcpsocket.h index 0f15df5c..6840c6a9 100644 --- a/src/nfc/qllcpsocket.h +++ b/src/nfc/qllcpsocket.h @@ -46,8 +46,6 @@ #include <QtNetwork/QAbstractSocket> #include <QtNfc/qnfcglobal.h> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNearFieldTarget; @@ -130,6 +128,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QLLCPSOCKET_H diff --git a/src/nfc/qllcpsocket_qnx_p.h b/src/nfc/qllcpsocket_qnx_p.h index f69921f2..79b2820d 100644 --- a/src/nfc/qllcpsocket_qnx_p.h +++ b/src/nfc/qllcpsocket_qnx_p.h @@ -46,8 +46,6 @@ #include "qnearfieldtarget_qnx_p.h" -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QLlcpSocketPrivate : public QObject @@ -124,6 +122,4 @@ private Q_SLOTS: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QLLCPSOCKET_QNX_P_H diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h index 9461d558..ced109e8 100644 --- a/src/nfc/qndeffilter.h +++ b/src/nfc/qndeffilter.h @@ -46,8 +46,6 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNdefFilterPrivate; @@ -95,6 +93,4 @@ void QNdefFilter::appendRecord(unsigned int min, unsigned int max) QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNDEFFILTER_H diff --git a/src/nfc/qndefmessage.h b/src/nfc/qndefmessage.h index 003c7bd8..13094621 100644 --- a/src/nfc/qndefmessage.h +++ b/src/nfc/qndefmessage.h @@ -49,8 +49,6 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class Q_NFC_EXPORT QNdefMessage : public QList<QNdefRecord> @@ -72,6 +70,4 @@ QTNFC_END_NAMESPACE Q_DECLARE_METATYPE(QtNfc::QNdefMessage) -QT_END_HEADER - #endif // QNDEFMESSAGE_H diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h index 5f9959d6..ce227b58 100644 --- a/src/nfc/qndefnfctextrecord.h +++ b/src/nfc/qndefnfctextrecord.h @@ -45,8 +45,6 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class Q_NFC_EXPORT QNdefNfcTextRecord : public QNdefRecord @@ -73,6 +71,4 @@ QTNFC_END_NAMESPACE Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcTextRecord, QNdefRecord::NfcRtd, "T") -QT_END_HEADER - #endif // QNDEFNFCTEXTRECORD_H diff --git a/src/nfc/qndefnfcurirecord.h b/src/nfc/qndefnfcurirecord.h index f7297428..4c52ccbe 100644 --- a/src/nfc/qndefnfcurirecord.h +++ b/src/nfc/qndefnfcurirecord.h @@ -47,8 +47,6 @@ QT_FORWARD_DECLARE_CLASS(QUrl) -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class Q_NFC_EXPORT QNdefNfcUriRecord : public QNdefRecord @@ -64,6 +62,4 @@ QTNFC_END_NAMESPACE Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcUriRecord, QNdefRecord::NfcRtd, "U") -QT_END_HEADER - #endif // QNDEFNFCURIRECORD_H diff --git a/src/nfc/qndefrecord.h b/src/nfc/qndefrecord.h index c2781025..6717427f 100644 --- a/src/nfc/qndefrecord.h +++ b/src/nfc/qndefrecord.h @@ -46,8 +46,6 @@ #include <QtCore/QByteArray> #include <QtNfc/qnfcglobal.h> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNdefRecordPrivate; @@ -118,6 +116,4 @@ uint qHash(const QNdefRecord &key); QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNDEFRECORD_H diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h index 323cc054..847de558 100644 --- a/src/nfc/qnearfieldmanager.h +++ b/src/nfc/qnearfieldmanager.h @@ -48,8 +48,6 @@ #include <QtNfc/QNdefRecord> #include <QtNfc/QNdefFilter> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNearFieldManagerPrivate; @@ -114,6 +112,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldManager::TargetAccessModes) QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDMANAGER_H diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h index e125f4c9..0935649f 100644 --- a/src/nfc/qnearfieldmanager_emulator_p.h +++ b/src/nfc/qnearfieldmanager_emulator_p.h @@ -49,8 +49,6 @@ #include <QtCore/QObject> #include <QtCore/QWeakPointer> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class TagBase; @@ -79,6 +77,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDMANAGER_EMULATOR_H diff --git a/src/nfc/qnearfieldmanager_p.h b/src/nfc/qnearfieldmanager_p.h index bea9af17..da087b0f 100644 --- a/src/nfc/qnearfieldmanager_p.h +++ b/src/nfc/qnearfieldmanager_p.h @@ -50,8 +50,6 @@ #include <QtCore/QObject> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNdefFilter; @@ -128,6 +126,4 @@ public: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDMANAGER_P_H diff --git a/src/nfc/qnearfieldmanager_simulator_p.h b/src/nfc/qnearfieldmanager_simulator_p.h index f4573542..b2ca7343 100644 --- a/src/nfc/qnearfieldmanager_simulator_p.h +++ b/src/nfc/qnearfieldmanager_simulator_p.h @@ -46,8 +46,6 @@ #include <QtCore/QWeakPointer> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE namespace Simulator { @@ -75,6 +73,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDMANAGER_SIMULATOR_P_H diff --git a/src/nfc/qnearfieldmanagervirtualbase_p.h b/src/nfc/qnearfieldmanagervirtualbase_p.h index edde8f57..67451f90 100644 --- a/src/nfc/qnearfieldmanagervirtualbase_p.h +++ b/src/nfc/qnearfieldmanagervirtualbase_p.h @@ -46,8 +46,6 @@ #include <QtCore/QMetaMethod> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNearFieldManagerPrivateVirtualBase : public QNearFieldManagerPrivate @@ -89,6 +87,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDMANAGERVIRTUALBASE_P_H diff --git a/src/nfc/qnearfieldtagtype1.h b/src/nfc/qnearfieldtagtype1.h index 6e9616f4..e381c7d4 100644 --- a/src/nfc/qnearfieldtagtype1.h +++ b/src/nfc/qnearfieldtagtype1.h @@ -44,8 +44,6 @@ #include <QtNfc/QNearFieldTarget> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNearFieldTagType1Private; @@ -97,6 +95,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDTAGTYPE1_H diff --git a/src/nfc/qnearfieldtagtype2.h b/src/nfc/qnearfieldtagtype2.h index 0cc2dcb2..46d61332 100644 --- a/src/nfc/qnearfieldtagtype2.h +++ b/src/nfc/qnearfieldtagtype2.h @@ -44,8 +44,6 @@ #include <QtNfc/QNearFieldTarget> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNearFieldTagType2Private; @@ -86,6 +84,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDTAGTYPE2_H diff --git a/src/nfc/qnearfieldtagtype3.h b/src/nfc/qnearfieldtagtype3.h index e0f8e6d4..df131dbf 100644 --- a/src/nfc/qnearfieldtagtype3.h +++ b/src/nfc/qnearfieldtagtype3.h @@ -46,8 +46,6 @@ #include <QtCore/QMap> #include <QtNfc/QNearFieldTarget> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class Q_NFC_EXPORT QNearFieldTagType3 : public QNearFieldTarget @@ -76,6 +74,4 @@ protected: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDTAGTYPE3_H diff --git a/src/nfc/qnearfieldtagtype4.h b/src/nfc/qnearfieldtagtype4.h index 506fdd0a..9070c8a5 100644 --- a/src/nfc/qnearfieldtagtype4.h +++ b/src/nfc/qnearfieldtagtype4.h @@ -44,8 +44,6 @@ #include <QtNfc/QNearFieldTarget> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class Q_NFC_EXPORT QNearFieldTagType4 : public QNearFieldTarget @@ -72,6 +70,4 @@ protected: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDTAGTYPE4_H diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index 27bd0478..4dba557e 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -53,8 +53,6 @@ class QString; class QUrl; QT_END_NAMESPACE -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNdefMessage; @@ -171,6 +169,4 @@ QTNFC_END_NAMESPACE Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::RequestId) Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::Error) -QT_END_HEADER - #endif // QNEARFIELDTARGET_H diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h index 10b42fb7..92f9da3a 100644 --- a/src/nfc/qnearfieldtarget_emulator_p.h +++ b/src/nfc/qnearfieldtarget_emulator_p.h @@ -48,8 +48,6 @@ #include <QtCore/QMap> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class TagType1 : public QNearFieldTagType1 @@ -117,6 +115,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNEARFIELDTARGET_EMULATOR_P_H diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h index 4a139e2a..2ee8f6bb 100644 --- a/src/nfc/qnfcglobal.h +++ b/src/nfc/qnfcglobal.h @@ -38,6 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QTNFC_H #define QTNFC_H diff --git a/src/nfc/qnx/qnxnfceventfilter_p.h b/src/nfc/qnx/qnxnfceventfilter_p.h index 61e78934..ca023320 100644 --- a/src/nfc/qnx/qnxnfceventfilter_p.h +++ b/src/nfc/qnx/qnxnfceventfilter_p.h @@ -10,8 +10,6 @@ #include "../qnfcglobal.h" #include "../qndefmessage.h" -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNXNFCEventFilter : public QObject, public QAbstractNativeEventFilter @@ -33,6 +31,4 @@ Q_SIGNALS: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QNXNFCEVENTFILTER_H diff --git a/src/nfc/qnx/qnxnfcmanager_p.h b/src/nfc/qnx/qnxnfcmanager_p.h index d785fbe9..b19cc312 100644 --- a/src/nfc/qnx/qnxnfcmanager_p.h +++ b/src/nfc/qnx/qnxnfcmanager_p.h @@ -60,8 +60,6 @@ #define qQNXNFCDebug QT_NO_QDEBUG_MACRO #endif -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QLlcpSocketPrivate; @@ -139,7 +137,5 @@ Q_SIGNALS: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/nfc/qtlv_p.h b/src/nfc/qtlv_p.h index 23f40876..50909150 100644 --- a/src/nfc/qtlv_p.h +++ b/src/nfc/qtlv_p.h @@ -50,8 +50,6 @@ #include <QtCore/QMap> #include <QtCore/QPair> -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class QNearFieldTarget; @@ -123,6 +121,4 @@ QPair<int, int> qParseLockControlTlv(const QByteArray &tlvData); QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // QTLV_P_H diff --git a/src/nfc/targetemulator_p.h b/src/nfc/targetemulator_p.h index 0ac6121a..199fffec 100644 --- a/src/nfc/targetemulator_p.h +++ b/src/nfc/targetemulator_p.h @@ -48,8 +48,6 @@ QT_FORWARD_DECLARE_CLASS(QSettings) -QT_BEGIN_HEADER - QTNFC_BEGIN_NAMESPACE class TagBase @@ -111,6 +109,4 @@ private: QTNFC_END_NAMESPACE -QT_END_HEADER - #endif // TARGETEMULATOR_P_H |