diff options
195 files changed, 378 insertions, 377 deletions
diff --git a/examples/bluetooth/btchat/chat.h b/examples/bluetooth/btchat/chat.h index 740999d0..9ced3f09 100644 --- a/examples/bluetooth/btchat/chat.h +++ b/examples/bluetooth/btchat/chat.h @@ -47,11 +47,11 @@ #include <QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QRfcommServer; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class ChatServer; class ChatClient; diff --git a/examples/bluetooth/btchat/chatclient.h b/examples/bluetooth/btchat/chatclient.h index 710634e5..19c0a7e5 100644 --- a/examples/bluetooth/btchat/chatclient.h +++ b/examples/bluetooth/btchat/chatclient.h @@ -45,11 +45,11 @@ #include <QtCore/QObject> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothSocket; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH //! [declaration] class ChatClient : public QObject diff --git a/examples/bluetooth/btchat/chatserver.h b/examples/bluetooth/btchat/chatserver.h index ee4728a9..d3368451 100644 --- a/examples/bluetooth/btchat/chatserver.h +++ b/examples/bluetooth/btchat/chatserver.h @@ -46,12 +46,12 @@ #include <QtCore/QObject> #include <QtCore/QList> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QRfcommServer; class QBluetoothSocket; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH //! [declaration] class ChatServer : public QObject diff --git a/examples/bluetooth/btchat/remoteselector.cpp b/examples/bluetooth/btchat/remoteselector.cpp index a63c81c2..17f819da 100644 --- a/examples/bluetooth/btchat/remoteselector.cpp +++ b/examples/bluetooth/btchat/remoteselector.cpp @@ -44,7 +44,7 @@ #include <qbluetoothdeviceinfo.h> #include <qbluetoothaddress.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH 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 eff94895..4680a613 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) -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/bluetooth/btfiletransfer/progress.cpp b/examples/bluetooth/btfiletransfer/progress.cpp index d589e9b5..c6386e6f 100644 --- a/examples/bluetooth/btfiletransfer/progress.cpp +++ b/examples/bluetooth/btfiletransfer/progress.cpp @@ -46,7 +46,7 @@ #include <qbluetoothtransferrequest.h> #include <qbluetoothtransferreply.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH Progress::Progress(QWidget *parent) : QDialog(parent), diff --git a/examples/bluetooth/btfiletransfer/progress.h b/examples/bluetooth/btfiletransfer/progress.h index 400c9b70..c7efed83 100644 --- a/examples/bluetooth/btfiletransfer/progress.h +++ b/examples/bluetooth/btfiletransfer/progress.h @@ -45,11 +45,11 @@ #include <qbluetoothglobal.h> #include <QTime> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothTransferReply; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/bluetooth/btfiletransfer/remoteselector.cpp b/examples/bluetooth/btfiletransfer/remoteselector.cpp index 80d8761e..b1a3901b 100644 --- a/examples/bluetooth/btfiletransfer/remoteselector.cpp +++ b/examples/bluetooth/btfiletransfer/remoteselector.cpp @@ -55,7 +55,7 @@ #include "progress.h" #include "pindisplay.h" -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH 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 d3300c9a..7ce2bf69 100644 --- a/examples/bluetooth/btfiletransfer/remoteselector.h +++ b/examples/bluetooth/btfiletransfer/remoteselector.h @@ -55,7 +55,7 @@ QT_FORWARD_DECLARE_CLASS(QFile) class pinDisplay; -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/bluetooth/btscanner/device.h b/examples/bluetooth/btscanner/device.h index af2d9a7f..fe9112a7 100644 --- a/examples/bluetooth/btscanner/device.h +++ b/examples/bluetooth/btscanner/device.h @@ -48,12 +48,12 @@ #include <QDialog> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothDeviceDiscoveryAgent; class QBluetoothDeviceInfo; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class DeviceDiscoveryDialog : public QDialog { diff --git a/examples/bluetooth/btscanner/service.h b/examples/bluetooth/btscanner/service.h index 0e17aa14..64d3d05f 100644 --- a/examples/bluetooth/btscanner/service.h +++ b/examples/bluetooth/btscanner/service.h @@ -47,13 +47,13 @@ #include <QDialog> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothServiceDiscoveryAgent; class QBluetoothServiceInfo; class QBluetoothAddress; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class ServiceDiscoveryDialog : public QDialog { diff --git a/examples/bluetooth/bttennis/tennis.h b/examples/bluetooth/bttennis/tennis.h index 92b5f0fa..c72cabe2 100644 --- a/examples/bluetooth/bttennis/tennis.h +++ b/examples/bluetooth/bttennis/tennis.h @@ -55,11 +55,11 @@ #include <QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothServiceDiscoveryAgent; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH static const QLatin1String serviceUuid("e8e10f95-1a70-4b27-9ccf-02010264e9c9"); diff --git a/examples/bluetooth/bttennis/tennisclient.h b/examples/bluetooth/bttennis/tennisclient.h index aeccfca1..e90a3dca 100644 --- a/examples/bluetooth/bttennis/tennisclient.h +++ b/examples/bluetooth/bttennis/tennisclient.h @@ -49,15 +49,15 @@ #include <QtCore/QTime> #include <QtCore/QTimer> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothSocket; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH QT_BEGIN_NAMESPACE class QDataStream; QT_END_NAMESPACE -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH //! [declaration] class TennisClient : public QObject diff --git a/examples/bluetooth/bttennis/tennisserver.h b/examples/bluetooth/bttennis/tennisserver.h index bfce30ae..a1936012 100644 --- a/examples/bluetooth/bttennis/tennisserver.h +++ b/examples/bluetooth/bttennis/tennisserver.h @@ -51,13 +51,13 @@ #include <QtCore/QTime> #include <QtCore/QTimer> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QL2capServer; class QBluetoothSocket; class QBluetoothServiceInfo; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH //! [declaration] class TennisServer : public QObject diff --git a/examples/nfc/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h index 490539a2..8f7939c6 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) -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldTarget; class QNdefMessage; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class AnnotatedUrl : public QObject { diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h index 6be6be25..d7793b3c 100644 --- a/examples/nfc/ndefeditor/mainwindow.h +++ b/examples/nfc/ndefeditor/mainwindow.h @@ -47,12 +47,12 @@ #include <qnearfieldtarget.h> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldManager; class QNdefMessage; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC namespace Ui { class MainWindow; diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h index 62330f2f..bfba282c 100644 --- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h +++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h @@ -48,7 +48,7 @@ #include <qndefrecord.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC namespace Ui { class MimeImageRecordEditor; diff --git a/examples/nfc/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h index f692d0b7..3f45a94b 100644 --- a/examples/nfc/ndefeditor/textrecordeditor.h +++ b/examples/nfc/ndefeditor/textrecordeditor.h @@ -49,7 +49,7 @@ namespace Ui { class TextRecordEditor; } -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class TextRecordEditor : public QWidget { diff --git a/examples/nfc/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h index cf7af023..c4c17110 100644 --- a/examples/nfc/ndefeditor/urirecordeditor.h +++ b/examples/nfc/ndefeditor/urirecordeditor.h @@ -50,7 +50,7 @@ namespace Ui { class UriRecordEditor; } -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class UriRecordEditor : public QWidget { diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index a741643f..592ee817 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -8,6 +8,7 @@ OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator load(qt_module) PUBLIC_HEADERS += \ + qbluetoothglobal.h \ qbluetoothaddress.h\ qbluetoothhostinfo.h \ qbluetoothuuid.h\ diff --git a/src/bluetooth/qbluetooth.h b/src/bluetooth/qbluetooth.h index f32693c9..4ee90336 100644 --- a/src/bluetooth/qbluetooth.h +++ b/src/bluetooth/qbluetooth.h @@ -45,7 +45,7 @@ #include "qbluetoothglobal.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH namespace QBluetooth { enum Security { @@ -62,6 +62,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(SecurityFlags) } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QBLUETOOTH_H diff --git a/src/bluetooth/qbluetoothaddress.cpp b/src/bluetooth/qbluetoothaddress.cpp index a69c41cb..47989c90 100644 --- a/src/bluetooth/qbluetoothaddress.cpp +++ b/src/bluetooth/qbluetoothaddress.cpp @@ -42,7 +42,7 @@ #include "qbluetoothaddress.h" #include "qbluetoothaddress_p.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothAddress @@ -216,4 +216,4 @@ QBluetoothAddressPrivate::QBluetoothAddressPrivate() m_address = 0; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothaddress.h b/src/bluetooth/qbluetoothaddress.h index 08fbc821..9f7e0e75 100644 --- a/src/bluetooth/qbluetoothaddress.h +++ b/src/bluetooth/qbluetoothaddress.h @@ -48,7 +48,7 @@ #include <QtCore/QString> #include <QtCore/QMetaType> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothAddressPrivate; @@ -79,7 +79,7 @@ private: QBluetoothAddressPrivate *d_ptr; }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(QtBluetooth::QBluetoothAddress) diff --git a/src/bluetooth/qbluetoothaddress_p.h b/src/bluetooth/qbluetoothaddress_p.h index d2d7b2f9..bbf8b4fb 100644 --- a/src/bluetooth/qbluetoothaddress_p.h +++ b/src/bluetooth/qbluetoothaddress_p.h @@ -44,7 +44,7 @@ #include "qbluetoothaddress.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothAddressPrivate { @@ -56,6 +56,6 @@ public: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp index ca98ed11..9e6fe617 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp @@ -42,7 +42,7 @@ #include "qbluetoothdevicediscoveryagent.h" #include "qbluetoothdevicediscoveryagent_p.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothDeviceDiscoveryAgent @@ -228,5 +228,5 @@ QString QBluetoothDeviceDiscoveryAgent::errorString() const #include "moc_qbluetoothdevicediscoveryagent.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h index 9524f2fb..4e12b88e 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h @@ -48,7 +48,7 @@ #include <qbluetoothdeviceinfo.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothDeviceDiscoveryAgentPrivate; @@ -105,6 +105,6 @@ private: #endif }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp index 95a09f61..7bf85698 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp @@ -50,7 +50,7 @@ //#define QT_DEVICEDISCOVERY_DEBUG -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate() : lastError(QBluetoothDeviceDiscoveryAgent::NoError), pendingCancel(false), pendingStart(false), adapter(0) @@ -223,4 +223,4 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_propertyChanged(const QString &na } } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index 721e7fc5..603f7b5a 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -46,7 +46,7 @@ #define QT_DEVICEDISCOVERY_DEBUG -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate() @@ -85,4 +85,4 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_propertyChanged(const QString &na } #endif -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index e9f3d9f3..4fb60393 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -58,7 +58,7 @@ QT_END_NAMESPACE #include <QTimer> #endif -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothDeviceDiscoveryAgentPrivate #if defined(QTM_QNX_BLUETOOTH) @@ -116,6 +116,6 @@ private: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp index 7abc703c..58d5783a 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp @@ -47,7 +47,7 @@ #include <QtCore/private/qcore_unix_p.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(): QObject(0), lastError(QBluetoothDeviceDiscoveryAgent::NoError), pendingCancel(false), pendingStart(false), m_rdfd(-1) @@ -225,5 +225,5 @@ void QBluetoothDeviceDiscoveryAgentPrivate::abort() } } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp index b230a95c..026b695f 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.cpp +++ b/src/bluetooth/qbluetoothdeviceinfo.cpp @@ -44,7 +44,7 @@ #include <QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothDeviceInfo @@ -528,4 +528,4 @@ void QBluetoothDeviceInfo::setCached(bool cached) d->cached = cached; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index 94b340c8..7593ce35 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -46,7 +46,7 @@ #include <QString> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothDeviceInfoPrivate; class QBluetoothAddress; @@ -240,6 +240,6 @@ private: Q_DECLARE_PRIVATE(QBluetoothDeviceInfo) }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothdeviceinfo_p.h b/src/bluetooth/qbluetoothdeviceinfo_p.h index fd10f10f..0eb923f2 100644 --- a/src/bluetooth/qbluetoothdeviceinfo_p.h +++ b/src/bluetooth/qbluetoothdeviceinfo_p.h @@ -48,7 +48,7 @@ #include <QString> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothDeviceInfoPrivate { @@ -71,6 +71,6 @@ public: QList<QBluetoothUuid> serviceUuids; }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothglobal.h b/src/bluetooth/qbluetoothglobal.h index ed3bc637..9bf9c284 100644 --- a/src/bluetooth/qbluetoothglobal.h +++ b/src/bluetooth/qbluetoothglobal.h @@ -44,15 +44,15 @@ #include <QtCore/qglobal.h> #if defined(QT_NAMESPACE) -# define QTBLUETOOTH_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::QtBluetooth::name -# define QTBLUETOOTH_BEGIN_NAMESPACE namespace QT_NAMESPACE { namespace QtBluetooth { -# define QTBLUETOOTH_END_NAMESPACE } } -# define QTBLUETOOTH_USE_NAMESPACE using namespace QT_NAMESPACE; using namespace QtBluetooth; +# 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 QTBLUETOOTH_PREPEND_NAMESPACE(name) ::QtBluetooth::name -# define QTBLUETOOTH_BEGIN_NAMESPACE namespace QtBluetooth { -# define QTBLUETOOTH_END_NAMESPACE } -# define QTBLUETOOTH_USE_NAMESPACE using namespace QtBluetooth; +# 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 diff --git a/src/bluetooth/qbluetoothhostinfo.cpp b/src/bluetooth/qbluetoothhostinfo.cpp index a684addc..72fb956a 100644 --- a/src/bluetooth/qbluetoothhostinfo.cpp +++ b/src/bluetooth/qbluetoothhostinfo.cpp @@ -42,7 +42,7 @@ #include "qbluetoothhostinfo.h" #include "qbluetoothhostinfo_p.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothHostInfo @@ -117,4 +117,4 @@ void QBluetoothHostInfo::setName(const QString &name) d->m_name = name; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothhostinfo.h b/src/bluetooth/qbluetoothhostinfo.h index e27e2c52..85db2b46 100644 --- a/src/bluetooth/qbluetoothhostinfo.h +++ b/src/bluetooth/qbluetoothhostinfo.h @@ -45,7 +45,7 @@ #include "qbluetoothglobal.h" #include "qbluetoothaddress.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothHostInfoPrivate; class Q_BLUETOOTH_EXPORT QBluetoothHostInfo @@ -67,6 +67,6 @@ private: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothhostinfo_p.h b/src/bluetooth/qbluetoothhostinfo_p.h index 569be476..8ff4b2ab 100644 --- a/src/bluetooth/qbluetoothhostinfo_p.h +++ b/src/bluetooth/qbluetoothhostinfo_p.h @@ -44,7 +44,7 @@ #include "qbluetoothhostinfo.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothHostInfoPrivate { @@ -55,6 +55,6 @@ public: QString m_name; }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp index c245ef47..7e4141fa 100644 --- a/src/bluetooth/qbluetoothlocaldevice.cpp +++ b/src/bluetooth/qbluetoothlocaldevice.cpp @@ -46,7 +46,7 @@ #include <QtCore/QString> #include <QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothLocalDevice @@ -241,4 +241,4 @@ bool QBluetoothLocalDevice::isValid() const #include "moc_qbluetoothlocaldevice.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index 5f664355..4c84a12d 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -51,7 +51,7 @@ #include "qbluetoothhostinfo.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothLocalDevicePrivate; @@ -115,7 +115,7 @@ private: QBluetoothLocalDevicePrivate *d_ptr; }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::HostMode) Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::Pairing) diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp index b8ab4bdd..06b7f5fe 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" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH static const QLatin1String agentPath("/qt/agent"); @@ -513,4 +513,4 @@ void QBluetoothLocalDevicePrivate::PropertyChanged(QString property, QDBusVarian //#include "qbluetoothlocaldevice.moc" #include "moc_qbluetoothlocaldevice_p.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothlocaldevice_p.cpp b/src/bluetooth/qbluetoothlocaldevice_p.cpp index ebdf7e4b..e41b8b5b 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_p.cpp @@ -43,7 +43,7 @@ #include "qbluetoothlocaldevice.h" #include "qbluetoothaddress.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) : QObject(parent), d_ptr(0) @@ -102,4 +102,4 @@ void QBluetoothLocalDevice::pairingConfirmation(bool confirmation) Q_UNUSED(confirmation); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 8a631739..58fff254 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 -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothAddress; @@ -142,6 +142,6 @@ class QBluetoothLocalDevicePrivate : public QObject }; #endif -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QBLUETOOTHLOCALDEVICE_P_H diff --git a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp index 59fce7e1..272b89f5 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" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) : QObject(parent) @@ -196,4 +196,4 @@ void QBluetoothLocalDevicePrivate::controlReply(ppsResult result) } } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index 4d705ff6..ecf3c529 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -44,7 +44,7 @@ #include "qbluetoothdevicediscoveryagent.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothServiceDiscoveryAgent @@ -413,4 +413,4 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_serviceDiscoveryFinished() #include "moc_qbluetoothservicediscoveryagent.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index b2a9a7c4..93fcdbc9 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -49,7 +49,7 @@ #include <qbluetoothserviceinfo.h> #include <qbluetoothuuid.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothAddress; class QBluetoothServiceDiscoveryAgentPrivate; @@ -109,6 +109,6 @@ private: #endif }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index 12bcf4e5..0ebc79bd 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -54,7 +54,7 @@ #include <QtCore/QDebug> #endif -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &address) : error(QBluetoothServiceDiscoveryAgent::NoError), state(Inactive), deviceAddress(address), @@ -328,4 +328,4 @@ QVariant QBluetoothServiceDiscoveryAgentPrivate::readAttributeValue(QXmlStreamRe } } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp index 914d41eb..5dec6ac3 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp @@ -42,7 +42,7 @@ #include "qbluetoothservicediscoveryagent.h" #include "qbluetoothservicediscoveryagent_p.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &address) { @@ -62,4 +62,4 @@ void QBluetoothServiceDiscoveryAgentPrivate::stop() { } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h index f51ac9ce..35d68947 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h @@ -65,7 +65,7 @@ QT_END_NAMESPACE #include <unistd.h> #endif -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothDeviceDiscoveryAgent; @@ -156,6 +156,6 @@ protected: QBluetoothServiceDiscoveryAgent *q_ptr; }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp index 2ff53a18..30042e78 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp @@ -52,7 +52,7 @@ #include <QtCore/private/qcore_unix_p.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &address) : m_rdfd(-1), rdNotifier(0), error(QBluetoothServiceDiscoveryAgent::NoError), state(Inactive), deviceAddress(address), @@ -213,4 +213,4 @@ void QBluetoothServiceDiscoveryAgentPrivate::controlEvent(ppsResult result) } } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothserviceinfo.cpp b/src/bluetooth/qbluetoothserviceinfo.cpp index d160ac67..d14f1523 100644 --- a/src/bluetooth/qbluetoothserviceinfo.cpp +++ b/src/bluetooth/qbluetoothserviceinfo.cpp @@ -44,7 +44,7 @@ #include <QUrl> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothServiceInfo::Sequence @@ -619,4 +619,4 @@ QDebug operator<<(QDebug dbg, const QBluetoothServiceInfo &info) return dbg; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h index 1e746d69..db83a23d 100644 --- a/src/bluetooth/qbluetoothserviceinfo.h +++ b/src/bluetooth/qbluetoothserviceinfo.h @@ -52,7 +52,7 @@ #include <QtCore/QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothServiceInfoPrivate; class QBluetoothDeviceInfo; @@ -149,14 +149,14 @@ private: Q_DECLARE_PRIVATE(QBluetoothServiceInfo) }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo) Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo::Sequence) Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo::Alternative) Q_DECLARE_METATYPE(QList<QtBluetooth::QBluetoothUuid>) -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH inline void QBluetoothServiceInfo::setAttribute(quint16 attributeId, const QBluetoothUuid &value) { @@ -228,6 +228,6 @@ inline QList<QBluetoothUuid> QBluetoothServiceInfo::serviceClassUuids() const return attribute(ServiceClassIds).value<QList<QBluetoothUuid> >(); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp index 088ee744..0453c6a9 100644 --- a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp @@ -47,7 +47,7 @@ #include <QtCore/QXmlStreamWriter> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH static void writeAttribute(QXmlStreamWriter *stream, const QVariant &attribute) { @@ -285,4 +285,4 @@ bool QBluetoothServiceInfoPrivate::registerService() const return true; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothserviceinfo_p.cpp b/src/bluetooth/qbluetoothserviceinfo_p.cpp index 812c3e79..bb4898b6 100644 --- a/src/bluetooth/qbluetoothserviceinfo_p.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_p.cpp @@ -42,7 +42,7 @@ #include "qbluetoothserviceinfo.h" #include "qbluetoothserviceinfo_p.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothServiceInfoPrivate::QBluetoothServiceInfoPrivate() { @@ -79,4 +79,4 @@ void QBluetoothServiceInfoPrivate::removeRegisteredAttribute(quint16 attributeId Q_UNUSED(attributeId); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothserviceinfo_p.h b/src/bluetooth/qbluetoothserviceinfo_p.h index 8396cac0..4cec69fe 100644 --- a/src/bluetooth/qbluetoothserviceinfo_p.h +++ b/src/bluetooth/qbluetoothserviceinfo_p.h @@ -50,7 +50,7 @@ class OrgBluezServiceInterface; -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothServiceInfo; @@ -90,6 +90,6 @@ private: QBluetoothServiceInfo *q_ptr; }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothserviceinfo_qnx.cpp b/src/bluetooth/qbluetoothserviceinfo_qnx.cpp index a6cce2db..6e96dba7 100644 --- a/src/bluetooth/qbluetoothserviceinfo_qnx.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_qnx.cpp @@ -45,7 +45,7 @@ #include "qrfcommserver_p.h" #include "qrfcommserver.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothServiceInfoPrivate::QBluetoothServiceInfoPrivate() : registered(false) @@ -106,4 +106,4 @@ bool QBluetoothServiceInfoPrivate::registerService() const return true; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index 2d305863..263e5a1e 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -50,7 +50,7 @@ #include <QDebug> #include <QSocketNotifier> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothSocket @@ -679,4 +679,4 @@ QDebug operator<<(QDebug debug, QBluetoothSocket::SocketState state) #include "moc_qbluetoothsocket.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index d9199a9d..f131514a 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -50,7 +50,7 @@ #include <QIODevice> #include <QtNetwork/QAbstractSocket> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothSocketPrivate; class QBluetoothServiceInfo; @@ -173,6 +173,6 @@ Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketError); Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketState); #endif -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index 28eb04dd..df51bcc7 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -58,7 +58,7 @@ #include <QtCore/QSocketNotifier> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothSocketPrivate::QBluetoothSocketPrivate() : socket(-1), @@ -549,4 +549,4 @@ qint64 QBluetoothSocketPrivate::bytesAvailable() const return buffer.size(); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp index 7928b823..d0bd20f9 100644 --- a/src/bluetooth/qbluetoothsocket_p.cpp +++ b/src/bluetooth/qbluetoothsocket_p.cpp @@ -42,7 +42,7 @@ #include "qbluetoothsocket.h" #include "qbluetoothsocket_p.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothSocketPrivate::QBluetoothSocketPrivate() { @@ -145,4 +145,4 @@ qint64 QBluetoothSocketPrivate::bytesAvailable() const return 0; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h index 8e439ab2..e443e241 100644 --- a/src/bluetooth/qbluetoothsocket_p.h +++ b/src/bluetooth/qbluetoothsocket_p.h @@ -57,7 +57,7 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothServiceDiscoveryAgent; @@ -184,6 +184,6 @@ static inline void convertAddress(quint8 (&from)[6], quint64 &to) (quint64(from[5]) << 40); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qbluetoothsocket_qnx.cpp b/src/bluetooth/qbluetoothsocket_qnx.cpp index 693d97b4..bc7ac2d3 100644 --- a/src/bluetooth/qbluetoothsocket_qnx.cpp +++ b/src/bluetooth/qbluetoothsocket_qnx.cpp @@ -44,7 +44,7 @@ #include "qbluetoothlocaldevice.h" #include <sys/stat.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothSocketPrivate::QBluetoothSocketPrivate() : socket(-1), @@ -358,5 +358,5 @@ void QBluetoothSocketPrivate::controlEvent(ppsResult result) } } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp index 6ddd90d7..715ec689 100644 --- a/src/bluetooth/qbluetoothtransfermanager.cpp +++ b/src/bluetooth/qbluetoothtransfermanager.cpp @@ -42,7 +42,7 @@ #include "qbluetoothtransfermanager.h" #include "qbluetoothtransferrequest.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothTransferManager @@ -94,4 +94,4 @@ QBluetoothTransferManager::~QBluetoothTransferManager() #include "moc_qbluetoothtransfermanager.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h index ffb92e2c..3407f48d 100644 --- a/src/bluetooth/qbluetoothtransfermanager.h +++ b/src/bluetooth/qbluetoothtransfermanager.h @@ -49,7 +49,7 @@ QT_FORWARD_DECLARE_CLASS(QIODevice) -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothTransferReply; class QBluetoothTransferRequest; @@ -75,6 +75,6 @@ signals: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QBLUETOOTHTRANSFERMANAGER_H diff --git a/src/bluetooth/qbluetoothtransfermanager_bluez.cpp b/src/bluetooth/qbluetoothtransfermanager_bluez.cpp index ab66753d..9a74cf51 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" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransferRequest &request, QIODevice *data) @@ -61,4 +61,4 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer return rep; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothtransfermanager_p.cpp b/src/bluetooth/qbluetoothtransfermanager_p.cpp index daf6abb1..03a1db0b 100644 --- a/src/bluetooth/qbluetoothtransfermanager_p.cpp +++ b/src/bluetooth/qbluetoothtransfermanager_p.cpp @@ -43,7 +43,7 @@ #include "qbluetoothtransferrequest.h" #include "qbluetoothtransferreply.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransferRequest &request, QIODevice *data) @@ -53,4 +53,4 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer return 0; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothtransferreply.cpp b/src/bluetooth/qbluetoothtransferreply.cpp index 46c0fda2..07ee187d 100644 --- a/src/bluetooth/qbluetoothtransferreply.cpp +++ b/src/bluetooth/qbluetoothtransferreply.cpp @@ -44,7 +44,7 @@ #include "qbluetoothtransferreply_p.h" #include "qbluetoothaddress.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothTransferReply @@ -221,4 +221,4 @@ QBluetoothTransferReplyPrivate::QBluetoothTransferReplyPrivate() #include "moc_qbluetoothtransferreply.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h index f217ad0c..b58d8b4e 100644 --- a/src/bluetooth/qbluetoothtransferreply.h +++ b/src/bluetooth/qbluetoothtransferreply.h @@ -47,7 +47,7 @@ #include <qbluetoothtransferrequest.h> #include <qbluetoothtransfermanager.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothTransferReplyPrivate; @@ -101,7 +101,7 @@ private: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(QtBluetooth::QBluetoothTransferReply *); diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp index 09b49bb3..746ec486 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp +++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp @@ -55,7 +55,7 @@ static const QLatin1String agentPath("/qt/agent"); -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QBluetoothTransferReplyBluez::QBluetoothTransferReplyBluez(QIODevice *input, QObject *parent) : QBluetoothTransferReply(parent), tempfile(0), source(input), @@ -272,4 +272,4 @@ qint64 QBluetoothTransferReplyBluez::writeData(const char*, qint64) #include "moc_qbluetoothtransferreply_bluez_p.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothtransferreply_bluez_p.h b/src/bluetooth/qbluetoothtransferreply_bluez_p.h index 542fbb5b..64411778 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; -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyBluez : public QBluetoothTransferReply { @@ -119,6 +119,6 @@ public slots: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QBLUETOOTHTRANSFERREPLY_H diff --git a/src/bluetooth/qbluetoothtransferreply_p.h b/src/bluetooth/qbluetoothtransferreply_p.h index 0e841f07..54da558d 100644 --- a/src/bluetooth/qbluetoothtransferreply_p.h +++ b/src/bluetooth/qbluetoothtransferreply_p.h @@ -44,7 +44,7 @@ #include "qbluetoothtransferreply.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyPrivate { @@ -60,6 +60,6 @@ public: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QBLUETOOTHTRANSFERREPLY_H diff --git a/src/bluetooth/qbluetoothtransferrequest.cpp b/src/bluetooth/qbluetoothtransferrequest.cpp index c96e02c7..846f1fea 100644 --- a/src/bluetooth/qbluetoothtransferrequest.cpp +++ b/src/bluetooth/qbluetoothtransferrequest.cpp @@ -44,7 +44,7 @@ #include "qbluetoothtransferrequest_p.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QBluetoothTransferRequest @@ -181,4 +181,4 @@ QBluetoothTransferRequestPrivate::QBluetoothTransferRequestPrivate() { } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothtransferrequest.h b/src/bluetooth/qbluetoothtransferrequest.h index 90344696..92065d28 100644 --- a/src/bluetooth/qbluetoothtransferrequest.h +++ b/src/bluetooth/qbluetoothtransferrequest.h @@ -47,7 +47,7 @@ #include <QtCore/QtGlobal> #include <QtCore/QVariant> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothAddress; class QBluetoothTransferRequestPrivate; @@ -84,6 +84,6 @@ private: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QBLUETOOTHTRANSFERREQUEST_H diff --git a/src/bluetooth/qbluetoothtransferrequest_p.h b/src/bluetooth/qbluetoothtransferrequest_p.h index af8142cd..af527374 100644 --- a/src/bluetooth/qbluetoothtransferrequest_p.h +++ b/src/bluetooth/qbluetoothtransferrequest_p.h @@ -45,7 +45,7 @@ #include "qbluetoothglobal.h" #include "qbluetoothtransferrequest.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothAddress; @@ -58,6 +58,6 @@ public: QMap<int, QVariant> m_parameters; }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QBLUETOOTHTRANSFERREQUESTPRIVATE_H diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp index c29a044b..f8a9f001 100644 --- a/src/bluetooth/qbluetoothuuid.cpp +++ b/src/bluetooth/qbluetoothuuid.cpp @@ -51,7 +51,7 @@ //#include <netinet/in.h> #include <string.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH // Bluetooth base UUID 00000000-0000-1000-8000-00805F9B34FB // TODO: make more efficient @@ -357,4 +357,4 @@ bool QBluetoothUuid::operator==(const QBluetoothUuid &other) const return QUuid::operator==(other); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index 5936e583..2065ba2c 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -50,7 +50,7 @@ #include <QtCore/QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH struct quint128 { @@ -171,7 +171,7 @@ inline QDebug operator<<(QDebug debug, const QBluetoothUuid &uuid) return debug; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(QtBluetooth::QBluetoothUuid) diff --git a/src/bluetooth/ql2capserver.cpp b/src/bluetooth/ql2capserver.cpp index bf002c0e..fdb64dfc 100644 --- a/src/bluetooth/ql2capserver.cpp +++ b/src/bluetooth/ql2capserver.cpp @@ -43,7 +43,7 @@ #include "ql2capserver_p.h" #include "qbluetoothsocket.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QL2capServer @@ -177,4 +177,4 @@ int QL2capServer::maxPendingConnections() const #include "moc_ql2capserver.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/ql2capserver.h b/src/bluetooth/ql2capserver.h index 25277515..784c92e8 100644 --- a/src/bluetooth/ql2capserver.h +++ b/src/bluetooth/ql2capserver.h @@ -50,7 +50,7 @@ #include <qbluetooth.h> #include <qbluetoothsocket.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QL2capServerPrivate; class QBluetoothSocket; @@ -95,6 +95,6 @@ private: }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/ql2capserver_bluez.cpp b/src/bluetooth/ql2capserver_bluez.cpp index 0fa71c2b..faff7707 100644 --- a/src/bluetooth/ql2capserver_bluez.cpp +++ b/src/bluetooth/ql2capserver_bluez.cpp @@ -52,7 +52,7 @@ #include <errno.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH static inline void convertAddress(quint64 from, quint8 (&to)[6]) { @@ -245,4 +245,4 @@ QBluetooth::SecurityFlags QL2capServer::securityFlags() const return static_cast<QBluetooth::SecurityFlags>(security); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/ql2capserver_p.cpp b/src/bluetooth/ql2capserver_p.cpp index 78cc5c68..7851ee5c 100644 --- a/src/bluetooth/ql2capserver_p.cpp +++ b/src/bluetooth/ql2capserver_p.cpp @@ -43,7 +43,7 @@ #include "ql2capserver_p.h" #include "qbluetoothsocket.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QL2capServerPrivate::QL2capServerPrivate() { @@ -108,4 +108,4 @@ void QL2capServerPrivate::_q_newConnection() } #endif -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/ql2capserver_p.h b/src/bluetooth/ql2capserver_p.h index 0f11ea8d..8689fddd 100644 --- a/src/bluetooth/ql2capserver_p.h +++ b/src/bluetooth/ql2capserver_p.h @@ -49,7 +49,7 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) #endif -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothAddress; class QBluetoothSocket; @@ -85,6 +85,6 @@ private: #endif }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/ql2capsocket.cpp b/src/bluetooth/ql2capsocket.cpp index 1e806f54..76d4b4ab 100644 --- a/src/bluetooth/ql2capsocket.cpp +++ b/src/bluetooth/ql2capsocket.cpp @@ -41,7 +41,7 @@ #include "ql2capsocket.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QL2capSocket::QL2capSocket(QObject *parent) : QBluetoothSocket(parent) @@ -50,4 +50,4 @@ QL2capSocket::QL2capSocket(QObject *parent) #include "moc_ql2capsocket.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/ql2capsocket.h b/src/bluetooth/ql2capsocket.h index 2f0a5d38..ed162578 100644 --- a/src/bluetooth/ql2capsocket.h +++ b/src/bluetooth/ql2capsocket.h @@ -47,7 +47,7 @@ #include <QtCore/QObject> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QL2capSocket : public QBluetoothSocket { @@ -69,6 +69,6 @@ private: Q_DISABLE_COPY(QL2capSocket) }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QL2CAPSOCKET_H diff --git a/src/bluetooth/qnx/ppshelpers.cpp b/src/bluetooth/qnx/ppshelpers.cpp index c9acc043..e869235d 100644 --- a/src/bluetooth/qnx/ppshelpers.cpp +++ b/src/bluetooth/qnx/ppshelpers.cpp @@ -43,7 +43,7 @@ #include <QtCore/private/qcore_unix_p.h> #include <QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH static int count = 0; @@ -396,4 +396,4 @@ void ppsUnreguisterForEvent(const QString &str, QObject *obj) } } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qnx/ppshelpers_p.h b/src/bluetooth/qnx/ppshelpers_p.h index c87a9b1b..086a7306 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 -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class BBSocketNotifier : public QObject { @@ -126,6 +126,6 @@ void ppsRegisterForEvent(const QString &evt, QObject *obj); void ppsUnreguisterForEvent(const QString &evt, QObject *obj); -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // PPSHELPERS_H diff --git a/src/bluetooth/qrfcommserver.cpp b/src/bluetooth/qrfcommserver.cpp index de9ab007..f677961e 100644 --- a/src/bluetooth/qrfcommserver.cpp +++ b/src/bluetooth/qrfcommserver.cpp @@ -43,7 +43,7 @@ #include "qrfcommserver_p.h" #include "qbluetoothsocket.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH /*! \class QRfcommServer @@ -175,4 +175,4 @@ int QRfcommServer::maxPendingConnections() const #include "moc_qrfcommserver.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qrfcommserver.h b/src/bluetooth/qrfcommserver.h index 7831b0b7..4a382e6b 100644 --- a/src/bluetooth/qrfcommserver.h +++ b/src/bluetooth/qrfcommserver.h @@ -50,7 +50,7 @@ #include <qbluetooth.h> #include <qbluetoothsocket.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QRfcommServerPrivate; class QBluetoothSocket; @@ -94,6 +94,6 @@ private: #endif }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qrfcommserver_bluez.cpp b/src/bluetooth/qrfcommserver_bluez.cpp index f47f7023..d4d0a6ad 100644 --- a/src/bluetooth/qrfcommserver_bluez.cpp +++ b/src/bluetooth/qrfcommserver_bluez.cpp @@ -52,7 +52,7 @@ #include <errno.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH static inline void convertAddress(quint64 from, quint8 (&to)[6]) { @@ -248,4 +248,4 @@ QBluetooth::SecurityFlags QRfcommServer::securityFlags() const return static_cast<QBluetooth::Security>(security); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qrfcommserver_p.cpp b/src/bluetooth/qrfcommserver_p.cpp index 3b91100f..f9c3ad2e 100644 --- a/src/bluetooth/qrfcommserver_p.cpp +++ b/src/bluetooth/qrfcommserver_p.cpp @@ -43,7 +43,7 @@ #include "qrfcommserver_p.h" #include "qbluetoothsocket.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QRfcommServerPrivate::QRfcommServerPrivate() { @@ -106,4 +106,4 @@ QBluetooth::SecurityFlags QRfcommServer::securityFlags() const return QBluetooth::NoSecurity; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qrfcommserver_p.h b/src/bluetooth/qrfcommserver_p.h index af08514b..50c30fcf 100644 --- a/src/bluetooth/qrfcommserver_p.h +++ b/src/bluetooth/qrfcommserver_p.h @@ -55,7 +55,7 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) #endif -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothAddress; class QBluetoothSocket; @@ -107,6 +107,6 @@ private Q_SLOTS: #endif }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif diff --git a/src/bluetooth/qrfcommserver_qnx.cpp b/src/bluetooth/qrfcommserver_qnx.cpp index c9af204f..514a0a3d 100644 --- a/src/bluetooth/qrfcommserver_qnx.cpp +++ b/src/bluetooth/qrfcommserver_qnx.cpp @@ -49,7 +49,7 @@ #include <QCoreApplication> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QRfcommServerPrivate::QRfcommServerPrivate() : socket(0),maxPendingConnections(1),securityFlags(QBluetooth::NoSecurity) @@ -193,5 +193,5 @@ QBluetooth::SecurityFlags QRfcommServer::securityFlags() const return d->securityFlags; } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qrfcommsocket.cpp b/src/bluetooth/qrfcommsocket.cpp index 6676d39c..4e60079a 100644 --- a/src/bluetooth/qrfcommsocket.cpp +++ b/src/bluetooth/qrfcommsocket.cpp @@ -41,7 +41,7 @@ #include "qrfcommsocket.h" -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH QRfcommSocket::QRfcommSocket(QObject *parent) : QBluetoothSocket(parent) @@ -50,4 +50,4 @@ QRfcommSocket::QRfcommSocket(QObject *parent) #include "moc_qrfcommsocket.cpp" -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH diff --git a/src/bluetooth/qrfcommsocket.h b/src/bluetooth/qrfcommsocket.h index 52d10f8b..9bb18f76 100644 --- a/src/bluetooth/qrfcommsocket.h +++ b/src/bluetooth/qrfcommsocket.h @@ -44,7 +44,7 @@ #include <qbluetoothsocket.h> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QRfcommSocket : public QBluetoothSocket { @@ -57,6 +57,6 @@ private: Q_DISABLE_COPY(QRfcommSocket) }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif // QRFCOMMSOCKET_H diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h index ae4f3ee5..60b49a2d 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h @@ -53,7 +53,7 @@ #include "qdeclarativebluetoothservice_p.h" -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class QDeclarativeBluetoothDiscoveryModelPrivate; class QDeclarativeBluetoothDiscoveryModel : public QAbstractListModel, public QQmlParserStatus diff --git a/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp b/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp index 9997acf8..5fe517b3 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothimageprovider.cpp @@ -47,7 +47,7 @@ #include "qdeclarativebluetoothimageprovider_p.h" -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH // 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 62bb2b8a..0c4d1772 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothimageprovider_p.h @@ -44,7 +44,7 @@ #include <qbluetoothserviceinfo.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class BluetoothThumbnailImageProvider : public QQuickImageProvider diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice_p.h b/src/imports/bluetooth/qdeclarativebluetoothservice_p.h index b1fefdf0..0205959b 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothservice_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothservice_p.h @@ -49,7 +49,7 @@ class QDeclarativeBluetoothSocket; -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class QDeclarativeBluetoothServicePrivate; diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h index f263d2e4..c18e597a 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h @@ -50,7 +50,7 @@ #include "qdeclarativebluetoothservice_p.h" -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class QDeclarativeBluetoothSocketPrivate; class QDeclarativeBluetoothService; diff --git a/src/imports/nfc/qdeclarativendefmimerecord_p.h b/src/imports/nfc/qdeclarativendefmimerecord_p.h index 437f0def..6f58f0a5 100644 --- a/src/imports/nfc/qdeclarativendefmimerecord_p.h +++ b/src/imports/nfc/qdeclarativendefmimerecord_p.h @@ -44,7 +44,7 @@ #include <qdeclarativendefrecord.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class QDeclarativeNdefMimeRecord : public QDeclarativeNdefRecord { diff --git a/src/imports/nfc/qdeclarativendeftextrecord_p.h b/src/imports/nfc/qdeclarativendeftextrecord_p.h index 9234ca4b..2b1b1cde 100644 --- a/src/imports/nfc/qdeclarativendeftextrecord_p.h +++ b/src/imports/nfc/qdeclarativendeftextrecord_p.h @@ -46,7 +46,7 @@ #include <qndefnfctextrecord.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class QDeclarativeNdefTextRecord : public QDeclarativeNdefRecord { diff --git a/src/imports/nfc/qdeclarativendefurirecord_p.h b/src/imports/nfc/qdeclarativendefurirecord_p.h index 06ec1c63..436ce266 100644 --- a/src/imports/nfc/qdeclarativendefurirecord_p.h +++ b/src/imports/nfc/qdeclarativendefurirecord_p.h @@ -48,7 +48,7 @@ #include <QtCore/QMetaType> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class QDeclarativeNdefUriRecord : public QDeclarativeNdefRecord { diff --git a/src/imports/nfc/qdeclarativenearfield_p.h b/src/imports/nfc/qdeclarativenearfield_p.h index fe7c6b6e..3d19decc 100644 --- a/src/imports/nfc/qdeclarativenearfield_p.h +++ b/src/imports/nfc/qdeclarativenearfield_p.h @@ -51,7 +51,7 @@ class QDeclarativeNdefFilter; -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class QDeclarativeNearField : public QObject, public QQmlParserStatus { diff --git a/src/imports/nfc/qdeclarativenearfieldsocket_p.h b/src/imports/nfc/qdeclarativenearfieldsocket_p.h index 7536123d..7dfaf364 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> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class QDeclarativeNearFieldSocketPrivate; diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp index 2ddab0dd..fbe5b02b 100644 --- a/src/nfc/qdeclarativendefrecord.cpp +++ b/src/nfc/qdeclarativendefrecord.cpp @@ -44,7 +44,7 @@ #include <QtCore/QMap> #include <QtCore/QRegExp> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QDeclarativeNdefRecord @@ -271,4 +271,4 @@ void QDeclarativeNdefRecord::setRecord(const QNdefRecord &record) d->record = record; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qdeclarativendefrecord.h b/src/nfc/qdeclarativendefrecord.h index 5ca77173..7e2c488a 100644 --- a/src/nfc/qdeclarativendefrecord.h +++ b/src/nfc/qdeclarativendefrecord.h @@ -46,7 +46,7 @@ #include <QtCore/QMetaType> #include <QtNfc/QNdefRecord> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QDeclarativeNdefRecordPrivate; @@ -91,6 +91,6 @@ bool qRegisterNdefRecordType(QNdefRecord::TypeNameFormat typeNameFormat, const Q #define Q_DECLARE_NDEFRECORD(className, typeNameFormat, type) \ static bool _q_##className##_registered = qRegisterNdefRecordType<className>(typeNameFormat, type); -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QDECLARATIVENDEFRECORD_P_H diff --git a/src/nfc/qllcpserver.cpp b/src/nfc/qllcpserver.cpp index a4db525a..b99d3312 100644 --- a/src/nfc/qllcpserver.cpp +++ b/src/nfc/qllcpserver.cpp @@ -51,7 +51,7 @@ #include "qllcpserver_p.h" #endif -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QLlcpServer @@ -200,4 +200,4 @@ QLlcpSocket::SocketError QLlcpServer::serverError() const return d->serverError(); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpserver.h b/src/nfc/qllcpserver.h index eda33e40..fd405b0f 100644 --- a/src/nfc/qllcpserver.h +++ b/src/nfc/qllcpserver.h @@ -46,7 +46,7 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QLlcpSocket> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QLlcpServerPrivate; @@ -80,6 +80,6 @@ private: QLlcpServerPrivate *d_ptr; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSERVER_H diff --git a/src/nfc/qllcpserver_maemo6_p.cpp b/src/nfc/qllcpserver_maemo6_p.cpp index 894bd4f6..7cb8c1d6 100644 --- a/src/nfc/qllcpserver_maemo6_p.cpp +++ b/src/nfc/qllcpserver_maemo6_p.cpp @@ -48,7 +48,7 @@ using namespace com::nokia::nfc; -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC static QAtomicInt requestorId = 0; static const char * const requestorBasePath = "/com/nokia/nfc/llcpserver/"; @@ -197,4 +197,4 @@ void QLlcpServerPrivate::Socket(const QDBusVariant &lsap, int fd, const QVariant Q_UNUSED(properties); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpserver_maemo6_p.h b/src/nfc/qllcpserver_maemo6_p.h index c93b8245..a9c72ec0 100644 --- a/src/nfc/qllcpserver_maemo6_p.h +++ b/src/nfc/qllcpserver_maemo6_p.h @@ -54,7 +54,7 @@ QT_FORWARD_DECLARE_CLASS(QDBusVariant) class AccessRequestorAdaptor; class LLCPRequestorAdaptor; -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class SocketRequestor; @@ -108,6 +108,6 @@ private: QLlcpSocket::SocketError m_error; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSERVER_MAEMO6_P_H diff --git a/src/nfc/qllcpserver_p.cpp b/src/nfc/qllcpserver_p.cpp index d1da05d9..3a4bc08c 100644 --- a/src/nfc/qllcpserver_p.cpp +++ b/src/nfc/qllcpserver_p.cpp @@ -41,7 +41,7 @@ #include "qllcpserver_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q) : q_ptr(q) @@ -93,4 +93,4 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const return QLlcpSocket::UnknownSocketError; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpserver_p.h b/src/nfc/qllcpserver_p.h index f945dff9..a1464893 100644 --- a/src/nfc/qllcpserver_p.h +++ b/src/nfc/qllcpserver_p.h @@ -46,7 +46,7 @@ #include "qllcpserver.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QLlcpServerPrivate { @@ -73,6 +73,6 @@ private: QLlcpServer *q_ptr; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSERVER_P_H diff --git a/src/nfc/qllcpserver_qnx_p.cpp b/src/nfc/qllcpserver_qnx_p.cpp index a7399186..1bc4fb3e 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" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC 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()); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpserver_qnx_p.h b/src/nfc/qllcpserver_qnx_p.h index 9d7d7cf6..22ba98e6 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" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QLlcpServerPrivate : public QObject { @@ -78,6 +78,6 @@ private: nfc_target_t *m_target; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSERVER_QNX_P_H diff --git a/src/nfc/qllcpserver_simulator_p.cpp b/src/nfc/qllcpserver_simulator_p.cpp index 9af60975..df5dfefd 100644 --- a/src/nfc/qllcpserver_simulator_p.cpp +++ b/src/nfc/qllcpserver_simulator_p.cpp @@ -41,7 +41,7 @@ #include "qllcpserver_simulator_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q) : q_ptr(q) @@ -89,4 +89,4 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const return QLlcpSocket::UnknownSocketError; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpserver_simulator_p.h b/src/nfc/qllcpserver_simulator_p.h index c2939022..112fbe53 100644 --- a/src/nfc/qllcpserver_simulator_p.h +++ b/src/nfc/qllcpserver_simulator_p.h @@ -46,7 +46,7 @@ #include "qllcpserver.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QLlcpServerPrivate { @@ -70,6 +70,6 @@ private: QLlcpServer *q_ptr; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSERVER_P_H diff --git a/src/nfc/qllcpsocket.cpp b/src/nfc/qllcpsocket.cpp index 62106e01..92207745 100644 --- a/src/nfc/qllcpsocket.cpp +++ b/src/nfc/qllcpsocket.cpp @@ -51,7 +51,7 @@ #include "qllcpsocket_p.h" #endif -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QLlcpSocket @@ -402,4 +402,4 @@ qint64 QLlcpSocket::writeData(const char *data, qint64 len) return d->writeData(data, len); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpsocket.h b/src/nfc/qllcpsocket.h index 6840c6a9..8a0d16ed 100644 --- a/src/nfc/qllcpsocket.h +++ b/src/nfc/qllcpsocket.h @@ -46,7 +46,7 @@ #include <QtNetwork/QAbstractSocket> #include <QtNfc/qnfcglobal.h> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldTarget; class QLlcpSocketPrivate; @@ -126,6 +126,6 @@ private: QLlcpSocketPrivate *d_ptr; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSOCKET_H diff --git a/src/nfc/qllcpsocket_maemo6_p.cpp b/src/nfc/qllcpsocket_maemo6_p.cpp index 9a802bc1..cea3f1d7 100644 --- a/src/nfc/qllcpsocket_maemo6_p.cpp +++ b/src/nfc/qllcpsocket_maemo6_p.cpp @@ -53,7 +53,7 @@ using namespace com::nokia::nfc; -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC static QAtomicInt requestorId = 0; static const char * const requestorBasePath = "/com/nokia/nfc/llcpclient/"; @@ -637,4 +637,4 @@ void QLlcpSocketPrivate::initializeRequestor() } } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpsocket_maemo6_p.h b/src/nfc/qllcpsocket_maemo6_p.h index f0aa0076..d210979b 100644 --- a/src/nfc/qllcpsocket_maemo6_p.h +++ b/src/nfc/qllcpsocket_maemo6_p.h @@ -55,7 +55,7 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) class AccessRequestorAdaptor; class LLCPRequestorAdaptor; -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class SocketRequestor; @@ -142,6 +142,6 @@ private: QLlcpSocket::SocketError m_error; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSOCKET_MAEMO6_P_H diff --git a/src/nfc/qllcpsocket_p.cpp b/src/nfc/qllcpsocket_p.cpp index 982896b9..f7d1e81c 100644 --- a/src/nfc/qllcpsocket_p.cpp +++ b/src/nfc/qllcpsocket_p.cpp @@ -41,7 +41,7 @@ #include "qllcpsocket_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q) : q_ptr(q) @@ -191,4 +191,4 @@ bool QLlcpSocketPrivate::waitForDisconnected(int msecs) return false; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h index 149d8b32..cf60e31e 100644 --- a/src/nfc/qllcpsocket_p.h +++ b/src/nfc/qllcpsocket_p.h @@ -46,7 +46,7 @@ #include "qllcpsocket.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QLlcpSocketPrivate { @@ -92,6 +92,6 @@ private: QLlcpSocket *q_ptr; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSOCKET_P_H diff --git a/src/nfc/qllcpsocket_qnx_p.cpp b/src/nfc/qllcpsocket_qnx_p.cpp index f4391172..5bd98ea5 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> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q) : q_ptr(q), m_conListener(0), m_state(QLlcpSocket::UnconnectedState), m_server(false) @@ -313,5 +313,5 @@ void QLlcpSocketPrivate::enteringIdle() } } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpsocket_qnx_p.h b/src/nfc/qllcpsocket_qnx_p.h index 79b2820d..88e18942 100644 --- a/src/nfc/qllcpsocket_qnx_p.h +++ b/src/nfc/qllcpsocket_qnx_p.h @@ -46,7 +46,7 @@ #include "qnearfieldtarget_qnx_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QLlcpSocketPrivate : public QObject { @@ -120,6 +120,6 @@ private Q_SLOTS: void enteringIdle(); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSOCKET_QNX_P_H diff --git a/src/nfc/qllcpsocket_simulator_p.cpp b/src/nfc/qllcpsocket_simulator_p.cpp index 8f5250cf..872c67c7 100644 --- a/src/nfc/qllcpsocket_simulator_p.cpp +++ b/src/nfc/qllcpsocket_simulator_p.cpp @@ -41,7 +41,7 @@ #include "qllcpsocket_simulator_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q) : q_ptr(q) @@ -186,4 +186,4 @@ bool QLlcpSocketPrivate::waitForDisconnected(int msecs) return false; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qllcpsocket_simulator_p.h b/src/nfc/qllcpsocket_simulator_p.h index a0b17773..abaa13e8 100644 --- a/src/nfc/qllcpsocket_simulator_p.h +++ b/src/nfc/qllcpsocket_simulator_p.h @@ -46,7 +46,7 @@ #include "qllcpsocket.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QLlcpSocketPrivate { @@ -90,6 +90,6 @@ private: QLlcpSocket *q_ptr; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QLLCPSOCKET_P_H diff --git a/src/nfc/qndeffilter.cpp b/src/nfc/qndeffilter.cpp index a0df4321..a63204d5 100644 --- a/src/nfc/qndeffilter.cpp +++ b/src/nfc/qndeffilter.cpp @@ -43,7 +43,7 @@ #include <QtCore/QList> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNdefFilter @@ -201,4 +201,4 @@ int QNdefFilter::recordCount() const return d->filterRecords.count(); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h index ced109e8..3ff6cc76 100644 --- a/src/nfc/qndeffilter.h +++ b/src/nfc/qndeffilter.h @@ -46,7 +46,7 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC 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); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNDEFFILTER_H diff --git a/src/nfc/qndefmessage.cpp b/src/nfc/qndefmessage.cpp index b7d2da1c..08ef650b 100644 --- a/src/nfc/qndefmessage.cpp +++ b/src/nfc/qndefmessage.cpp @@ -42,7 +42,7 @@ #include "qndefmessage.h" #include "qndefrecord_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNdefMessage @@ -319,4 +319,4 @@ QByteArray QNdefMessage::toByteArray() const return m; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qndefmessage.h b/src/nfc/qndefmessage.h index 13094621..133469a1 100644 --- a/src/nfc/qndefmessage.h +++ b/src/nfc/qndefmessage.h @@ -49,7 +49,7 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class Q_NFC_EXPORT QNdefMessage : public QList<QNdefRecord> { @@ -66,7 +66,7 @@ public: static QNdefMessage fromByteArray(const QByteArray &message); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC Q_DECLARE_METATYPE(QtNfc::QNdefMessage) diff --git a/src/nfc/qndefnfctextrecord.cpp b/src/nfc/qndefnfctextrecord.cpp index 99732b13..6f213cf4 100644 --- a/src/nfc/qndefnfctextrecord.cpp +++ b/src/nfc/qndefnfctextrecord.cpp @@ -44,7 +44,7 @@ #include <QtCore/QTextCodec> #include <QtCore/QLocale> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNdefNfcTextRecord @@ -188,4 +188,4 @@ void QNdefNfcTextRecord::setEncoding(Encoding encoding) setText(string); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h index ce227b58..5fe593ba 100644 --- a/src/nfc/qndefnfctextrecord.h +++ b/src/nfc/qndefnfctextrecord.h @@ -45,7 +45,7 @@ #include <QtNfc/qnfcglobal.h> #include <QtNfc/QNdefRecord> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class Q_NFC_EXPORT QNdefNfcTextRecord : public QNdefRecord { @@ -67,7 +67,7 @@ public: void setEncoding(Encoding encoding); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcTextRecord, QNdefRecord::NfcRtd, "T") diff --git a/src/nfc/qndefnfcurirecord.cpp b/src/nfc/qndefnfcurirecord.cpp index 72f371ab..dbe9cd5a 100644 --- a/src/nfc/qndefnfcurirecord.cpp +++ b/src/nfc/qndefnfcurirecord.cpp @@ -46,7 +46,7 @@ #include <QtCore/QDebug> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNdefNfcUriRecord @@ -143,4 +143,4 @@ void QNdefNfcUriRecord::setUri(const QUrl &uri) setPayload(p); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qndefnfcurirecord.h b/src/nfc/qndefnfcurirecord.h index 4c52ccbe..8d852b35 100644 --- a/src/nfc/qndefnfcurirecord.h +++ b/src/nfc/qndefnfcurirecord.h @@ -47,7 +47,7 @@ QT_FORWARD_DECLARE_CLASS(QUrl) -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class Q_NFC_EXPORT QNdefNfcUriRecord : public QNdefRecord { @@ -58,7 +58,7 @@ public: void setUri(const QUrl &uri); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcUriRecord, QNdefRecord::NfcRtd, "U") diff --git a/src/nfc/qndefrecord.cpp b/src/nfc/qndefrecord.cpp index 0694bebe..77dc71e9 100644 --- a/src/nfc/qndefrecord.cpp +++ b/src/nfc/qndefrecord.cpp @@ -45,7 +45,7 @@ #include <QtCore/QHash> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNdefRecord @@ -349,4 +349,4 @@ bool QNdefRecord::operator==(const QNdefRecord &other) const return true; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qndefrecord.h b/src/nfc/qndefrecord.h index 6717427f..cdc84507 100644 --- a/src/nfc/qndefrecord.h +++ b/src/nfc/qndefrecord.h @@ -46,7 +46,7 @@ #include <QtCore/QByteArray> #include <QtNfc/qnfcglobal.h> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNdefRecordPrivate; @@ -105,15 +105,15 @@ private: className(const QNdefRecord &other) : QNdefRecord(other, typeNameFormat, type) { } #define Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(className, typeNameFormat_, type_) \ - QTNFC_BEGIN_NAMESPACE \ + QT_BEGIN_NAMESPACE_NFC \ template<> inline bool QNdefRecord::isRecordType<className>() const\ { \ return (typeNameFormat() == typeNameFormat_ && type() == type_); \ } \ - QTNFC_END_NAMESPACE + QT_END_NAMESPACE_NFC uint qHash(const QNdefRecord &key); -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNDEFRECORD_H diff --git a/src/nfc/qndefrecord_p.h b/src/nfc/qndefrecord_p.h index 98458a82..efade5b2 100644 --- a/src/nfc/qndefrecord_p.h +++ b/src/nfc/qndefrecord_p.h @@ -48,7 +48,7 @@ #include <QtCore/QSharedData> #include <QtCore/QByteArray> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNdefRecordPrivate : public QSharedData { @@ -62,6 +62,6 @@ public: QByteArray payload; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNDEFRECORD_P_H diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp index 571c4502..fc02d0f8 100644 --- a/src/nfc/qnearfieldmanager.cpp +++ b/src/nfc/qnearfieldmanager.cpp @@ -55,7 +55,7 @@ #include <QtCore/QMetaType> #include <QtCore/QMetaMethod> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNearFieldManager @@ -442,4 +442,4 @@ QNearFieldManager::TargetAccessModes QNearFieldManager::targetAccessModes() cons return d->m_requestedModes; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h index 847de558..c190996a 100644 --- a/src/nfc/qnearfieldmanager.h +++ b/src/nfc/qnearfieldmanager.h @@ -48,7 +48,7 @@ #include <QtNfc/QNdefRecord> #include <QtNfc/QNdefFilter> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC 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) -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDMANAGER_H diff --git a/src/nfc/qnearfieldmanager_emulator.cpp b/src/nfc/qnearfieldmanager_emulator.cpp index 82c29f82..8cde69b9 100644 --- a/src/nfc/qnearfieldmanager_emulator.cpp +++ b/src/nfc/qnearfieldmanager_emulator.cpp @@ -47,7 +47,7 @@ #include <QtCore/QDebug> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl() { @@ -101,4 +101,4 @@ void QNearFieldManagerPrivateImpl::tagDeactivated(TagBase *tag) targetDeactivated(target); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h index 0935649f..0535287b 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> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class TagBase; class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivateVirtualBase @@ -75,6 +75,6 @@ private: }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDMANAGER_EMULATOR_H diff --git a/src/nfc/qnearfieldmanager_maemo6.cpp b/src/nfc/qnearfieldmanager_maemo6.cpp index 42ebb33b..cfbb910e 100644 --- a/src/nfc/qnearfieldmanager_maemo6.cpp +++ b/src/nfc/qnearfieldmanager_maemo6.cpp @@ -54,7 +54,7 @@ using namespace com::nokia::nfc; -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC static QAtomicInt handlerId = 0; static const char * const registeredHandlerPath = "/com/nokia/nfc/ndefhandler"; @@ -448,4 +448,4 @@ void QNearFieldManagerPrivateImpl::_q_targetLost(const QDBusObjectPath &targetPa emit targetLost(nearFieldTarget); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldmanager_maemo6_p.h b/src/nfc/qnearfieldmanager_maemo6_p.h index 474a8318..211a1696 100644 --- a/src/nfc/qnearfieldmanager_maemo6_p.h +++ b/src/nfc/qnearfieldmanager_maemo6_p.h @@ -61,7 +61,7 @@ class ComNokiaNfcAdapterInterface; class NDEFHandlerAdaptor; class AccessRequestorAdaptor; -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldManagerPrivateImpl; @@ -143,6 +143,6 @@ private: QMap<QString, QBasicTimer> m_pendingDetectedTargets; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDMANAGER_MAEMO6_P_H diff --git a/src/nfc/qnearfieldmanager_p.h b/src/nfc/qnearfieldmanager_p.h index da087b0f..0ea2af0c 100644 --- a/src/nfc/qnearfieldmanager_p.h +++ b/src/nfc/qnearfieldmanager_p.h @@ -50,7 +50,7 @@ #include <QtCore/QObject> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNdefFilter; @@ -124,6 +124,6 @@ public: QNearFieldManager::TargetAccessModes m_requestedModes; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDMANAGER_P_H diff --git a/src/nfc/qnearfieldmanager_qnx.cpp b/src/nfc/qnearfieldmanager_qnx.cpp index 20fa88dc..1cb3cbdb 100644 --- a/src/nfc/qnearfieldmanager_qnx.cpp +++ b/src/nfc/qnearfieldmanager_qnx.cpp @@ -46,7 +46,7 @@ #include "qndeffilter.h" #include "qndefrecord.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl() : m_handlerID(0) @@ -203,4 +203,4 @@ void QNearFieldManagerPrivateImpl::updateNdefFilter() } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldmanager_qnx_p.h b/src/nfc/qnearfieldmanager_qnx_p.h index e5a39228..f6b06d12 100644 --- a/src/nfc/qnearfieldmanager_qnx_p.h +++ b/src/nfc/qnearfieldmanager_qnx_p.h @@ -48,7 +48,7 @@ #include "qnx/qnxnfcmanager_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate { @@ -87,6 +87,6 @@ private: QList< QPair<QPair<int, QObject *>, QPair<QNdefFilter, QMetaMethod> > > ndefFilterHandlers; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDMANAGER_QNX_P_H diff --git a/src/nfc/qnearfieldmanager_simulator.cpp b/src/nfc/qnearfieldmanager_simulator.cpp index 18cb6e33..03fb597a 100644 --- a/src/nfc/qnearfieldmanager_simulator.cpp +++ b/src/nfc/qnearfieldmanager_simulator.cpp @@ -50,7 +50,7 @@ #include <QtCore/QCoreApplication> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC using namespace QtSimulatorPrivate; @@ -202,6 +202,6 @@ void QNearFieldManagerPrivateImpl::targetLeavingProximity(const QByteArray &uid) targetDeactivated(target); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #include "qnearfieldmanager_simulator.moc" diff --git a/src/nfc/qnearfieldmanager_simulator_p.h b/src/nfc/qnearfieldmanager_simulator_p.h index b2ca7343..489b9eee 100644 --- a/src/nfc/qnearfieldmanager_simulator_p.h +++ b/src/nfc/qnearfieldmanager_simulator_p.h @@ -46,7 +46,7 @@ #include <QtCore/QWeakPointer> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC namespace Simulator { class NfcConnection; @@ -71,6 +71,6 @@ private: QMap<QByteArray, QWeakPointer<QNearFieldTarget> > m_targets; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDMANAGER_SIMULATOR_P_H diff --git a/src/nfc/qnearfieldmanagerimpl_p.cpp b/src/nfc/qnearfieldmanagerimpl_p.cpp index 28fe62fe..b1518be8 100644 --- a/src/nfc/qnearfieldmanagerimpl_p.cpp +++ b/src/nfc/qnearfieldmanagerimpl_p.cpp @@ -43,7 +43,7 @@ #include "qnearfieldmanagerimpl_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /* Constructs a new near field manager private implementation. @@ -59,4 +59,4 @@ QNearFieldManagerPrivateImpl::~QNearFieldManagerPrivateImpl() { } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldmanagerimpl_p.h b/src/nfc/qnearfieldmanagerimpl_p.h index d7bdd063..4f1a3700 100644 --- a/src/nfc/qnearfieldmanagerimpl_p.h +++ b/src/nfc/qnearfieldmanagerimpl_p.h @@ -44,7 +44,7 @@ #include "qnearfieldmanager_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate { @@ -53,6 +53,6 @@ public: ~QNearFieldManagerPrivateImpl(); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDMANAGERIMPL_P_H diff --git a/src/nfc/qnearfieldmanagervirtualbase.cpp b/src/nfc/qnearfieldmanagervirtualbase.cpp index ffafa281..72d6800e 100644 --- a/src/nfc/qnearfieldmanagervirtualbase.cpp +++ b/src/nfc/qnearfieldmanagervirtualbase.cpp @@ -43,7 +43,7 @@ #include "qndefmessage.h" #include "qtlv_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC static inline bool matchesTarget(QNearFieldTarget::Type type, const QList<QNearFieldTarget::Type> &types) @@ -214,4 +214,4 @@ void QNearFieldManagerPrivateVirtualBase::ndefReceived(const QNdefMessage &messa } } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldmanagervirtualbase_p.h b/src/nfc/qnearfieldmanagervirtualbase_p.h index 67451f90..97fe9724 100644 --- a/src/nfc/qnearfieldmanagervirtualbase_p.h +++ b/src/nfc/qnearfieldmanagervirtualbase_p.h @@ -46,7 +46,7 @@ #include <QtCore/QMetaMethod> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldManagerPrivateVirtualBase : public QNearFieldManagerPrivate { @@ -85,6 +85,6 @@ private: QList<QNearFieldTarget::Type> m_detectTargetTypes; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDMANAGERVIRTUALBASE_P_H diff --git a/src/nfc/qnearfieldtagtype1.cpp b/src/nfc/qnearfieldtagtype1.cpp index 28477c90..5c64365e 100644 --- a/src/nfc/qnearfieldtagtype1.cpp +++ b/src/nfc/qnearfieldtagtype1.cpp @@ -49,7 +49,7 @@ #include <QtCore/QDebug> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNearFieldTagType1 @@ -733,4 +733,4 @@ bool QNearFieldTagType1::handleResponse(const QNearFieldTarget::RequestId &id, return handled; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldtagtype1.h b/src/nfc/qnearfieldtagtype1.h index e381c7d4..822378d1 100644 --- a/src/nfc/qnearfieldtagtype1.h +++ b/src/nfc/qnearfieldtagtype1.h @@ -44,7 +44,7 @@ #include <QtNfc/QNearFieldTarget> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldTagType1Private; @@ -93,6 +93,6 @@ private: QNearFieldTagType1Private *d_ptr; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDTAGTYPE1_H diff --git a/src/nfc/qnearfieldtagtype2.cpp b/src/nfc/qnearfieldtagtype2.cpp index 1add9b78..348b0751 100644 --- a/src/nfc/qnearfieldtagtype2.cpp +++ b/src/nfc/qnearfieldtagtype2.cpp @@ -48,7 +48,7 @@ #include <QtCore/QDebug> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNearFieldTagType2 @@ -346,4 +346,4 @@ void QNearFieldTagType2::timerEvent(QTimerEvent *event) } } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldtagtype2.h b/src/nfc/qnearfieldtagtype2.h index 46d61332..531fa7fa 100644 --- a/src/nfc/qnearfieldtagtype2.h +++ b/src/nfc/qnearfieldtagtype2.h @@ -44,7 +44,7 @@ #include <QtNfc/QNearFieldTarget> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldTagType2Private; @@ -82,6 +82,6 @@ private: QNearFieldTagType2Private *d_ptr; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDTAGTYPE2_H diff --git a/src/nfc/qnearfieldtagtype3.cpp b/src/nfc/qnearfieldtagtype3.cpp index aafd123c..9c2d939f 100644 --- a/src/nfc/qnearfieldtagtype3.cpp +++ b/src/nfc/qnearfieldtagtype3.cpp @@ -41,7 +41,7 @@ #include "qnearfieldtagtype3.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNearFieldTagType3 @@ -183,4 +183,4 @@ bool QNearFieldTagType3::handleResponse(const QNearFieldTarget::RequestId &id, return QNearFieldTarget::handleResponse(id, response); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldtagtype3.h b/src/nfc/qnearfieldtagtype3.h index df131dbf..bc16610d 100644 --- a/src/nfc/qnearfieldtagtype3.h +++ b/src/nfc/qnearfieldtagtype3.h @@ -46,7 +46,7 @@ #include <QtCore/QMap> #include <QtNfc/QNearFieldTarget> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class Q_NFC_EXPORT QNearFieldTagType3 : public QNearFieldTarget { @@ -72,6 +72,6 @@ protected: bool handleResponse(const QNearFieldTarget::RequestId &id, const QByteArray &response); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDTAGTYPE3_H diff --git a/src/nfc/qnearfieldtagtype4.cpp b/src/nfc/qnearfieldtagtype4.cpp index 8b94e639..9e600a07 100644 --- a/src/nfc/qnearfieldtagtype4.cpp +++ b/src/nfc/qnearfieldtagtype4.cpp @@ -41,7 +41,7 @@ #include "qnearfieldtagtype4.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNearFieldTagType4 @@ -159,4 +159,4 @@ bool QNearFieldTagType4::handleResponse(const QNearFieldTarget::RequestId &id, return QNearFieldTarget::handleResponse(id, response); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldtagtype4.h b/src/nfc/qnearfieldtagtype4.h index 9070c8a5..57ce0e42 100644 --- a/src/nfc/qnearfieldtagtype4.h +++ b/src/nfc/qnearfieldtagtype4.h @@ -44,7 +44,7 @@ #include <QtNfc/QNearFieldTarget> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class Q_NFC_EXPORT QNearFieldTagType4 : public QNearFieldTarget { @@ -68,6 +68,6 @@ protected: bool handleResponse(const QNearFieldTarget::RequestId &id, const QByteArray &response); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDTAGTYPE4_H diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp index d519eab3..e9b8c716 100644 --- a/src/nfc/qnearfieldtarget.cpp +++ b/src/nfc/qnearfieldtarget.cpp @@ -49,7 +49,7 @@ #include <QtCore/QDebug> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC /*! \class QNearFieldTarget @@ -457,4 +457,4 @@ bool QNearFieldTarget::handleResponse(const QNearFieldTarget::RequestId &id, return true; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index 4dba557e..fbf0454d 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -53,7 +53,7 @@ class QString; class QUrl; QT_END_NAMESPACE -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNdefMessage; class QNearFieldTargetPrivate; @@ -164,7 +164,7 @@ Q_NFC_EXPORT quint16 qNfcChecksum(const char * data, uint len); Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldTarget::AccessMethods) -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::RequestId) Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::Error) diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp index 0a083084..885dd667 100644 --- a/src/nfc/qnearfieldtarget_emulator.cpp +++ b/src/nfc/qnearfieldtarget_emulator.cpp @@ -48,7 +48,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDateTime> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC static QMutex tagMutex; static QMap<TagBase *, bool> tagMap; @@ -300,4 +300,4 @@ void TagActivator::timerEvent(QTimerEvent *e) tagMutex.unlock(); } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h index 92f9da3a..91cc7112 100644 --- a/src/nfc/qnearfieldtarget_emulator_p.h +++ b/src/nfc/qnearfieldtarget_emulator_p.h @@ -48,7 +48,7 @@ #include <QtCore/QMap> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class TagType1 : public QNearFieldTagType1 { @@ -113,6 +113,6 @@ private: int timerId; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDTARGET_EMULATOR_P_H diff --git a/src/nfc/qnearfieldtarget_maemo6.cpp b/src/nfc/qnearfieldtarget_maemo6.cpp index f13d191e..43e2c5e5 100644 --- a/src/nfc/qnearfieldtarget_maemo6.cpp +++ b/src/nfc/qnearfieldtarget_maemo6.cpp @@ -41,7 +41,7 @@ #include "qnearfieldtarget_maemo6_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC void PendingCallWatcher::addSendCommand(const QDBusPendingReply<QByteArray> &reply, const QNearFieldTarget::RequestId &id) @@ -176,4 +176,4 @@ int TagType4::memorySize() const #include <moc_qnearfieldtarget_maemo6_p.cpp> -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnearfieldtarget_maemo6_p.h b/src/nfc/qnearfieldtarget_maemo6_p.h index f4fc1488..c1a90559 100644 --- a/src/nfc/qnearfieldtarget_maemo6_p.h +++ b/src/nfc/qnearfieldtarget_maemo6_p.h @@ -63,7 +63,7 @@ using namespace com::nokia::nfc; -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class PendingCallWatcher : public QObject { @@ -308,6 +308,6 @@ public: int memorySize() const; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDTARGET_MAEMO6_P_H diff --git a/src/nfc/qnearfieldtarget_p.h b/src/nfc/qnearfieldtarget_p.h index 4df4e809..3aab2108 100644 --- a/src/nfc/qnearfieldtarget_p.h +++ b/src/nfc/qnearfieldtarget_p.h @@ -49,7 +49,7 @@ #include <QtCore/QMap> #include <QtCore/QSharedData> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldTarget::RequestIdPrivate : public QSharedData { @@ -61,6 +61,6 @@ public: QMap<QNearFieldTarget::RequestId, QVariant> m_decodedResponses; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDTARGET_P_H diff --git a/src/nfc/qnearfieldtarget_qnx_p.h b/src/nfc/qnearfieldtarget_qnx_p.h index 116ffa30..09b3c252 100644 --- a/src/nfc/qnearfieldtarget_qnx_p.h +++ b/src/nfc/qnearfieldtarget_qnx_p.h @@ -51,7 +51,7 @@ #include "qnx/qnxnfcmanager_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC template <typename T> class NearFieldTarget : public T @@ -193,6 +193,6 @@ protected: QList<QNdefMessage> m_ndefMessages; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNEARFIELDTARGET_QNX_H diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h index 2ee8f6bb..c854b4a1 100644 --- a/src/nfc/qnfcglobal.h +++ b/src/nfc/qnfcglobal.h @@ -45,15 +45,15 @@ #include <QtCore/qglobal.h> #if defined(QT_NAMESPACE) -# define QTNFC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::QtNfc::name -# define QTNFC_BEGIN_NAMESPACE namespace QT_NAMESPACE { namespace QtNfc { -# define QTNFC_END_NAMESPACE } } -# define QTNFC_USE_NAMESPACE using namespace QT_NAMESPACE; using namespace QtNfc; +# 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 QTNFC_PREPEND_NAMESPACE(name) ::QtNfc::name -# define QTNFC_BEGIN_NAMESPACE namespace QtNfc { -# define QTNFC_END_NAMESPACE } -# define QTNFC_USE_NAMESPACE using namespace QtNfc; +# 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 #ifndef QT_STATIC diff --git a/src/nfc/qnx/qnxnfceventfilter.cpp b/src/nfc/qnx/qnxnfceventfilter.cpp index e0665b86..52a1d08e 100644 --- a/src/nfc/qnx/qnxnfceventfilter.cpp +++ b/src/nfc/qnx/qnxnfceventfilter.cpp @@ -3,7 +3,7 @@ #include "nfc/nfc.h" #include "qnxnfcmanager_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QNXNFCEventFilter::QNXNFCEventFilter() { @@ -59,4 +59,4 @@ bool QNXNFCEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes return false; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnx/qnxnfceventfilter_p.h b/src/nfc/qnx/qnxnfceventfilter_p.h index ca023320..875b2405 100644 --- a/src/nfc/qnx/qnxnfceventfilter_p.h +++ b/src/nfc/qnx/qnxnfceventfilter_p.h @@ -10,7 +10,7 @@ #include "../qnfcglobal.h" #include "../qndefmessage.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNXNFCEventFilter : public QObject, public QAbstractNativeEventFilter { @@ -29,6 +29,6 @@ Q_SIGNALS: void ndefEvent(const QNdefMessage &msg); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QNXNFCEVENTFILTER_H diff --git a/src/nfc/qnx/qnxnfcmanager.cpp b/src/nfc/qnx/qnxnfcmanager.cpp index 46171331..2852d95d 100644 --- a/src/nfc/qnx/qnxnfcmanager.cpp +++ b/src/nfc/qnx/qnxnfcmanager.cpp @@ -44,7 +44,7 @@ #include <QMetaObject> #include "../qllcpsocket_qnx_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QNXNFCManager *QNXNFCManager::m_instance = 0; @@ -482,4 +482,4 @@ QNdefMessage QNXNFCManager::decodeMessage(nfc_ndef_message_t *nextMessage) return newNdefMessage; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qnx/qnxnfcmanager_p.h b/src/nfc/qnx/qnxnfcmanager_p.h index b19cc312..b7a309e0 100644 --- a/src/nfc/qnx/qnxnfcmanager_p.h +++ b/src/nfc/qnx/qnxnfcmanager_p.h @@ -60,7 +60,7 @@ #define qQNXNFCDebug QT_NO_QDEBUG_MACRO #endif -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QLlcpSocketPrivate; @@ -135,7 +135,7 @@ Q_SIGNALS: void llcpDisconnected(); }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif diff --git a/src/nfc/qtlv.cpp b/src/nfc/qtlv.cpp index 3476f20a..928e66fe 100644 --- a/src/nfc/qtlv.cpp +++ b/src/nfc/qtlv.cpp @@ -47,7 +47,7 @@ #include <QtCore/QDebug> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC QPair<int, int> qParseReservedMemoryControlTlv(const QByteArray &tlvData) { @@ -529,4 +529,4 @@ int QTlvWriter::moveToNextAvailable() return length; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/qtlv_p.h b/src/nfc/qtlv_p.h index 50909150..b67b100a 100644 --- a/src/nfc/qtlv_p.h +++ b/src/nfc/qtlv_p.h @@ -50,7 +50,7 @@ #include <QtCore/QMap> #include <QtCore/QPair> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC 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); -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // QTLV_P_H diff --git a/src/nfc/targetemulator.cpp b/src/nfc/targetemulator.cpp index a374f521..21506188 100644 --- a/src/nfc/targetemulator.cpp +++ b/src/nfc/targetemulator.cpp @@ -49,7 +49,7 @@ // Implementation of qNfcChecksum #include "checksum_p.h" -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC TagBase::TagBase() : lastAccess(0) @@ -391,4 +391,4 @@ QByteArray NfcTagType2::processCommand(const QByteArray &command) return response; } -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC diff --git a/src/nfc/targetemulator_p.h b/src/nfc/targetemulator_p.h index 199fffec..c2fffa13 100644 --- a/src/nfc/targetemulator_p.h +++ b/src/nfc/targetemulator_p.h @@ -48,7 +48,7 @@ QT_FORWARD_DECLARE_CLASS(QSettings) -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class TagBase { @@ -107,6 +107,6 @@ private: bool expectPacket2; }; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC #endif // TARGETEMULATOR_P_H diff --git a/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp b/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp index c41926a5..b789e417 100644 --- a/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp +++ b/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp @@ -45,7 +45,7 @@ #include <qbluetoothaddress.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class tst_QBluetoothAddress : public QObject { diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp index bd9ed476..260ad906 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp +++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp @@ -48,7 +48,7 @@ #include <qbluetoothdevicediscoveryagent.h> #include <qbluetoothlocaldevice.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH 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 3cd890e7..db86342f 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> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH 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 fec5e441..2b064b33 100644 --- a/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp +++ b/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp @@ -46,7 +46,7 @@ #include <qbluetoothhostinfo.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class tst_QBluetoothHostInfo : public QObject { diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp index ea5e20aa..8ceee35a 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> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class tst_QBluetoothLocalDevice : public QObject { diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index fddfa9c0..ec662271 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -50,7 +50,7 @@ #include <qbluetoothservicediscoveryagent.h> #include <qbluetoothlocaldevice.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH 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 a7add931..4d311cde 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> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH 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 73b97d75..664d9d75 100644 --- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp +++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp @@ -53,7 +53,7 @@ #include <btclient.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH 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 8e508fd1..a4059340 100644 --- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp +++ b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp @@ -56,7 +56,7 @@ #include <qbluetoothservicediscoveryagent.h> #include <btclient.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH typedef QMap<int,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 c1da6ff7..114dabe3 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> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH 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 5e1474d6..78637627 100644 --- a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp +++ b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp @@ -51,7 +51,7 @@ # include <netinet/in.h> #endif -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(quint128) diff --git a/tests/auto/ql2capserver/tst_ql2capserver.cpp b/tests/auto/ql2capserver/tst_ql2capserver.cpp index 47784eec..5154ab49 100644 --- a/tests/auto/ql2capserver/tst_ql2capserver.cpp +++ b/tests/auto/ql2capserver/tst_ql2capserver.cpp @@ -46,7 +46,7 @@ #include <ql2capserver.h> #include <qbluetoothsocket.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(QBluetooth::SecurityFlags); diff --git a/tests/auto/qndefmessage/tst_qndefmessage.cpp b/tests/auto/qndefmessage/tst_qndefmessage.cpp index 44a8446d..90453938 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> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC Q_DECLARE_METATYPE(QNdefRecord) diff --git a/tests/auto/qndefrecord/tst_qndefrecord.cpp b/tests/auto/qndefrecord/tst_qndefrecord.cpp index d5b013f0..a02acc30 100644 --- a/tests/auto/qndefrecord/tst_qndefrecord.cpp +++ b/tests/auto/qndefrecord/tst_qndefrecord.cpp @@ -45,7 +45,7 @@ #include <qndefnfctextrecord.h> #include <qndefnfcurirecord.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class tst_QNdefRecord : public QObject { diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index 92a4e99a..92a02f9a 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> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC 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 36a8accf..2f733b86 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -47,7 +47,7 @@ #include <qnearfieldtagtype1.h> #include <qndefnfctextrecord.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC Q_DECLARE_METATYPE(QNearFieldTarget*) diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index c18d0291..db613deb 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -47,7 +47,7 @@ #include <qnearfieldtagtype2.h> #include <qndefnfctextrecord.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC Q_DECLARE_METATYPE(QNearFieldTarget*) diff --git a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp b/tests/auto/qrfcommserver/tst_qrfcommserver.cpp index a78fecb1..58810142 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> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(QBluetooth::SecurityFlags); diff --git a/tests/nfctestserver/servercontroller.h b/tests/nfctestserver/servercontroller.h index b9153308..579f68c5 100644 --- a/tests/nfctestserver/servercontroller.h +++ b/tests/nfctestserver/servercontroller.h @@ -46,7 +46,7 @@ #include <qllcpserver.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class ServerController : public QObject { diff --git a/tests/nfctestserver/socketcontroller.h b/tests/nfctestserver/socketcontroller.h index 38741ced..0d6cfd78 100644 --- a/tests/nfctestserver/socketcontroller.h +++ b/tests/nfctestserver/socketcontroller.h @@ -47,7 +47,7 @@ #include <qnearfieldmanager.h> #include <qllcpsocket.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class SocketController : public QObject { |