diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-05 13:32:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 12:44:29 +0200 |
| commit | e21b666856fe89a13c2c8c1eb7ef6fb18275f9b4 (patch) | |
| tree | 3f5f6075a783fe4afe1b201faa591fa8dacc4238 | |
| parent | a589ae4f2f525686efa9f031a82390433b0e606d (diff) | |
Remove QtBluetooth and QtNfc namespace.
This is based on namespace discussions on the Qt project dev mailing list.
We continue to use the Qt namespace.
Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
191 files changed, 367 insertions, 416 deletions
diff --git a/examples/bluetooth/btchat/chat.h b/examples/bluetooth/btchat/chat.h index c32c85b1..fed850f1 100644 --- a/examples/bluetooth/btchat/chat.h +++ b/examples/bluetooth/btchat/chat.h @@ -47,11 +47,7 @@ #include <QDebug> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QRfcommServer; -QT_END_NAMESPACE_BLUETOOTH - -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class ChatServer; class ChatClient; diff --git a/examples/bluetooth/btchat/chatclient.h b/examples/bluetooth/btchat/chatclient.h index 4a029fe0..07f23164 100644 --- a/examples/bluetooth/btchat/chatclient.h +++ b/examples/bluetooth/btchat/chatclient.h @@ -45,11 +45,9 @@ #include <QtCore/QObject> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothSocket; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothSocket) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE //! [declaration] class ChatClient : public QObject diff --git a/examples/bluetooth/btchat/chatserver.h b/examples/bluetooth/btchat/chatserver.h index f73ec605..2a3c3503 100644 --- a/examples/bluetooth/btchat/chatserver.h +++ b/examples/bluetooth/btchat/chatserver.h @@ -46,12 +46,10 @@ #include <QtCore/QObject> #include <QtCore/QList> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothServer; -class QBluetoothSocket; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothServer) +QT_FORWARD_DECLARE_CLASS(QBluetoothSocket) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE //! [declaration] class ChatServer : public QObject diff --git a/examples/bluetooth/btchat/remoteselector.cpp b/examples/bluetooth/btchat/remoteselector.cpp index ee195413..f660a815 100644 --- a/examples/bluetooth/btchat/remoteselector.cpp +++ b/examples/bluetooth/btchat/remoteselector.cpp @@ -45,7 +45,7 @@ #include <qbluetoothaddress.h> #include <qbluetoothlocaldevice.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE RemoteSelector::RemoteSelector(QWidget *parent) : QDialog(parent), ui(new Ui::RemoteSelector) diff --git a/examples/bluetooth/btchat/remoteselector.h b/examples/bluetooth/btchat/remoteselector.h index dc10c740..3f6e15c9 100644 --- a/examples/bluetooth/btchat/remoteselector.h +++ b/examples/bluetooth/btchat/remoteselector.h @@ -50,7 +50,7 @@ QT_FORWARD_DECLARE_CLASS(QModelIndex) QT_FORWARD_DECLARE_CLASS(QListWidgetItem) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/bluetooth/btfiletransfer/progress.cpp b/examples/bluetooth/btfiletransfer/progress.cpp index fde95c61..c9913c44 100644 --- a/examples/bluetooth/btfiletransfer/progress.cpp +++ b/examples/bluetooth/btfiletransfer/progress.cpp @@ -46,7 +46,7 @@ #include <qbluetoothtransferrequest.h> #include <qbluetoothtransferreply.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Progress::Progress(QWidget *parent) : QDialog(parent), diff --git a/examples/bluetooth/btfiletransfer/progress.h b/examples/bluetooth/btfiletransfer/progress.h index 27fe87d8..eab84746 100644 --- a/examples/bluetooth/btfiletransfer/progress.h +++ b/examples/bluetooth/btfiletransfer/progress.h @@ -45,11 +45,9 @@ #include <qbluetoothglobal.h> #include <QTime> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothTransferReply; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothTransferReply) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/bluetooth/btfiletransfer/remoteselector.cpp b/examples/bluetooth/btfiletransfer/remoteselector.cpp index b148dab4..8b197bf0 100644 --- a/examples/bluetooth/btfiletransfer/remoteselector.cpp +++ b/examples/bluetooth/btfiletransfer/remoteselector.cpp @@ -55,7 +55,7 @@ #include "progress.h" #include "pindisplay.h" -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE RemoteSelector::RemoteSelector(QWidget *parent) : QDialog(parent), ui(new Ui::RemoteSelector), diff --git a/examples/bluetooth/btfiletransfer/remoteselector.h b/examples/bluetooth/btfiletransfer/remoteselector.h index 2ac715a2..fe1d3966 100644 --- a/examples/bluetooth/btfiletransfer/remoteselector.h +++ b/examples/bluetooth/btfiletransfer/remoteselector.h @@ -55,7 +55,7 @@ QT_FORWARD_DECLARE_CLASS(QFile) class pinDisplay; -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/bluetooth/btscanner/device.h b/examples/bluetooth/btscanner/device.h index 0bcf908e..6dbfb870 100644 --- a/examples/bluetooth/btscanner/device.h +++ b/examples/bluetooth/btscanner/device.h @@ -48,12 +48,10 @@ #include <QDialog> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothDeviceDiscoveryAgent; -class QBluetoothDeviceInfo; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothDeviceDiscoveryAgent) +QT_FORWARD_DECLARE_CLASS(QBluetoothDeviceInfo) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class DeviceDiscoveryDialog : public QDialog { diff --git a/examples/bluetooth/btscanner/service.h b/examples/bluetooth/btscanner/service.h index b2b31809..293bc7a9 100644 --- a/examples/bluetooth/btscanner/service.h +++ b/examples/bluetooth/btscanner/service.h @@ -44,16 +44,13 @@ #include "ui_service.h" #include <qbluetoothglobal.h> - #include <QDialog> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothServiceDiscoveryAgent; -class QBluetoothServiceInfo; -class QBluetoothAddress; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothAddress) +QT_FORWARD_DECLARE_CLASS(QBluetoothServiceInfo) +QT_FORWARD_DECLARE_CLASS(QBluetoothServiceDiscoveryAgent) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class ServiceDiscoveryDialog : public QDialog { diff --git a/examples/bluetooth/bttennis/handover.h b/examples/bluetooth/bttennis/handover.h index 0a18850f..52d2fba6 100644 --- a/examples/bluetooth/bttennis/handover.h +++ b/examples/bluetooth/bttennis/handover.h @@ -48,15 +48,12 @@ #include <qbluetoothuuid.h> #include <qnfcglobal.h> -QT_BEGIN_NAMESPACE_NFC -class QNearFieldManager; -class QNearFieldTarget; -class QLlcpServer; -class QLlcpSocket; -QT_END_NAMESPACE_NFC +QT_FORWARD_DECLARE_CLASS(QNearFieldManager) +QT_FORWARD_DECLARE_CLASS(QNearFieldTarget) +QT_FORWARD_DECLARE_CLASS(QLlcpServer) +QT_FORWARD_DECLARE_CLASS(QLlcpSocket) -QT_USE_NAMESPACE_NFC -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class Handover : public QObject { diff --git a/examples/bluetooth/bttennis/tennis.h b/examples/bluetooth/bttennis/tennis.h index ac83fdd9..3b684dde 100644 --- a/examples/bluetooth/bttennis/tennis.h +++ b/examples/bluetooth/bttennis/tennis.h @@ -55,11 +55,9 @@ #include <QDebug> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothServiceDiscoveryAgent; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothServiceDiscoveryAgent) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE static const QLatin1String serviceUuid("e8e10f95-1a70-4b27-9ccf-02010264e9c9"); diff --git a/examples/bluetooth/bttennis/tennisclient.h b/examples/bluetooth/bttennis/tennisclient.h index f8d3dbe3..a6dd232e 100644 --- a/examples/bluetooth/bttennis/tennisclient.h +++ b/examples/bluetooth/bttennis/tennisclient.h @@ -49,15 +49,10 @@ #include <QtCore/QTime> #include <QtCore/QTimer> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothSocket; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothSocket) +QT_FORWARD_DECLARE_CLASS(QDataStream) -QT_BEGIN_NAMESPACE -class QDataStream; -QT_END_NAMESPACE - -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE //! [declaration] class TennisClient : public QObject diff --git a/examples/bluetooth/bttennis/tennisserver.h b/examples/bluetooth/bttennis/tennisserver.h index ca9e542a..6bdb13cd 100644 --- a/examples/bluetooth/bttennis/tennisserver.h +++ b/examples/bluetooth/bttennis/tennisserver.h @@ -51,13 +51,11 @@ #include <QtCore/QTime> #include <QtCore/QTimer> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothServer; -class QBluetoothSocket; -class QBluetoothServiceInfo; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothServer) +QT_FORWARD_DECLARE_CLASS(QBluetoothSocket) +QT_FORWARD_DECLARE_CLASS(QBluetoothServiceInfo) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE //! [declaration] class TennisServer : public QObject diff --git a/examples/nfc/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h index 0ac9cea6..863f0976 100644 --- a/examples/nfc/annotatedurl/annotatedurl.h +++ b/examples/nfc/annotatedurl/annotatedurl.h @@ -48,12 +48,12 @@ QT_FORWARD_DECLARE_CLASS(QUrl) QT_FORWARD_DECLARE_CLASS(QPixmap) -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldTarget; class QNdefMessage; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class AnnotatedUrl : public QObject { diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h index ea44e074..69e1e50f 100644 --- a/examples/nfc/ndefeditor/mainwindow.h +++ b/examples/nfc/ndefeditor/mainwindow.h @@ -47,12 +47,12 @@ #include <qnearfieldtarget.h> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldManager; class QNdefMessage; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h index fabfe5f6..150f11cd 100644 --- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h +++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h @@ -48,7 +48,7 @@ #include <qndefrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/nfc/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h index c5b51cc4..0da016ee 100644 --- a/examples/nfc/ndefeditor/textrecordeditor.h +++ b/examples/nfc/ndefeditor/textrecordeditor.h @@ -51,7 +51,7 @@ namespace Ui { } QT_END_NAMESPACE -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class TextRecordEditor : public QWidget { diff --git a/examples/nfc/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h index 02fc910e..aaf46b9a 100644 --- a/examples/nfc/ndefeditor/urirecordeditor.h +++ b/examples/nfc/ndefeditor/urirecordeditor.h @@ -52,7 +52,7 @@ namespace Ui { } QT_END_NAMESPACE -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class UriRecordEditor : public QWidget { diff --git a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp index 3b4e8800..6d160f52 100644 --- a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp +++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp @@ -43,7 +43,7 @@ //! [include] //! [namespace] -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE //! [namespace] //! [turningon] diff --git a/src/bluetooth/qbluetooth.cpp b/src/bluetooth/qbluetooth.cpp index 36c5ea0b..02ca7636 100644 --- a/src/bluetooth/qbluetooth.cpp +++ b/src/bluetooth/qbluetooth.cpp @@ -41,7 +41,7 @@ #include <QtBluetooth/qbluetooth.h> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE namespace QBluetooth { @@ -76,4 +76,4 @@ namespace QBluetooth { */ } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetooth.h b/src/bluetooth/qbluetooth.h index e15769c7..b13c0043 100644 --- a/src/bluetooth/qbluetooth.h +++ b/src/bluetooth/qbluetooth.h @@ -45,7 +45,7 @@ #include <QtBluetooth/qbluetoothglobal.h> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE namespace QBluetooth { enum Security { @@ -60,6 +60,6 @@ namespace QBluetooth { Q_DECLARE_OPERATORS_FOR_FLAGS(SecurityFlags) } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // QBLUETOOTH_H diff --git a/src/bluetooth/qbluetoothaddress.cpp b/src/bluetooth/qbluetoothaddress.cpp index fc42735d..9213a431 100644 --- a/src/bluetooth/qbluetoothaddress.cpp +++ b/src/bluetooth/qbluetoothaddress.cpp @@ -42,7 +42,7 @@ #include "qbluetoothaddress.h" #include "qbluetoothaddress_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothAddress @@ -216,4 +216,4 @@ QBluetoothAddressPrivate::QBluetoothAddressPrivate() m_address = 0; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothaddress.h b/src/bluetooth/qbluetoothaddress.h index 88875c89..db9e0a1a 100644 --- a/src/bluetooth/qbluetoothaddress.h +++ b/src/bluetooth/qbluetoothaddress.h @@ -48,7 +48,7 @@ #include <QtCore/QString> #include <QtCore/QMetaType> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothAddressPrivate; @@ -79,8 +79,8 @@ private: QBluetoothAddressPrivate *d_ptr; }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothAddress) +Q_DECLARE_METATYPE(QBluetoothAddress) #endif diff --git a/src/bluetooth/qbluetoothaddress_p.h b/src/bluetooth/qbluetoothaddress_p.h index 663bc993..bb25629e 100644 --- a/src/bluetooth/qbluetoothaddress_p.h +++ b/src/bluetooth/qbluetoothaddress_p.h @@ -44,7 +44,7 @@ #include "qbluetoothaddress.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothAddressPrivate { @@ -56,6 +56,6 @@ public: }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp index 64d0b1a0..69e52378 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp @@ -42,7 +42,7 @@ #include "qbluetoothdevicediscoveryagent.h" #include "qbluetoothdevicediscoveryagent_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothDeviceDiscoveryAgent @@ -239,5 +239,5 @@ QString QBluetoothDeviceDiscoveryAgent::errorString() const #include "moc_qbluetoothdevicediscoveryagent.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h index c3a00a69..170ef063 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h @@ -50,7 +50,7 @@ #include <QtBluetooth/QBluetoothAddress> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothDeviceDiscoveryAgentPrivate; @@ -108,6 +108,6 @@ private: #endif }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp index 2b4e7f93..d10dcc4b 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp @@ -50,7 +50,7 @@ //#define QT_DEVICEDISCOVERY_DEBUG -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) : lastError(QBluetoothDeviceDiscoveryAgent::NoError), m_adapterAddress(deviceAdapter), pendingCancel(false), pendingStart(false), @@ -229,4 +229,4 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_propertyChanged(const QString &na } } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index 638ff66e..b7184eeb 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -46,7 +46,7 @@ #define QT_DEVICEDISCOVERY_DEBUG -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) { @@ -91,4 +91,4 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_propertyChanged(const QString &na } #endif -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 3f9dd2b3..56a0c275 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -62,7 +62,7 @@ QT_END_NAMESPACE #include <QTimer> #endif -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothDeviceDiscoveryAgentPrivate #if defined(QT_QNX_BLUETOOTH) @@ -127,6 +127,6 @@ private: }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp index 2e63771e..b7928749 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp @@ -47,7 +47,7 @@ #include <QtCore/private/qcore_unix_p.h> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter): QObject(0), lastError(QBluetoothDeviceDiscoveryAgent::NoError), @@ -272,5 +272,5 @@ void QBluetoothDeviceDiscoveryAgentPrivate::processNextOp() } } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp index adbe8b2e..301e043f 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.cpp +++ b/src/bluetooth/qbluetoothdeviceinfo.cpp @@ -44,7 +44,7 @@ #include <QDebug> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothDeviceInfo @@ -538,4 +538,4 @@ void QBluetoothDeviceInfo::setCached(bool cached) d->cached = cached; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index 80bc562a..ab01b406 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -46,7 +46,7 @@ #include <QString> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothDeviceInfoPrivate; class QBluetoothAddress; @@ -241,6 +241,6 @@ private: Q_DECLARE_PRIVATE(QBluetoothDeviceInfo) }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothdeviceinfo_p.h b/src/bluetooth/qbluetoothdeviceinfo_p.h index 0156855a..b08a8fec 100644 --- a/src/bluetooth/qbluetoothdeviceinfo_p.h +++ b/src/bluetooth/qbluetoothdeviceinfo_p.h @@ -48,7 +48,7 @@ #include <QString> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothDeviceInfoPrivate { @@ -71,6 +71,6 @@ public: QList<QBluetoothUuid> serviceUuids; }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothglobal.h b/src/bluetooth/qbluetoothglobal.h index 95fcfadf..c2184eb4 100644 --- a/src/bluetooth/qbluetoothglobal.h +++ b/src/bluetooth/qbluetoothglobal.h @@ -43,18 +43,7 @@ #include <QtCore/qglobal.h> -#if defined(QT_NAMESPACE) -# define QT_PREPEND_NAMESPACE_BLUETOOTH(name) ::QT_NAMESPACE::QtBluetooth::name -# define QT_BEGIN_NAMESPACE_BLUETOOTH namespace QT_NAMESPACE { namespace QtBluetooth { -# define QT_END_NAMESPACE_BLUETOOTH } } -# define QT_USE_NAMESPACE_BLUETOOTH using namespace QT_NAMESPACE; using namespace QtBluetooth; -#else -# define QT_PREPEND_NAMESPACE_BLUETOOTH(name) ::QtBluetooth::name -# define QT_BEGIN_NAMESPACE_BLUETOOTH namespace QtBluetooth { -# define QT_END_NAMESPACE_BLUETOOTH } -# define QT_USE_NAMESPACE_BLUETOOTH using namespace QtBluetooth; -#endif - +QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QT_BUILD_BLUETOOTH_LIB) @@ -66,4 +55,6 @@ # define Q_BLUETOOTH_EXPORT #endif +QT_END_NAMESPACE + #endif // QTBLUETOOTH_H diff --git a/src/bluetooth/qbluetoothhostinfo.cpp b/src/bluetooth/qbluetoothhostinfo.cpp index 2c3ff8c1..1e8dbc2e 100644 --- a/src/bluetooth/qbluetoothhostinfo.cpp +++ b/src/bluetooth/qbluetoothhostinfo.cpp @@ -42,7 +42,7 @@ #include "qbluetoothhostinfo.h" #include "qbluetoothhostinfo_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothHostInfo @@ -117,4 +117,4 @@ void QBluetoothHostInfo::setName(const QString &name) d->m_name = name; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothhostinfo.h b/src/bluetooth/qbluetoothhostinfo.h index aab25a4d..24590ebb 100644 --- a/src/bluetooth/qbluetoothhostinfo.h +++ b/src/bluetooth/qbluetoothhostinfo.h @@ -45,7 +45,7 @@ #include <QtBluetooth/qbluetoothglobal.h> #include <QtBluetooth/QBluetoothAddress> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothHostInfoPrivate; class Q_BLUETOOTH_EXPORT QBluetoothHostInfo @@ -67,6 +67,6 @@ private: }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothhostinfo_p.h b/src/bluetooth/qbluetoothhostinfo_p.h index faba789f..2ce603c6 100644 --- a/src/bluetooth/qbluetoothhostinfo_p.h +++ b/src/bluetooth/qbluetoothhostinfo_p.h @@ -44,7 +44,7 @@ #include "qbluetoothhostinfo.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothHostInfoPrivate { @@ -55,6 +55,6 @@ public: QString m_name; }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp index e4180793..9661adcb 100644 --- a/src/bluetooth/qbluetoothlocaldevice.cpp +++ b/src/bluetooth/qbluetoothlocaldevice.cpp @@ -46,7 +46,7 @@ #include <QtCore/QString> #include <QDebug> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothLocalDevice @@ -247,4 +247,4 @@ bool QBluetoothLocalDevice::isValid() const #include "moc_qbluetoothlocaldevice.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index dfd92bca..713b5037 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -51,7 +51,7 @@ #include <QtBluetooth/QBluetoothHostInfo> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothLocalDevicePrivate; @@ -115,10 +115,10 @@ private: QBluetoothLocalDevicePrivate *d_ptr; }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::HostMode) -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::Pairing) -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::Error) +Q_DECLARE_METATYPE(QBluetoothLocalDevice::HostMode) +Q_DECLARE_METATYPE(QBluetoothLocalDevice::Pairing) +Q_DECLARE_METATYPE(QBluetoothLocalDevice::Error) #endif // QBLUETOOTHLOCALDEVICE_H diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp index 786d891b..e625d2f9 100644 --- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp @@ -51,7 +51,7 @@ #include "bluez/agent_p.h" #include "bluez/device_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE static const QLatin1String agentPath("/qt/agent"); @@ -569,4 +569,4 @@ void QBluetoothLocalDevicePrivate::PropertyChanged(QString property, QDBusVarian #include "moc_qbluetoothlocaldevice_p.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothlocaldevice_p.cpp b/src/bluetooth/qbluetoothlocaldevice_p.cpp index 604eb778..411863cb 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_p.cpp @@ -43,7 +43,7 @@ #include "qbluetoothlocaldevice.h" #include "qbluetoothaddress.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) : QObject(parent), d_ptr(0) @@ -102,4 +102,4 @@ void QBluetoothLocalDevice::pairingConfirmation(bool confirmation) Q_UNUSED(confirmation); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 9ca2c598..0f2aaca8 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -64,7 +64,7 @@ QT_END_NAMESPACE #include "qnx/ppshelpers_p.h" #endif -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothAddress; @@ -155,6 +155,6 @@ public: }; #endif -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // QBLUETOOTHLOCALDEVICE_P_H diff --git a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp index 29cf2b64..780639f6 100644 --- a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp @@ -44,7 +44,7 @@ #include "qbluetoothlocaldevice_p.h" #include "qnx/ppshelpers_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) : QObject(parent) @@ -306,4 +306,4 @@ void QBluetoothLocalDevicePrivate::controlEvent(ppsResult result) } } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserver.cpp b/src/bluetooth/qbluetoothserver.cpp index b4215f45..ee94e110 100644 --- a/src/bluetooth/qbluetoothserver.cpp +++ b/src/bluetooth/qbluetoothserver.cpp @@ -44,7 +44,7 @@ #include "qbluetoothsocket.h" #include "qbluetoothserviceinfo.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothServer @@ -250,4 +250,4 @@ int QBluetoothServer::maxPendingConnections() const #include "moc_qbluetoothserver.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h index a464fb85..f916f9ff 100644 --- a/src/bluetooth/qbluetoothserver.h +++ b/src/bluetooth/qbluetoothserver.h @@ -51,7 +51,7 @@ #include <QtBluetooth/QBluetoothSocket> #include <QtBluetooth/QBluetoothServiceInfo> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothServerPrivate; class QBluetoothSocket; @@ -100,6 +100,6 @@ private: #endif }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothserver_bluez.cpp b/src/bluetooth/qbluetoothserver_bluez.cpp index 82f9bc53..bf10e963 100644 --- a/src/bluetooth/qbluetoothserver_bluez.cpp +++ b/src/bluetooth/qbluetoothserver_bluez.cpp @@ -53,7 +53,7 @@ #include <errno.h> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE static inline void convertAddress(quint64 from, quint8 (&to)[6]) { @@ -312,4 +312,4 @@ QBluetooth::SecurityFlags QBluetoothServer::securityFlags() const return static_cast<QBluetooth::Security>(security); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserver_p.cpp b/src/bluetooth/qbluetoothserver_p.cpp index b502889f..9c1dfeaf 100644 --- a/src/bluetooth/qbluetoothserver_p.cpp +++ b/src/bluetooth/qbluetoothserver_p.cpp @@ -43,7 +43,7 @@ #include "qbluetoothserver_p.h" #include "qbluetoothsocket.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServer::ServerType sType) : serverType(sType) @@ -100,4 +100,4 @@ QBluetooth::SecurityFlags QBluetoothServer::securityFlags() const return QBluetooth::NoSecurity; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserver_p.h b/src/bluetooth/qbluetoothserver_p.h index a834e9ba..e2ff60a8 100644 --- a/src/bluetooth/qbluetoothserver_p.h +++ b/src/bluetooth/qbluetoothserver_p.h @@ -56,7 +56,7 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) #endif -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothAddress; class QBluetoothSocket; @@ -110,6 +110,6 @@ private Q_SLOTS: #endif }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothserver_qnx.cpp b/src/bluetooth/qbluetoothserver_qnx.cpp index a7c7f349..cc7528e0 100644 --- a/src/bluetooth/qbluetoothserver_qnx.cpp +++ b/src/bluetooth/qbluetoothserver_qnx.cpp @@ -49,7 +49,7 @@ #include <QCoreApplication> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE extern QHash<QBluetoothServerPrivate*, int> __fakeServerPorts; @@ -219,5 +219,5 @@ QBluetooth::SecurityFlags QBluetoothServer::securityFlags() const return d->securityFlags; //not used } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index 89149941..fa7cc376 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -44,7 +44,7 @@ #include "qbluetoothdevicediscoveryagent.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothServiceDiscoveryAgent @@ -439,4 +439,4 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_serviceDiscoveryFinished() #include "moc_qbluetoothservicediscoveryagent.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index 0a67030b..471ec81b 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -49,7 +49,7 @@ #include <QtBluetooth/QBluetoothServiceInfo> #include <QtBluetooth/QBluetoothUuid> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothAddress; class QBluetoothServiceDiscoveryAgentPrivate; @@ -111,6 +111,6 @@ private: #endif }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index 1474cc02..fdde28b7 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -54,7 +54,7 @@ #include <QtCore/QDebug> #endif -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) : error(QBluetoothServiceDiscoveryAgent::NoError), state(Inactive), deviceDiscoveryAgent(0), @@ -330,4 +330,4 @@ QVariant QBluetoothServiceDiscoveryAgentPrivate::readAttributeValue(QXmlStreamRe } } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp index 063fc4bd..47467463 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp @@ -42,7 +42,7 @@ #include "qbluetoothservicediscoveryagent.h" #include "qbluetoothservicediscoveryagent_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) { @@ -62,4 +62,4 @@ void QBluetoothServiceDiscoveryAgentPrivate::stop() { } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h index e19a090f..697fe662 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h @@ -66,7 +66,7 @@ QT_END_NAMESPACE #include <QTimer> #endif -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothDeviceDiscoveryAgent; @@ -159,6 +159,6 @@ protected: QBluetoothServiceDiscoveryAgent *q_ptr; }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp index 6c8d9f23..ffb1deee 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp @@ -52,7 +52,7 @@ #include <QtCore/private/qcore_unix_p.h> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) : m_rdfd(-1), rdNotifier(0), error(QBluetoothServiceDiscoveryAgent::NoError), state(Inactive), deviceAddress(deviceAdapter), @@ -238,4 +238,4 @@ void QBluetoothServiceDiscoveryAgentPrivate::queryTimeout() q->error(error); _q_serviceDiscoveryFinished(); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserviceinfo.cpp b/src/bluetooth/qbluetoothserviceinfo.cpp index 1f624c2b..8586bf38 100644 --- a/src/bluetooth/qbluetoothserviceinfo.cpp +++ b/src/bluetooth/qbluetoothserviceinfo.cpp @@ -44,7 +44,7 @@ #include <QUrl> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothServiceInfo::Sequence @@ -621,4 +621,4 @@ int QBluetoothServiceInfoPrivate::serverChannel() const return parameters.at(1).toUInt(); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h index 8d1d548e..507c7c1d 100644 --- a/src/bluetooth/qbluetoothserviceinfo.h +++ b/src/bluetooth/qbluetoothserviceinfo.h @@ -53,7 +53,7 @@ #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothServiceInfoPrivate; class QBluetoothDeviceInfo; @@ -155,14 +155,13 @@ protected: QSharedPointer<QBluetoothServiceInfoPrivate> d_ptr; }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo) -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo::Sequence) -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo::Alternative) -Q_DECLARE_METATYPE(QList<QtBluetooth::QBluetoothUuid>) +Q_DECLARE_METATYPE(QBluetoothServiceInfo) +Q_DECLARE_METATYPE(QBluetoothServiceInfo::Sequence) +Q_DECLARE_METATYPE(QBluetoothServiceInfo::Alternative) -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE inline void QBluetoothServiceInfo::setAttribute(quint16 attributeId, const QBluetoothUuid &value) { @@ -234,6 +233,6 @@ inline QList<QBluetoothUuid> QBluetoothServiceInfo::serviceClassUuids() const return attribute(ServiceClassIds).value<QList<QBluetoothUuid> >(); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp index e40d4421..885ac0ed 100644 --- a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp @@ -47,7 +47,7 @@ #include <QtCore/QXmlStreamWriter> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE static void writeAttribute(QXmlStreamWriter *stream, const QVariant &attribute) { @@ -290,4 +290,4 @@ bool QBluetoothServiceInfoPrivate::registerService() const return true; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserviceinfo_p.cpp b/src/bluetooth/qbluetoothserviceinfo_p.cpp index ebb64f53..13bc8fd5 100644 --- a/src/bluetooth/qbluetoothserviceinfo_p.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_p.cpp @@ -42,7 +42,7 @@ #include "qbluetoothserviceinfo.h" #include "qbluetoothserviceinfo_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothServiceInfoPrivate::QBluetoothServiceInfoPrivate() { @@ -79,4 +79,4 @@ void QBluetoothServiceInfoPrivate::removeRegisteredAttribute(quint16 attributeId Q_UNUSED(attributeId); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserviceinfo_p.h b/src/bluetooth/qbluetoothserviceinfo_p.h index 103a7617..0e263fe6 100644 --- a/src/bluetooth/qbluetoothserviceinfo_p.h +++ b/src/bluetooth/qbluetoothserviceinfo_p.h @@ -51,7 +51,7 @@ class OrgBluezServiceInterface; -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothServiceInfo; @@ -87,6 +87,6 @@ private: mutable bool registered; }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothserviceinfo_qnx.cpp b/src/bluetooth/qbluetoothserviceinfo_qnx.cpp index 72c4e499..cb82851c 100644 --- a/src/bluetooth/qbluetoothserviceinfo_qnx.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_qnx.cpp @@ -45,7 +45,7 @@ #include "qbluetoothserver_p.h" #include "qbluetoothserver.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothServiceInfoPrivate::QBluetoothServiceInfoPrivate() : registered(false) @@ -111,4 +111,4 @@ bool QBluetoothServiceInfoPrivate::registerService() const return true; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index 380cb7b9..24ecbc2a 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -50,7 +50,7 @@ #include <QDebug> #include <QSocketNotifier> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothSocket @@ -679,4 +679,4 @@ QDebug operator<<(QDebug debug, QBluetoothSocket::SocketState state) #include "moc_qbluetoothsocket.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index adf8a22a..77241ce9 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -50,7 +50,7 @@ #include <QIODevice> #include <QtNetwork/QAbstractSocket> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothSocketPrivate; class QBluetoothServiceInfo; @@ -171,6 +171,6 @@ Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketError); Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketState); #endif -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index 2a0e9173..fc5661ae 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -58,7 +58,7 @@ #include <QtCore/QSocketNotifier> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothSocketPrivate::QBluetoothSocketPrivate() : socket(-1), @@ -549,4 +549,4 @@ qint64 QBluetoothSocketPrivate::bytesAvailable() const return buffer.size(); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp index ce4dd4c7..91fbfb40 100644 --- a/src/bluetooth/qbluetoothsocket_p.cpp +++ b/src/bluetooth/qbluetoothsocket_p.cpp @@ -42,7 +42,7 @@ #include "qbluetoothsocket.h" #include "qbluetoothsocket_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothSocketPrivate::QBluetoothSocketPrivate() { @@ -145,4 +145,4 @@ qint64 QBluetoothSocketPrivate::bytesAvailable() const return 0; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h index 3fed921f..a3373c95 100644 --- a/src/bluetooth/qbluetoothsocket_p.h +++ b/src/bluetooth/qbluetoothsocket_p.h @@ -57,7 +57,7 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothServiceDiscoveryAgent; @@ -184,6 +184,6 @@ static inline void convertAddress(quint8 (&from)[6], quint64 &to) (quint64(from[5]) << 40); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif diff --git a/src/bluetooth/qbluetoothsocket_qnx.cpp b/src/bluetooth/qbluetoothsocket_qnx.cpp index 3bd56fdc..4197c4d9 100644 --- a/src/bluetooth/qbluetoothsocket_qnx.cpp +++ b/src/bluetooth/qbluetoothsocket_qnx.cpp @@ -44,7 +44,7 @@ #include "qbluetoothlocaldevice.h" #include <sys/stat.h> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothSocketPrivate::QBluetoothSocketPrivate() : socket(-1), @@ -358,5 +358,5 @@ void QBluetoothSocketPrivate::controlEvent(ppsResult result) } } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp index d1067731..6b3dd89f 100644 --- a/src/bluetooth/qbluetoothtransfermanager.cpp +++ b/src/bluetooth/qbluetoothtransfermanager.cpp @@ -42,7 +42,7 @@ #include "qbluetoothtransfermanager.h" #include "qbluetoothtransferrequest.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothTransferManager @@ -85,4 +85,4 @@ QBluetoothTransferManager::~QBluetoothTransferManager() #include "moc_qbluetoothtransfermanager.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h index 1ede6f41..520e0d73 100644 --- a/src/bluetooth/qbluetoothtransfermanager.h +++ b/src/bluetooth/qbluetoothtransfermanager.h @@ -49,7 +49,7 @@ QT_FORWARD_DECLARE_CLASS(QIODevice) -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothTransferReply; class QBluetoothTransferRequest; @@ -70,6 +70,6 @@ Q_SIGNALS: }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // QBLUETOOTHTRANSFERMANAGER_H diff --git a/src/bluetooth/qbluetoothtransfermanager_bluez.cpp b/src/bluetooth/qbluetoothtransfermanager_bluez.cpp index c43aed81..a6fce5d4 100644 --- a/src/bluetooth/qbluetoothtransfermanager_bluez.cpp +++ b/src/bluetooth/qbluetoothtransfermanager_bluez.cpp @@ -44,7 +44,7 @@ #include "qbluetoothtransferreply.h" #include "qbluetoothtransferreply_bluez_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransferRequest &request, QIODevice *data) @@ -54,4 +54,4 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer return rep; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransfermanager_p.cpp b/src/bluetooth/qbluetoothtransfermanager_p.cpp index 0d3168da..561a0c32 100644 --- a/src/bluetooth/qbluetoothtransfermanager_p.cpp +++ b/src/bluetooth/qbluetoothtransfermanager_p.cpp @@ -43,7 +43,7 @@ #include "qbluetoothtransferrequest.h" #include "qbluetoothtransferreply.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransferRequest &request, QIODevice *data) @@ -53,4 +53,4 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer return 0; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransfermanager_qnx.cpp b/src/bluetooth/qbluetoothtransfermanager_qnx.cpp index 1b9b9693..8a9d7a3c 100644 --- a/src/bluetooth/qbluetoothtransfermanager_qnx.cpp +++ b/src/bluetooth/qbluetoothtransfermanager_qnx.cpp @@ -42,7 +42,7 @@ #include "qbluetoothtransferreply_qnx_p.h" #include <QDebug> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransferRequest &request, QIODevice *data) @@ -52,4 +52,4 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer return reply; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferreply.cpp b/src/bluetooth/qbluetoothtransferreply.cpp index a7c9c003..ae97c639 100644 --- a/src/bluetooth/qbluetoothtransferreply.cpp +++ b/src/bluetooth/qbluetoothtransferreply.cpp @@ -43,7 +43,7 @@ #include "qbluetoothtransferreply_p.h" #include "qbluetoothaddress.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothTransferReply @@ -184,4 +184,4 @@ QBluetoothTransferReplyPrivate::QBluetoothTransferReplyPrivate() #include "moc_qbluetoothtransferreply.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h index f9200c05..42571ca4 100644 --- a/src/bluetooth/qbluetoothtransferreply.h +++ b/src/bluetooth/qbluetoothtransferreply.h @@ -47,7 +47,7 @@ #include <QtBluetooth/QBluetoothTransferRequest> #include <QtBluetooth/QBluetoothTransferManager> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothTransferReplyPrivate; @@ -97,8 +97,6 @@ private: }; -QT_END_NAMESPACE_BLUETOOTH - -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothTransferReply *) +QT_END_NAMESPACE #endif // QBLUETOOTHTRANSFERREPLY_H diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp index d5871b89..468f2d80 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp +++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp @@ -55,7 +55,7 @@ static const QLatin1String agentPath("/qt/agent"); -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothTransferReplyBluez::QBluetoothTransferReplyBluez(QIODevice *input, const QBluetoothTransferRequest &request, QBluetoothTransferManager *parent) @@ -272,4 +272,4 @@ void QBluetoothTransferReplyBluez::abort() #include "moc_qbluetoothtransferreply_bluez_p.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferreply_bluez_p.h b/src/bluetooth/qbluetoothtransferreply_bluez_p.h index c476136f..b1fe795e 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez_p.h +++ b/src/bluetooth/qbluetoothtransferreply_bluez_p.h @@ -54,7 +54,7 @@ class OrgOpenobexClientInterface; class OrgOpenobexManagerInterface; class AgentAdaptor; -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyBluez : public QBluetoothTransferReply { @@ -112,6 +112,6 @@ public slots: }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // QBLUETOOTHTRANSFERREPLY_H diff --git a/src/bluetooth/qbluetoothtransferreply_p.h b/src/bluetooth/qbluetoothtransferreply_p.h index 71a3e474..afd7e622 100644 --- a/src/bluetooth/qbluetoothtransferreply_p.h +++ b/src/bluetooth/qbluetoothtransferreply_p.h @@ -44,7 +44,7 @@ #include "qbluetoothtransferreply.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyPrivate { @@ -60,6 +60,6 @@ public: }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // QBLUETOOTHTRANSFERREPLY_H diff --git a/src/bluetooth/qbluetoothtransferreply_qnx.cpp b/src/bluetooth/qbluetoothtransferreply_qnx.cpp index 5124906b..56e2c3e3 100644 --- a/src/bluetooth/qbluetoothtransferreply_qnx.cpp +++ b/src/bluetooth/qbluetoothtransferreply_qnx.cpp @@ -58,7 +58,7 @@ //static const QLatin1String agentPath("/shared/tmp/opp"); -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE QBluetoothTransferReplyQnx::QBluetoothTransferReplyQnx(QIODevice *input, const QBluetoothTransferRequest &request, QBluetoothTransferManager *parent) @@ -231,4 +231,4 @@ void QBluetoothTransferReplyQnx::abort() #include "moc_qbluetoothtransferreply_qnx_p.cpp" -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferreply_qnx_p.h b/src/bluetooth/qbluetoothtransferreply_qnx_p.h index 430ee4e6..4522c8bf 100644 --- a/src/bluetooth/qbluetoothtransferreply_qnx_p.h +++ b/src/bluetooth/qbluetoothtransferreply_qnx_p.h @@ -55,7 +55,7 @@ #include "qnx/ppshelpers_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyQnx : public QBluetoothTransferReply { @@ -97,6 +97,6 @@ public slots: void abort(); }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // QBLUETOOTHTRANSFERREPLY_QNX_P_H diff --git a/src/bluetooth/qbluetoothtransferrequest.cpp b/src/bluetooth/qbluetoothtransferrequest.cpp index 30bfd036..4317b08c 100644 --- a/src/bluetooth/qbluetoothtransferrequest.cpp +++ b/src/bluetooth/qbluetoothtransferrequest.cpp @@ -44,7 +44,7 @@ #include "qbluetoothtransferrequest_p.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE /*! \class QBluetoothTransferRequest @@ -181,4 +181,4 @@ QBluetoothTransferRequestPrivate::QBluetoothTransferRequestPrivate() { } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferrequest.h b/src/bluetooth/qbluetoothtransferrequest.h index 0d4c7f88..45a3bc76 100644 --- a/src/bluetooth/qbluetoothtransferrequest.h +++ b/src/bluetooth/qbluetoothtransferrequest.h @@ -48,7 +48,7 @@ #include <QtCore/QtGlobal> #include <QtCore/QVariant> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothAddress; class QBluetoothTransferRequestPrivate; @@ -85,6 +85,6 @@ private: }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // QBLUETOOTHTRANSFERREQUEST_H diff --git a/src/bluetooth/qbluetoothtransferrequest_p.h b/src/bluetooth/qbluetoothtransferrequest_p.h index 5715b838..2e67a7a4 100644 --- a/src/bluetooth/qbluetoothtransferrequest_p.h +++ b/src/bluetooth/qbluetoothtransferrequest_p.h @@ -45,7 +45,7 @@ #include <QtBluetooth/qbluetoothglobal.h> #include "qbluetoothtransferrequest.h" -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class QBluetoothAddress; @@ -58,6 +58,6 @@ public: QMap<int, QVariant> m_parameters; }; -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // QBLUETOOTHTRANSFERREQUESTPRIVATE_H diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp index fb38f0a3..5426e943 100644 --- a/src/bluetooth/qbluetoothuuid.cpp +++ b/src/bluetooth/qbluetoothuuid.cpp @@ -51,7 +51,7 @@ //#include <netinet/in.h> #include <string.h> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE // Bluetooth base UUID 00000000-0000-1000-8000-00805F9B34FB // TODO: make more efficient @@ -358,4 +358,4 @@ bool QBluetoothUuid::operator==(const QBluetoothUuid &other) const return QUuid::operator==(other); } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index 23361d16..ef69e983 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -50,7 +50,7 @@ #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE struct quint128 { @@ -172,8 +172,8 @@ inline QDebug operator<<(QDebug debug, const QBluetoothUuid &uuid) return debug; } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QtBluetooth::QBluetoothUuid) +Q_DECLARE_METATYPE(QBluetoothUuid) #endif diff --git a/src/bluetooth/qnx/ppshelpers.cpp b/src/bluetooth/qnx/ppshelpers.cpp index 6f6ba344..4acb36ef 100644 --- a/src/bluetooth/qnx/ppshelpers.cpp +++ b/src/bluetooth/qnx/ppshelpers.cpp @@ -45,7 +45,7 @@ #include "../qbluetoothserver_p.h" #include <QTimer> -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE static int count = 0; @@ -454,4 +454,4 @@ void ppsUnregisterForEvent(const QString &str, QObject *obj) } } -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE diff --git a/src/bluetooth/qnx/ppshelpers_p.h b/src/bluetooth/qnx/ppshelpers_p.h index 3e7293f2..1633bab8 100644 --- a/src/bluetooth/qnx/ppshelpers_p.h +++ b/src/bluetooth/qnx/ppshelpers_p.h @@ -72,7 +72,7 @@ #define BT_SPP_SERVER_SUBTYPE 1 #define BT_SPP_CLIENT_SUBTYPE 2 -QT_BEGIN_NAMESPACE_BLUETOOTH +QT_BEGIN_NAMESPACE class BBSocketNotifier : public QObject { @@ -127,6 +127,6 @@ void ppsRegisterForEvent(const QString &evt, QObject *obj); void ppsUnregisterForEvent(const QString &evt, QObject *obj); -QT_END_NAMESPACE_BLUETOOTH +QT_END_NAMESPACE #endif // PPSHELPERS_H diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h index 47ad3d86..8cc76817 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h @@ -53,7 +53,7 @@ #include "qdeclarativebluetoothservice_p.h" -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class QDeclarativeBluetoothDiscoveryModelPrivate; class QDeclarativeBluetoothDiscoveryModel : public QAbstractListModel, public QQmlParserStatus diff --git a/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp b/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp index 74883d80..97f5f477 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp @@ -47,7 +47,7 @@ #include "qdeclarativebluetoothimageprovider_p.h" -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE // This is run in a low priority thread. QImage BluetoothThumbnailImageProvider::requestImage(const QString &id, QSize *size, const QSize &req_size) diff --git a/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h b/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h index 8d82dbbe..1d4a8cda 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h @@ -44,7 +44,7 @@ #include <qbluetoothserviceinfo.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class BluetoothThumbnailImageProvider : public QQuickImageProvider diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice_p.h b/src/imports/bluetooth/qdeclarativebluetoothservice_p.h index 7d91e5c1..a4b300a1 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothservice_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothservice_p.h @@ -49,7 +49,7 @@ class QDeclarativeBluetoothSocket; -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class QDeclarativeBluetoothServicePrivate; diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h index 30cd28fd..6e00d6ce 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h @@ -50,7 +50,7 @@ #include "qdeclarativebluetoothservice_p.h" -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class QDeclarativeBluetoothSocketPrivate; class QDeclarativeBluetoothService; diff --git a/src/imports/nfc/qdeclarativendefmimerecord_p.h b/src/imports/nfc/qdeclarativendefmimerecord_p.h index c29b4666..bad83235 100644 --- a/src/imports/nfc/qdeclarativendefmimerecord_p.h +++ b/src/imports/nfc/qdeclarativendefmimerecord_p.h @@ -44,7 +44,7 @@ #include <qdeclarativendefrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class QDeclarativeNdefMimeRecord : public QDeclarativeNdefRecord { diff --git a/src/imports/nfc/qdeclarativendeftextrecord_p.h b/src/imports/nfc/qdeclarativendeftextrecord_p.h index 41f51a77..8701ab17 100644 --- a/src/imports/nfc/qdeclarativendeftextrecord_p.h +++ b/src/imports/nfc/qdeclarativendeftextrecord_p.h @@ -46,7 +46,7 @@ #include <qndefnfctextrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class QDeclarativeNdefTextRecord : public QDeclarativeNdefRecord { diff --git a/src/imports/nfc/qdeclarativendefurirecord_p.h b/src/imports/nfc/qdeclarativendefurirecord_p.h index 7d27e3f9..b935a55b 100644 --- a/src/imports/nfc/qdeclarativendefurirecord_p.h +++ b/src/imports/nfc/qdeclarativendefurirecord_p.h @@ -48,7 +48,7 @@ #include <QtCore/QMetaType> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class QDeclarativeNdefUriRecord : public QDeclarativeNdefRecord { diff --git a/src/imports/nfc/qdeclarativenearfield_p.h b/src/imports/nfc/qdeclarativenearfield_p.h index 9c62449f..d3f4b50f 100644 --- a/src/imports/nfc/qdeclarativenearfield_p.h +++ b/src/imports/nfc/qdeclarativenearfield_p.h @@ -50,7 +50,7 @@ #include "qdeclarativendefrecord.h" -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class QDeclarativeNdefFilter; class QDeclarativeNearField : public QObject, public QQmlParserStatus diff --git a/src/imports/nfc/qdeclarativenearfieldsocket_p.h b/src/imports/nfc/qdeclarativenearfieldsocket_p.h index 39e220e3..16fca41e 100644 --- a/src/imports/nfc/qdeclarativenearfieldsocket_p.h +++ b/src/imports/nfc/qdeclarativenearfieldsocket_p.h @@ -47,7 +47,7 @@ #include <QtQml/QQmlParserStatus> #include <QtNfc/QLlcpSocket> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class QDeclarativeNearFieldSocketPrivate; diff --git a/src/nfc/doc/snippets/doc_src_qtnfc.cpp b/src/nfc/doc/snippets/doc_src_qtnfc.cpp index 82857ca1..b7b0dfc4 100644 --- a/src/nfc/doc/snippets/doc_src_qtnfc.cpp +++ b/src/nfc/doc/snippets/doc_src_qtnfc.cpp @@ -43,6 +43,6 @@ //! [include] //! [namespace] -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE //! [namespace] diff --git a/src/nfc/doc/snippets/foorecord.h b/src/nfc/doc/snippets/foorecord.h index ab5f439d..c6432361 100644 --- a/src/nfc/doc/snippets/foorecord.h +++ b/src/nfc/doc/snippets/foorecord.h @@ -43,7 +43,7 @@ #include <qdeclarativendefrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE //! [Foo declaration] class QDeclarativeNdefFooRecord : public QDeclarativeNdefRecord diff --git a/src/nfc/doc/snippets/nfc.cpp b/src/nfc/doc/snippets/nfc.cpp index 2091ad08..347b7a6f 100644 --- a/src/nfc/doc/snippets/nfc.cpp +++ b/src/nfc/doc/snippets/nfc.cpp @@ -43,7 +43,7 @@ #include <QtCore/QDebug> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE void snippet_recordConversion() { diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp index c9a4c2d7..e9e741c5 100644 --- a/src/nfc/qdeclarativendefrecord.cpp +++ b/src/nfc/qdeclarativendefrecord.cpp @@ -44,7 +44,7 @@ #include <QtCore/QMap> #include <QtCore/QRegExp> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QDeclarativeNdefRecord @@ -288,4 +288,4 @@ void QDeclarativeNdefRecord::setRecord(const QNdefRecord &record) emit recordChanged(); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qdeclarativendefrecord.h b/src/nfc/qdeclarativendefrecord.h index ae297ebe..ab7031f4 100644 --- a/src/nfc/qdeclarativendefrecord.h +++ b/src/nfc/qdeclarativendefrecord.h @@ -46,7 +46,7 @@ #include <QtCore/QMetaType> #include <QtNfc/QNdefRecord> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QDeclarativeNdefRecordPrivate; @@ -93,6 +93,6 @@ bool qRegisterNdefRecordType(QNdefRecord::TypeNameFormat typeNameFormat, const Q #define Q_DECLARE_NDEFRECORD(className, typeNameFormat, type) \ static bool _q_##className##_registered = qRegisterNdefRecordType<className>(typeNameFormat, type); -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QDECLARATIVENDEFRECORD_P_H diff --git a/src/nfc/qllcpserver.cpp b/src/nfc/qllcpserver.cpp index a1041236..77215a1a 100644 --- a/src/nfc/qllcpserver.cpp +++ b/src/nfc/qllcpserver.cpp @@ -49,7 +49,7 @@ #include "qllcpserver_p.h" #endif -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QLlcpServer @@ -198,4 +198,4 @@ QLlcpSocket::SocketError QLlcpServer::serverError() const return d->serverError(); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qllcpserver.h b/src/nfc/qllcpserver.h index eec3df24..5798043e 100644 --- a/src/nfc/qllcpserver.h +++ b/src/nfc/qllcpserver.h @@ -46,7 +46,7 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QLlcpSocket> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QLlcpServerPrivate; @@ -80,6 +80,6 @@ private: QLlcpServerPrivate *d_ptr; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QLLCPSERVER_H diff --git a/src/nfc/qllcpserver_p.cpp b/src/nfc/qllcpserver_p.cpp index 3ec2ca51..7f2fd638 100644 --- a/src/nfc/qllcpserver_p.cpp +++ b/src/nfc/qllcpserver_p.cpp @@ -41,7 +41,7 @@ #include "qllcpserver_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q) : q_ptr(q) @@ -93,4 +93,4 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const return QLlcpSocket::UnknownSocketError; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qllcpserver_p.h b/src/nfc/qllcpserver_p.h index b39b584d..00b4c3ac 100644 --- a/src/nfc/qllcpserver_p.h +++ b/src/nfc/qllcpserver_p.h @@ -46,7 +46,7 @@ #include "qllcpserver.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QLlcpServerPrivate { @@ -73,6 +73,6 @@ private: QLlcpServer *q_ptr; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QLLCPSERVER_P_H diff --git a/src/nfc/qllcpserver_qnx_p.cpp b/src/nfc/qllcpserver_qnx_p.cpp index 849fba7f..f0b56d15 100644 --- a/src/nfc/qllcpserver_qnx_p.cpp +++ b/src/nfc/qllcpserver_qnx_p.cpp @@ -42,7 +42,7 @@ #include "qllcpserver_qnx_p.h" #include "qnx/qnxnfcmanager_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q) : q_ptr(q), m_llcpSocket(0), m_connected(false), m_conListener(0) @@ -123,6 +123,6 @@ void QLlcpServerPrivate::connected(nfc_target_t *target) m_llcpSocket->bind(serverPort()); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qllcpserver_qnx_p.h b/src/nfc/qllcpserver_qnx_p.h index 22ba98e6..e7764441 100644 --- a/src/nfc/qllcpserver_qnx_p.h +++ b/src/nfc/qllcpserver_qnx_p.h @@ -45,7 +45,7 @@ #include "qllcpserver.h" #include "nfc/nfc.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QLlcpServerPrivate : public QObject { @@ -78,6 +78,6 @@ private: nfc_target_t *m_target; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QLLCPSERVER_QNX_P_H diff --git a/src/nfc/qllcpserver_simulator_p.cpp b/src/nfc/qllcpserver_simulator_p.cpp index 81f28b6d..59ab0af8 100644 --- a/src/nfc/qllcpserver_simulator_p.cpp +++ b/src/nfc/qllcpserver_simulator_p.cpp @@ -41,7 +41,7 @@ #include "qllcpserver_simulator_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q) : q_ptr(q) @@ -89,4 +89,4 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const return QLlcpSocket::UnknownSocketError; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qllcpserver_simulator_p.h b/src/nfc/qllcpserver_simulator_p.h index 85f84cd5..93590a60 100644 --- a/src/nfc/qllcpserver_simulator_p.h +++ b/src/nfc/qllcpserver_simulator_p.h @@ -46,7 +46,7 @@ #include "qllcpserver.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QLlcpServerPrivate { @@ -70,6 +70,6 @@ private: QLlcpServer *q_ptr; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QLLCPSERVER_P_H diff --git a/src/nfc/qllcpsocket.cpp b/src/nfc/qllcpsocket.cpp index 8626395d..f9cacd24 100644 --- a/src/nfc/qllcpsocket.cpp +++ b/src/nfc/qllcpsocket.cpp @@ -49,7 +49,7 @@ #include "qllcpsocket_p.h" #endif -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QLlcpSocket @@ -400,4 +400,4 @@ qint64 QLlcpSocket::writeData(const char *data, qint64 len) return d->writeData(data, len); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qllcpsocket.h b/src/nfc/qllcpsocket.h index 4b148e40..e3f914d8 100644 --- a/src/nfc/qllcpsocket.h +++ b/src/nfc/qllcpsocket.h @@ -46,7 +46,7 @@ #include <QtNetwork/QAbstractSocket> #include <QtNfc/qnfcglobal.h> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldTarget; class QLlcpSocketPrivate; @@ -126,6 +126,6 @@ private: QLlcpSocketPrivate *d_ptr; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QLLCPSOCKET_H diff --git a/src/nfc/qllcpsocket_p.cpp b/src/nfc/qllcpsocket_p.cpp index 6e426505..27418d12 100644 --- a/src/nfc/qllcpsocket_p.cpp +++ b/src/nfc/qllcpsocket_p.cpp @@ -41,7 +41,7 @@ #include "qllcpsocket_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q) : q_ptr(q) @@ -191,4 +191,4 @@ bool QLlcpSocketPrivate::waitForDisconnected(int msecs) return false; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h index 1ec49b5a..7f741f14 100644 --- a/src/nfc/qllcpsocket_p.h +++ b/src/nfc/qllcpsocket_p.h @@ -46,7 +46,7 @@ #include "qllcpsocket.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QLlcpSocketPrivate { @@ -92,6 +92,6 @@ private: QLlcpSocket *q_ptr; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QLLCPSOCKET_P_H diff --git a/src/nfc/qllcpsocket_qnx_p.cpp b/src/nfc/qllcpsocket_qnx_p.cpp index beecfa17..d74e68d8 100644 --- a/src/nfc/qllcpsocket_qnx_p.cpp +++ b/src/nfc/qllcpsocket_qnx_p.cpp @@ -42,7 +42,7 @@ #include "qllcpsocket_qnx_p.h" #include <unistd.h> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q) : q_ptr(q), m_conListener(0), m_state(QLlcpSocket::UnconnectedState), m_server(false) @@ -313,5 +313,5 @@ void QLlcpSocketPrivate::enteringIdle() } } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qllcpsocket_qnx_p.h b/src/nfc/qllcpsocket_qnx_p.h index 88e18942..fc39b07e 100644 --- a/src/nfc/qllcpsocket_qnx_p.h +++ b/src/nfc/qllcpsocket_qnx_p.h @@ -46,7 +46,7 @@ #include "qnearfieldtarget_qnx_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QLlcpSocketPrivate : public QObject { @@ -120,6 +120,6 @@ private Q_SLOTS: void enteringIdle(); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QLLCPSOCKET_QNX_P_H diff --git a/src/nfc/qllcpsocket_simulator_p.cpp b/src/nfc/qllcpsocket_simulator_p.cpp index abfa9fc6..edef7584 100644 --- a/src/nfc/qllcpsocket_simulator_p.cpp +++ b/src/nfc/qllcpsocket_simulator_p.cpp @@ -41,7 +41,7 @@ #include "qllcpsocket_simulator_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q) : q_ptr(q) @@ -186,4 +186,4 @@ bool QLlcpSocketPrivate::waitForDisconnected(int msecs) return false; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qllcpsocket_simulator_p.h b/src/nfc/qllcpsocket_simulator_p.h index e383c9fb..7d29c242 100644 --- a/src/nfc/qllcpsocket_simulator_p.h +++ b/src/nfc/qllcpsocket_simulator_p.h @@ -46,7 +46,7 @@ #include "qllcpsocket.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QLlcpSocketPrivate { @@ -90,6 +90,6 @@ private: QLlcpSocket *q_ptr; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QLLCPSOCKET_P_H diff --git a/src/nfc/qndeffilter.cpp b/src/nfc/qndeffilter.cpp index 8a7a0ac8..27d08e20 100644 --- a/src/nfc/qndeffilter.cpp +++ b/src/nfc/qndeffilter.cpp @@ -43,7 +43,7 @@ #include <QtCore/QList> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNdefFilter @@ -201,4 +201,4 @@ int QNdefFilter::recordCount() const return d->filterRecords.count(); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h index b5e891c6..5b121cc2 100644 --- a/src/nfc/qndeffilter.h +++ b/src/nfc/qndeffilter.h @@ -46,7 +46,7 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNdefFilterPrivate; class Q_NFC_EXPORT QNdefFilter @@ -91,6 +91,6 @@ void QNdefFilter::appendRecord(unsigned int min, unsigned int max) appendRecord(record.typeNameFormat(), record.type(), min, max); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNDEFFILTER_H diff --git a/src/nfc/qndefmessage.cpp b/src/nfc/qndefmessage.cpp index ae4342c9..99eb7ce2 100644 --- a/src/nfc/qndefmessage.cpp +++ b/src/nfc/qndefmessage.cpp @@ -42,7 +42,7 @@ #include "qndefmessage.h" #include "qndefrecord_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNdefMessage @@ -321,4 +321,4 @@ QByteArray QNdefMessage::toByteArray() const return m; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qndefmessage.h b/src/nfc/qndefmessage.h index 9b402d5e..66a2f260 100644 --- a/src/nfc/qndefmessage.h +++ b/src/nfc/qndefmessage.h @@ -49,7 +49,7 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class Q_NFC_EXPORT QNdefMessage : public QList<QNdefRecord> { @@ -66,8 +66,8 @@ public: static QNdefMessage fromByteArray(const QByteArray &message); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QtNfc::QNdefMessage) +Q_DECLARE_METATYPE(QNdefMessage) #endif // QNDEFMESSAGE_H diff --git a/src/nfc/qndefnfcsmartposterrecord.cpp b/src/nfc/qndefnfcsmartposterrecord.cpp index e17844c4..f2e9f1d5 100644 --- a/src/nfc/qndefnfcsmartposterrecord.cpp +++ b/src/nfc/qndefnfcsmartposterrecord.cpp @@ -47,7 +47,7 @@ #include <QtCore/QStringList> #include <QtCore/QUrl> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNdefNfcSmartPosterRecord @@ -737,4 +737,4 @@ QByteArray QNdefNfcTypeRecord::typeInfo() const return payload(); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qndefnfcsmartposterrecord.h b/src/nfc/qndefnfcsmartposterrecord.h index 82f26e36..c317c92f 100644 --- a/src/nfc/qndefnfcsmartposterrecord.h +++ b/src/nfc/qndefnfcsmartposterrecord.h @@ -50,17 +50,17 @@ QT_FORWARD_DECLARE_CLASS(QUrl) -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNdefNfcSmartPosterRecordPrivate; #define Q_DECLARE_ISRECORDTYPE_FOR_MIME_NDEF_RECORD(className) \ - QT_BEGIN_NAMESPACE_NFC \ + QT_BEGIN_NAMESPACE \ template<> inline bool QNdefRecord::isRecordType<className>() const\ { \ return (typeNameFormat() == QNdefRecord::Mime); \ } \ - QT_END_NAMESPACE_NFC + QT_END_NAMESPACE #define Q_DECLARE_MIME_NDEF_RECORD(className, initialPayload) \ className() : QNdefRecord(QNdefRecord::Mime, "") { setPayload(initialPayload); } \ @@ -145,7 +145,7 @@ private: void addIconInternal(const QNdefNfcIconRecord &icon); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcSmartPosterRecord, QNdefRecord::NfcRtd, "Sp") Q_DECLARE_ISRECORDTYPE_FOR_MIME_NDEF_RECORD(QNdefNfcIconRecord) diff --git a/src/nfc/qndefnfcsmartposterrecord_p.h b/src/nfc/qndefnfcsmartposterrecord_p.h index abe0587b..83e727c5 100644 --- a/src/nfc/qndefnfcsmartposterrecord_p.h +++ b/src/nfc/qndefnfcsmartposterrecord_p.h @@ -42,7 +42,7 @@ #ifndef QNDEFNFCSMARTPOSTERRECORD_P_H #define QNDEFNFCSMARTPOSTERRECORD_P_H -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNdefNfcActRecord : public QNdefRecord { @@ -85,7 +85,7 @@ public: QNdefNfcTypeRecord *m_type; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcActRecord, QNdefRecord::NfcRtd, "act") Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcSizeRecord, QNdefRecord::NfcRtd, "s") diff --git a/src/nfc/qndefnfctextrecord.cpp b/src/nfc/qndefnfctextrecord.cpp index 212f804f..e22c35e6 100644 --- a/src/nfc/qndefnfctextrecord.cpp +++ b/src/nfc/qndefnfctextrecord.cpp @@ -44,7 +44,7 @@ #include <QtCore/QTextCodec> #include <QtCore/QLocale> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNdefNfcTextRecord @@ -200,4 +200,4 @@ void QNdefNfcTextRecord::setEncoding(Encoding encoding) setText(string); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h index dffafe22..30e0eeb4 100644 --- a/src/nfc/qndefnfctextrecord.h +++ b/src/nfc/qndefnfctextrecord.h @@ -45,7 +45,7 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class Q_NFC_EXPORT QNdefNfcTextRecord : public QNdefRecord { @@ -72,7 +72,7 @@ public: void setEncoding(Encoding encoding); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcTextRecord, QNdefRecord::NfcRtd, "T") diff --git a/src/nfc/qndefnfcurirecord.cpp b/src/nfc/qndefnfcurirecord.cpp index 48a2699e..a38b1252 100644 --- a/src/nfc/qndefnfcurirecord.cpp +++ b/src/nfc/qndefnfcurirecord.cpp @@ -46,7 +46,7 @@ #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNdefNfcUriRecord @@ -154,4 +154,4 @@ void QNdefNfcUriRecord::setUri(const QUrl &uri) setPayload(p); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qndefnfcurirecord.h b/src/nfc/qndefnfcurirecord.h index 9eb5cfa2..1f96e4d8 100644 --- a/src/nfc/qndefnfcurirecord.h +++ b/src/nfc/qndefnfcurirecord.h @@ -47,7 +47,7 @@ QT_FORWARD_DECLARE_CLASS(QUrl) -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class Q_NFC_EXPORT QNdefNfcUriRecord : public QNdefRecord { @@ -63,7 +63,7 @@ public: void setUri(const QUrl &uri); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcUriRecord, QNdefRecord::NfcRtd, "U") diff --git a/src/nfc/qndefrecord.cpp b/src/nfc/qndefrecord.cpp index 4c8ae1c7..1790187c 100644 --- a/src/nfc/qndefrecord.cpp +++ b/src/nfc/qndefrecord.cpp @@ -45,7 +45,7 @@ #include <QtCore/QHash> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNdefRecord @@ -366,4 +366,4 @@ bool QNdefRecord::operator==(const QNdefRecord &other) const return true; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qndefrecord.h b/src/nfc/qndefrecord.h index d60c2b3c..63ef04c8 100644 --- a/src/nfc/qndefrecord.h +++ b/src/nfc/qndefrecord.h @@ -46,7 +46,7 @@ #include <QtCore/QByteArray> #include <QtNfc/qnfcglobal.h> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNdefRecordPrivate; @@ -106,15 +106,15 @@ private: className(const QNdefRecord &other) : QNdefRecord(other, typeNameFormat, type) { } #define Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(className, typeNameFormat_, type_) \ - QT_BEGIN_NAMESPACE_NFC \ + QT_BEGIN_NAMESPACE \ template<> inline bool QNdefRecord::isRecordType<className>() const\ { \ return (typeNameFormat() == typeNameFormat_ && type() == type_); \ } \ - QT_END_NAMESPACE_NFC + QT_END_NAMESPACE Q_NFC_EXPORT uint qHash(const QNdefRecord &key); -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNDEFRECORD_H diff --git a/src/nfc/qndefrecord_p.h b/src/nfc/qndefrecord_p.h index 49ec4e7b..d55c1724 100644 --- a/src/nfc/qndefrecord_p.h +++ b/src/nfc/qndefrecord_p.h @@ -48,7 +48,7 @@ #include <QtCore/QSharedData> #include <QtCore/QByteArray> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNdefRecordPrivate : public QSharedData { @@ -62,6 +62,6 @@ public: QByteArray payload; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNDEFRECORD_P_H diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp index d2c5412f..2d8b6f3c 100644 --- a/src/nfc/qnearfieldmanager.cpp +++ b/src/nfc/qnearfieldmanager.cpp @@ -53,7 +53,7 @@ #include <QtCore/QMetaType> #include <QtCore/QMetaMethod> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNearFieldManager @@ -411,4 +411,4 @@ QNearFieldManager::TargetAccessModes QNearFieldManager::targetAccessModes() cons return d->m_requestedModes; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h index d1c4b139..bbbaf387 100644 --- a/src/nfc/qnearfieldmanager.h +++ b/src/nfc/qnearfieldmanager.h @@ -48,7 +48,7 @@ #include <QtNfc/QNdefRecord> #include <QtNfc/QNdefFilter> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldManagerPrivate; class Q_NFC_EXPORT QNearFieldManager : public QObject @@ -110,6 +110,6 @@ int QNearFieldManager::registerNdefMessageHandler(QObject *object, const char *m Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldManager::TargetAccessModes) -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDMANAGER_H diff --git a/src/nfc/qnearfieldmanager_emulator.cpp b/src/nfc/qnearfieldmanager_emulator.cpp index 9d7a2677..ea699a73 100644 --- a/src/nfc/qnearfieldmanager_emulator.cpp +++ b/src/nfc/qnearfieldmanager_emulator.cpp @@ -47,7 +47,7 @@ #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl() { @@ -101,4 +101,4 @@ void QNearFieldManagerPrivateImpl::tagDeactivated(TagBase *tag) targetDeactivated(target); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h index d76bb9f1..68dd9495 100644 --- a/src/nfc/qnearfieldmanager_emulator_p.h +++ b/src/nfc/qnearfieldmanager_emulator_p.h @@ -49,7 +49,7 @@ #include <QtCore/QObject> #include <QtCore/QWeakPointer> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class TagBase; class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivateVirtualBase @@ -75,6 +75,6 @@ private: }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDMANAGER_EMULATOR_H diff --git a/src/nfc/qnearfieldmanager_p.h b/src/nfc/qnearfieldmanager_p.h index 082cf148..4b6d7df4 100644 --- a/src/nfc/qnearfieldmanager_p.h +++ b/src/nfc/qnearfieldmanager_p.h @@ -50,7 +50,7 @@ #include <QtCore/QObject> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNdefFilter; @@ -124,6 +124,6 @@ public: QNearFieldManager::TargetAccessModes m_requestedModes; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDMANAGER_P_H diff --git a/src/nfc/qnearfieldmanager_qnx.cpp b/src/nfc/qnearfieldmanager_qnx.cpp index 8e2249c3..696d2d88 100644 --- a/src/nfc/qnearfieldmanager_qnx.cpp +++ b/src/nfc/qnearfieldmanager_qnx.cpp @@ -46,7 +46,7 @@ #include "qndeffilter.h" #include "qndefrecord.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl() : m_handlerID(0) @@ -204,4 +204,4 @@ void QNearFieldManagerPrivateImpl::updateNdefFilter() } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanager_qnx_p.h b/src/nfc/qnearfieldmanager_qnx_p.h index f6b06d12..37aeba95 100644 --- a/src/nfc/qnearfieldmanager_qnx_p.h +++ b/src/nfc/qnearfieldmanager_qnx_p.h @@ -48,7 +48,7 @@ #include "qnx/qnxnfcmanager_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate { @@ -87,6 +87,6 @@ private: QList< QPair<QPair<int, QObject *>, QPair<QNdefFilter, QMetaMethod> > > ndefFilterHandlers; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDMANAGER_QNX_P_H diff --git a/src/nfc/qnearfieldmanager_simulator.cpp b/src/nfc/qnearfieldmanager_simulator.cpp index 9a0d0576..2800aa51 100644 --- a/src/nfc/qnearfieldmanager_simulator.cpp +++ b/src/nfc/qnearfieldmanager_simulator.cpp @@ -50,7 +50,7 @@ #include <QtCore/QCoreApplication> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE using namespace QtSimulatorPrivate; @@ -202,6 +202,6 @@ void QNearFieldManagerPrivateImpl::targetLeavingProximity(const QByteArray &uid) targetDeactivated(target); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #include "qnearfieldmanager_simulator.moc" diff --git a/src/nfc/qnearfieldmanager_simulator_p.h b/src/nfc/qnearfieldmanager_simulator_p.h index 8e919146..ff16080e 100644 --- a/src/nfc/qnearfieldmanager_simulator_p.h +++ b/src/nfc/qnearfieldmanager_simulator_p.h @@ -46,7 +46,7 @@ #include <QtCore/QWeakPointer> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE namespace Simulator { class NfcConnection; @@ -71,6 +71,6 @@ private: QMap<QByteArray, QWeakPointer<QNearFieldTarget> > m_targets; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDMANAGER_SIMULATOR_P_H diff --git a/src/nfc/qnearfieldmanagerimpl_p.cpp b/src/nfc/qnearfieldmanagerimpl_p.cpp index 5d20d5bd..cc1d0795 100644 --- a/src/nfc/qnearfieldmanagerimpl_p.cpp +++ b/src/nfc/qnearfieldmanagerimpl_p.cpp @@ -43,7 +43,7 @@ #include "qnearfieldmanagerimpl_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /* Constructs a new near field manager private implementation. @@ -59,4 +59,4 @@ QNearFieldManagerPrivateImpl::~QNearFieldManagerPrivateImpl() { } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanagerimpl_p.h b/src/nfc/qnearfieldmanagerimpl_p.h index 03a8ec1d..8f57f9eb 100644 --- a/src/nfc/qnearfieldmanagerimpl_p.h +++ b/src/nfc/qnearfieldmanagerimpl_p.h @@ -44,7 +44,7 @@ #include "qnearfieldmanager_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate { @@ -53,6 +53,6 @@ public: ~QNearFieldManagerPrivateImpl(); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDMANAGERIMPL_P_H diff --git a/src/nfc/qnearfieldmanagervirtualbase.cpp b/src/nfc/qnearfieldmanagervirtualbase.cpp index 7d5f2032..ec3e778d 100644 --- a/src/nfc/qnearfieldmanagervirtualbase.cpp +++ b/src/nfc/qnearfieldmanagervirtualbase.cpp @@ -43,7 +43,7 @@ #include "qndefmessage.h" #include "qtlv_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE static inline bool matchesTarget(QNearFieldTarget::Type type, const QList<QNearFieldTarget::Type> &types) @@ -214,4 +214,4 @@ void QNearFieldManagerPrivateVirtualBase::ndefReceived(const QNdefMessage &messa } } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanagervirtualbase_p.h b/src/nfc/qnearfieldmanagervirtualbase_p.h index 2123aed5..93dc517d 100644 --- a/src/nfc/qnearfieldmanagervirtualbase_p.h +++ b/src/nfc/qnearfieldmanagervirtualbase_p.h @@ -46,7 +46,7 @@ #include <QtCore/QMetaMethod> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldManagerPrivateVirtualBase : public QNearFieldManagerPrivate { @@ -85,6 +85,6 @@ private: QList<QNearFieldTarget::Type> m_detectTargetTypes; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDMANAGERVIRTUALBASE_P_H diff --git a/src/nfc/qnearfieldtagtype1.cpp b/src/nfc/qnearfieldtagtype1.cpp index 4d652b14..2509dec4 100644 --- a/src/nfc/qnearfieldtagtype1.cpp +++ b/src/nfc/qnearfieldtagtype1.cpp @@ -49,7 +49,7 @@ #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNearFieldTagType1 @@ -734,4 +734,4 @@ bool QNearFieldTagType1::handleResponse(const QNearFieldTarget::RequestId &id, return handled; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype1_p.h b/src/nfc/qnearfieldtagtype1_p.h index 41225227..0ec02b57 100644 --- a/src/nfc/qnearfieldtagtype1_p.h +++ b/src/nfc/qnearfieldtagtype1_p.h @@ -55,7 +55,7 @@ #include <QtNfc/QNearFieldTarget> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldTagType1Private; @@ -104,6 +104,6 @@ private: QNearFieldTagType1Private *d_ptr; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDTAGTYPE1_H diff --git a/src/nfc/qnearfieldtagtype2.cpp b/src/nfc/qnearfieldtagtype2.cpp index dadf67f8..0f926bf5 100644 --- a/src/nfc/qnearfieldtagtype2.cpp +++ b/src/nfc/qnearfieldtagtype2.cpp @@ -48,7 +48,7 @@ #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNearFieldTagType2 @@ -327,4 +327,4 @@ void QNearFieldTagType2::timerEvent(QTimerEvent *event) } } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype2_p.h b/src/nfc/qnearfieldtagtype2_p.h index 6a429722..91394441 100644 --- a/src/nfc/qnearfieldtagtype2_p.h +++ b/src/nfc/qnearfieldtagtype2_p.h @@ -55,7 +55,7 @@ #include <QtNfc/QNearFieldTarget> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldTagType2Private; @@ -91,6 +91,6 @@ private: QNearFieldTagType2Private *d_ptr; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDTAGTYPE2_H diff --git a/src/nfc/qnearfieldtagtype3.cpp b/src/nfc/qnearfieldtagtype3.cpp index e13cf5c4..b8cc89fe 100644 --- a/src/nfc/qnearfieldtagtype3.cpp +++ b/src/nfc/qnearfieldtagtype3.cpp @@ -41,7 +41,7 @@ #include "qnearfieldtagtype3_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNearFieldTagType3 @@ -184,4 +184,4 @@ bool QNearFieldTagType3::handleResponse(const QNearFieldTarget::RequestId &id, return QNearFieldTarget::handleResponse(id, response); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype3_p.h b/src/nfc/qnearfieldtagtype3_p.h index 1ee94f53..322e3d30 100644 --- a/src/nfc/qnearfieldtagtype3_p.h +++ b/src/nfc/qnearfieldtagtype3_p.h @@ -57,7 +57,7 @@ #include <QtCore/QMap> #include <QtNfc/QNearFieldTarget> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QNearFieldTagType3 : public QNearFieldTarget { @@ -83,6 +83,6 @@ protected: bool handleResponse(const QNearFieldTarget::RequestId &id, const QByteArray &response); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDTAGTYPE3_H diff --git a/src/nfc/qnearfieldtagtype4.cpp b/src/nfc/qnearfieldtagtype4.cpp index 12b02e10..a6e37fde 100644 --- a/src/nfc/qnearfieldtagtype4.cpp +++ b/src/nfc/qnearfieldtagtype4.cpp @@ -41,7 +41,7 @@ #include "qnearfieldtagtype4_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNearFieldTagType4 @@ -160,4 +160,4 @@ bool QNearFieldTagType4::handleResponse(const QNearFieldTarget::RequestId &id, return QNearFieldTarget::handleResponse(id, response); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype4_p.h b/src/nfc/qnearfieldtagtype4_p.h index 66a25ef3..340d6056 100644 --- a/src/nfc/qnearfieldtagtype4_p.h +++ b/src/nfc/qnearfieldtagtype4_p.h @@ -55,7 +55,7 @@ // We mean it. // -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QNearFieldTagType4 : public QNearFieldTarget { @@ -79,6 +79,6 @@ protected: bool handleResponse(const QNearFieldTarget::RequestId &id, const QByteArray &response); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDTAGTYPE4_H diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp index 542b66fe..c559c523 100644 --- a/src/nfc/qnearfieldtarget.cpp +++ b/src/nfc/qnearfieldtarget.cpp @@ -52,7 +52,7 @@ #include <QTime> #include <QCoreApplication> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE /*! \class QNearFieldTarget @@ -490,4 +490,4 @@ bool QNearFieldTarget::handleResponse(const QNearFieldTarget::RequestId &id, return true; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index 8c2dd0c1..0cf85400 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -53,7 +53,7 @@ class QString; class QUrl; QT_END_NAMESPACE -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNdefMessage; class QNearFieldTargetPrivate; @@ -165,9 +165,9 @@ Q_NFC_EXPORT quint16 qNfcChecksum(const char * data, uint len); Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldTarget::AccessMethods) -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::RequestId) -Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::Error) +Q_DECLARE_METATYPE(QNearFieldTarget::RequestId) +Q_DECLARE_METATYPE(QNearFieldTarget::Error) #endif // QNEARFIELDTARGET_H diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp index 4242568a..80953ce6 100644 --- a/src/nfc/qnearfieldtarget_emulator.cpp +++ b/src/nfc/qnearfieldtarget_emulator.cpp @@ -48,7 +48,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDateTime> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE static QMutex tagMutex; static QMap<TagBase *, bool> tagMap; @@ -300,4 +300,4 @@ void TagActivator::timerEvent(QTimerEvent *e) tagMutex.unlock(); } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h index 6ed86260..3fb15489 100644 --- a/src/nfc/qnearfieldtarget_emulator_p.h +++ b/src/nfc/qnearfieldtarget_emulator_p.h @@ -48,7 +48,7 @@ #include <QtCore/QMap> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class TagType1 : public QNearFieldTagType1 { @@ -113,6 +113,6 @@ private: int timerId; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDTARGET_EMULATOR_P_H diff --git a/src/nfc/qnearfieldtarget_p.h b/src/nfc/qnearfieldtarget_p.h index af24123c..321cb0e9 100644 --- a/src/nfc/qnearfieldtarget_p.h +++ b/src/nfc/qnearfieldtarget_p.h @@ -49,7 +49,7 @@ #include <QtCore/QMap> #include <QtCore/QSharedData> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldTarget::RequestIdPrivate : public QSharedData { @@ -61,6 +61,6 @@ public: QMap<QNearFieldTarget::RequestId, QVariant> m_decodedResponses; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDTARGET_P_H diff --git a/src/nfc/qnearfieldtarget_qnx_p.h b/src/nfc/qnearfieldtarget_qnx_p.h index 340b108c..789d8de5 100644 --- a/src/nfc/qnearfieldtarget_qnx_p.h +++ b/src/nfc/qnearfieldtarget_qnx_p.h @@ -51,7 +51,7 @@ #include "qnx/qnxnfcmanager_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE #define TAG_NAME_BUFFER 64 @@ -219,6 +219,6 @@ protected: QList<QNdefMessage> m_ndefMessages; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNEARFIELDTARGET_QNX_H diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h index bd1f0674..de659590 100644 --- a/src/nfc/qnfcglobal.h +++ b/src/nfc/qnfcglobal.h @@ -44,17 +44,7 @@ #include <QtCore/qglobal.h> -#if defined(QT_NAMESPACE) -# define QT_PREPEND_NAMESPACE_NFC(name) ::QT_NAMESPACE::QtNfc::name -# define QT_BEGIN_NAMESPACE_NFC namespace QT_NAMESPACE { namespace QtNfc { -# define QT_END_NAMESPACE_NFC } } -# define QT_USE_NAMESPACE_NFC using namespace QT_NAMESPACE; using namespace QtNfc; -#else -# define QT_PREPEND_NAMESPACE_NFC(name) ::QtNfc::name -# define QT_BEGIN_NAMESPACE_NFC namespace QtNfc { -# define QT_END_NAMESPACE_NFC } -# define QT_USE_NAMESPACE_NFC using namespace QtNfc; -#endif +QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QT_BUILD_NFC_LIB) @@ -66,4 +56,6 @@ # define Q_NFC_EXPORT #endif +QT_END_NAMESPACE + #endif // QTNFC_H diff --git a/src/nfc/qnx/qnxnfceventfilter.cpp b/src/nfc/qnx/qnxnfceventfilter.cpp index f4b53f64..eed1a280 100644 --- a/src/nfc/qnx/qnxnfceventfilter.cpp +++ b/src/nfc/qnx/qnxnfceventfilter.cpp @@ -44,7 +44,7 @@ #include "nfc/nfc.h" #include "qnxnfcmanager_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QNXNFCEventFilter::QNXNFCEventFilter() { @@ -100,4 +100,4 @@ bool QNXNFCEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes return false; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnx/qnxnfceventfilter_p.h b/src/nfc/qnx/qnxnfceventfilter_p.h index 51fc5e95..9b10ed57 100644 --- a/src/nfc/qnx/qnxnfceventfilter_p.h +++ b/src/nfc/qnx/qnxnfceventfilter_p.h @@ -51,7 +51,7 @@ #include "../qnfcglobal.h" #include "../qndefmessage.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNXNFCEventFilter : public QObject, public QAbstractNativeEventFilter { @@ -70,6 +70,6 @@ Q_SIGNALS: void ndefEvent(const QNdefMessage &msg); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QNXNFCEVENTFILTER_H diff --git a/src/nfc/qnx/qnxnfcmanager.cpp b/src/nfc/qnx/qnxnfcmanager.cpp index dd387bef..3ecdcfae 100644 --- a/src/nfc/qnx/qnxnfcmanager.cpp +++ b/src/nfc/qnx/qnxnfcmanager.cpp @@ -44,7 +44,7 @@ #include <QMetaObject> #include "../qllcpsocket_qnx_p.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QNXNFCManager *QNXNFCManager::m_instance = 0; @@ -484,4 +484,4 @@ QNdefMessage QNXNFCManager::decodeMessage(nfc_ndef_message_t *nextMessage) return newNdefMessage; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qnx/qnxnfcmanager_p.h b/src/nfc/qnx/qnxnfcmanager_p.h index d3d0ec22..44a652db 100644 --- a/src/nfc/qnx/qnxnfcmanager_p.h +++ b/src/nfc/qnx/qnxnfcmanager_p.h @@ -59,7 +59,7 @@ #define qQNXNFCDebug QT_NO_QDEBUG_MACRO #endif -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QLlcpSocketPrivate; @@ -134,7 +134,7 @@ Q_SIGNALS: void llcpDisconnected(); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif diff --git a/src/nfc/qtlv.cpp b/src/nfc/qtlv.cpp index efc11152..3ad23c8f 100644 --- a/src/nfc/qtlv.cpp +++ b/src/nfc/qtlv.cpp @@ -47,7 +47,7 @@ #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE QPair<int, int> qParseReservedMemoryControlTlv(const QByteArray &tlvData) { @@ -529,4 +529,4 @@ int QTlvWriter::moveToNextAvailable() return length; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/qtlv_p.h b/src/nfc/qtlv_p.h index 7d636631..f15ec55f 100644 --- a/src/nfc/qtlv_p.h +++ b/src/nfc/qtlv_p.h @@ -50,7 +50,7 @@ #include <QtCore/QMap> #include <QtCore/QPair> -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNearFieldTarget; class Q_AUTOTEST_EXPORT QTlvReader @@ -119,6 +119,6 @@ private: QPair<int, int> qParseReservedMemoryControlTlv(const QByteArray &tlvData); QPair<int, int> qParseLockControlTlv(const QByteArray &tlvData); -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // QTLV_P_H diff --git a/src/nfc/targetemulator.cpp b/src/nfc/targetemulator.cpp index b607b760..e1d21e87 100644 --- a/src/nfc/targetemulator.cpp +++ b/src/nfc/targetemulator.cpp @@ -49,7 +49,7 @@ // Implementation of qNfcChecksum #include "qnearfieldtarget.h" -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE TagBase::TagBase() : lastAccess(0) @@ -391,4 +391,4 @@ QByteArray NfcTagType2::processCommand(const QByteArray &command) return response; } -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE diff --git a/src/nfc/targetemulator_p.h b/src/nfc/targetemulator_p.h index b8d44ac8..06bf5ae6 100644 --- a/src/nfc/targetemulator_p.h +++ b/src/nfc/targetemulator_p.h @@ -48,7 +48,7 @@ QT_FORWARD_DECLARE_CLASS(QSettings) -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class TagBase { @@ -107,6 +107,6 @@ private: bool expectPacket2; }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE #endif // TARGETEMULATOR_P_H diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 1ff9321f..34bbf980 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -13,8 +13,6 @@ set(qt_module_includes Bluetooth QBluetoothAddress Nfc QNdefRecord ) -set(QBluetoothAddress_NAMESPACE QtBluetooth) -set(QNdefRecord_NAMESPACE QtNfc) test_module_includes( ${qt_module_includes} diff --git a/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp b/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp index 20a50e2e..d53f39dd 100644 --- a/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp +++ b/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp @@ -45,7 +45,7 @@ #include <qbluetoothaddress.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class tst_QBluetoothAddress : public QObject { diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp index 33b6b204..fd923f0e 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp +++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp @@ -49,7 +49,7 @@ #include <qbluetoothdevicediscoveryagent.h> #include <qbluetoothlocaldevice.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBluetoothDeviceInfo) Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::InquiryType) diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp index 514be2e9..64a65348 100644 --- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp +++ b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp @@ -48,7 +48,7 @@ #include <qbluetoothlocaldevice.h> #include <qbluetoothuuid.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBluetoothDeviceInfo::ServiceClasses) Q_DECLARE_METATYPE(QBluetoothDeviceInfo::MajorDeviceClass) diff --git a/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp b/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp index 7fa0e657..aa2448a8 100644 --- a/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp +++ b/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp @@ -46,7 +46,7 @@ #include <qbluetoothhostinfo.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class tst_QBluetoothHostInfo : public QObject { diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp index bc4e269e..abe19c0b 100644 --- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp +++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp @@ -47,7 +47,7 @@ #include <qbluetoothaddress.h> #include <qbluetoothlocaldevice.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE /* * Running the manual tests requires another Bluetooth device in the vincinity. diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index ec5ff840..941245e0 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -52,7 +52,7 @@ #include <qbluetoothserver.h> #include <qbluetoothserviceinfo.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBluetoothDeviceInfo) Q_DECLARE_METATYPE(QBluetoothServiceDiscoveryAgent::Error) diff --git a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp index ea2c4ee8..62550622 100644 --- a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp +++ b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp @@ -50,7 +50,7 @@ #include <qbluetoothlocaldevice.h> #include <qbluetoothuuid.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBluetoothUuid::ProtocolUuid) Q_DECLARE_METATYPE(QUuid) diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp index af0db519..5e81e114 100644 --- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp +++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp @@ -53,7 +53,7 @@ #include <btclient.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBluetoothSocket::SocketState) Q_DECLARE_METATYPE(QBluetoothSocket::SocketType) diff --git a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp index 998e3d4e..5c9ea9f0 100644 --- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp +++ b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp @@ -65,7 +65,7 @@ * discoverable and the object push service must be accessible. Any **/ -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE typedef QMap<QBluetoothTransferRequest::Attribute,QVariant> tst_QBluetoothTransferManager_QParameterMap; Q_DECLARE_METATYPE(tst_QBluetoothTransferManager_QParameterMap) diff --git a/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp b/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp index 729ca083..3de7aec0 100644 --- a/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp +++ b/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp @@ -48,7 +48,7 @@ #include <qbluetoothaddress.h> #include <qbluetoothlocaldevice.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE typedef QMap<int,QVariant> tst_QBluetoothTransferRequest_QParameterMap; Q_DECLARE_METATYPE(tst_QBluetoothTransferRequest_QParameterMap) diff --git a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp index 700d6fb4..5aae3ba9 100644 --- a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp +++ b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp @@ -51,7 +51,7 @@ # include <netinet/in.h> #endif -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Q_DECLARE_METATYPE(quint128) diff --git a/tests/auto/ql2capserver/tst_ql2capserver.cpp b/tests/auto/ql2capserver/tst_ql2capserver.cpp index 9ba7ba8a..26c68cad 100644 --- a/tests/auto/ql2capserver/tst_ql2capserver.cpp +++ b/tests/auto/ql2capserver/tst_ql2capserver.cpp @@ -46,7 +46,7 @@ #include <qbluetoothserver.h> #include <qbluetoothsocket.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBluetooth::SecurityFlags); diff --git a/tests/auto/qndefmessage/tst_qndefmessage.cpp b/tests/auto/qndefmessage/tst_qndefmessage.cpp index 17e29207..5813d0cd 100644 --- a/tests/auto/qndefmessage/tst_qndefmessage.cpp +++ b/tests/auto/qndefmessage/tst_qndefmessage.cpp @@ -46,7 +46,7 @@ #include <qndefnfctextrecord.h> #include <qndefnfcurirecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QNdefRecord) diff --git a/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp b/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp index 33b15980..c16fb211 100644 --- a/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp +++ b/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp @@ -47,7 +47,7 @@ #include <qndefnfcurirecord.h> #include <qndefnfcsmartposterrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE static const quint8 payload[] = { 0xC1, 0x02, 0x00, 0x00, 0x03, 0x0D, 0x53, 0x70, 0x91, 0x01, 0x08, 0x55, 0x01, 0x72, 0x69, 0x6D, 0x2E, 0x63, 0x6F, 0x6D, diff --git a/tests/auto/qndefrecord/tst_qndefrecord.cpp b/tests/auto/qndefrecord/tst_qndefrecord.cpp index 438add93..cccd1c61 100644 --- a/tests/auto/qndefrecord/tst_qndefrecord.cpp +++ b/tests/auto/qndefrecord/tst_qndefrecord.cpp @@ -46,7 +46,7 @@ #include <qndefnfcurirecord.h> #include <qdeclarativendefrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QNdefRecord::TypeNameFormat) diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index 655d9193..79a2a35a 100644 --- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp @@ -48,7 +48,7 @@ #include <qndefmessage.h> #include <qndefrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QNearFieldTarget*) Q_DECLARE_METATYPE(QNearFieldTarget::Type) diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index 9611698d..7dbb37a8 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -47,7 +47,7 @@ #include <private/qnearfieldtagtype1_p.h> #include <qndefnfctextrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QNearFieldTarget*) diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index 9b4fa6a7..f57b1f23 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -47,7 +47,7 @@ #include <private/qnearfieldtagtype2_p.h> #include <qndefnfctextrecord.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QNearFieldTarget*) diff --git a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp b/tests/auto/qrfcommserver/tst_qrfcommserver.cpp index 57cee4d3..3620600e 100644 --- a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp +++ b/tests/auto/qrfcommserver/tst_qrfcommserver.cpp @@ -47,7 +47,7 @@ #include <qbluetoothsocket.h> #include <qbluetoothlocaldevice.h> -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBluetooth::SecurityFlags); diff --git a/tests/nfctestserver/servercontroller.h b/tests/nfctestserver/servercontroller.h index 437f5df0..a27ffffe 100644 --- a/tests/nfctestserver/servercontroller.h +++ b/tests/nfctestserver/servercontroller.h @@ -46,7 +46,7 @@ #include <qllcpserver.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class ServerController : public QObject { diff --git a/tests/nfctestserver/socketcontroller.h b/tests/nfctestserver/socketcontroller.h index 525984df..cbfc4109 100644 --- a/tests/nfctestserver/socketcontroller.h +++ b/tests/nfctestserver/socketcontroller.h @@ -47,7 +47,7 @@ #include <qnearfieldmanager.h> #include <qllcpsocket.h> -QT_USE_NAMESPACE_NFC +QT_USE_NAMESPACE class SocketController : public QObject { |