diff options
Diffstat (limited to 'src/bluetooth')
73 files changed, 153 insertions, 152 deletions
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 |