diff options
| author | Michael Zanetti <michael.zanetti@nokia.com> | 2011-10-19 17:53:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-11 07:35:00 +0100 |
| commit | f0daca9ff8108b15e0ede3ea638393541d2149e0 (patch) | |
| tree | 723cab6c932fae3912bfae00a2f3c0ae68ad2e5d /src/bluetooth | |
| parent | ae1cbc39bfdbf42a2788e8a94ca1e7f4e1058641 (diff) | |
added Connectivity namespaces (QtBluetooth and QtNfc)
Change-Id: I5f3062c857e657a6d05ab29edfa2f1b48cb173f8
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/bluetooth')
78 files changed, 363 insertions, 91 deletions
diff --git a/src/bluetooth/bluez/servicemap.cpp b/src/bluetooth/bluez/servicemap.cpp index 5e9a2995..42891e86 100644 --- a/src/bluetooth/bluez/servicemap.cpp +++ b/src/bluetooth/bluez/servicemap.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/bluetooth/bluez/servicemap_p.h b/src/bluetooth/bluez/servicemap_p.h index 4504d4d6..32da9b5e 100644 --- a/src/bluetooth/bluez/servicemap_p.h +++ b/src/bluetooth/bluez/servicemap_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/bluetooth/qbluetooth.cpp b/src/bluetooth/qbluetooth.cpp index 89b6b89b..963f7e98 100644 --- a/src/bluetooth/qbluetooth.cpp +++ b/src/bluetooth/qbluetooth.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/bluetooth/qbluetooth.h b/src/bluetooth/qbluetooth.h index 86870908..dbee810d 100644 --- a/src/bluetooth/qbluetooth.h +++ b/src/bluetooth/qbluetooth.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,6 +47,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + namespace QBluetooth { enum Security { NoSecurity = 0x00, @@ -62,6 +64,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(SecurityFlags) } +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QBLUETOOTH_H diff --git a/src/bluetooth/qbluetoothaddress.cpp b/src/bluetooth/qbluetoothaddress.cpp index d5467b9f..0cea4a09 100644 --- a/src/bluetooth/qbluetoothaddress.cpp +++ b/src/bluetooth/qbluetoothaddress.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,6 +42,8 @@ #include "qbluetoothaddress.h" #include "qbluetoothaddress_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothAddress \brief The QBluetoothAddress class provides a Bluetooth address. @@ -215,3 +217,5 @@ QBluetoothAddressPrivate::QBluetoothAddressPrivate() { m_address = 0; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothaddress.h b/src/bluetooth/qbluetoothaddress.h index c3c26530..770d2787 100644 --- a/src/bluetooth/qbluetoothaddress.h +++ b/src/bluetooth/qbluetoothaddress.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothAddressPrivate; class Q_BLUETOOTH_EXPORT QBluetoothAddress @@ -79,7 +81,9 @@ private: QBluetoothAddressPrivate *d_ptr; }; -Q_DECLARE_METATYPE(QBluetoothAddress) +QTBLUETOOTH_END_NAMESPACE + +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothAddress) QT_END_HEADER diff --git a/src/bluetooth/qbluetoothaddress_p.h b/src/bluetooth/qbluetoothaddress_p.h index f7d1073e..8dea7807 100644 --- a/src/bluetooth/qbluetoothaddress_p.h +++ b/src/bluetooth/qbluetoothaddress_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothAddressPrivate { public: @@ -56,6 +58,8 @@ public: }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp index 342c8d3d..fcffe0e7 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,6 +42,8 @@ #include "qbluetoothdevicediscoveryagent.h" #include "qbluetoothdevicediscoveryagent_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothDeviceDiscoveryAgent \brief The QBluetoothDeviceDiscoveryAgent class provides an API for discovering nearby @@ -224,3 +226,6 @@ QString QBluetoothDeviceDiscoveryAgent::errorString() const } #include "moc_qbluetoothdevicediscoveryagent.cpp" + +QTBLUETOOTH_END_NAMESPACE + diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h index 2e5e4bea..728df559 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothDeviceDiscoveryAgentPrivate; class Q_BLUETOOTH_EXPORT QBluetoothDeviceDiscoveryAgent : public QObject @@ -110,6 +112,8 @@ private: #endif // QT_SYMBIAN_BLUETOOTH }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp index a0b0f052..45f8c6db 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ //#define QT_DEVICEDISCOVERY_DEBUG +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate() : lastError(QBluetoothDeviceDiscoveryAgent::NoError), pendingCancel(false), pendingStart(false), adapter(0) { @@ -220,3 +222,5 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_propertyChanged(const QString &na } } } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index 7052f857..99864b94 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #define QT_DEVICEDISCOVERY_DEBUG +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate() { @@ -90,3 +92,4 @@ void _q_newDeviceFound(const QBluetoothDeviceInfo &device) } #endif +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 247ee1c8..288d3d6d 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -60,6 +60,8 @@ class QDBusVariant; QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothDeviceDiscoveryAgentPrivate { Q_DECLARE_PUBLIC(QBluetoothDeviceDiscoveryAgent) @@ -115,6 +117,8 @@ private: }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_symbian.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_symbian.cpp index 4afd33db..5b3844e5 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_symbian.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include <QDebug> +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate() : inquiryType(QBluetoothDeviceDiscoveryAgent::GeneralUnlimitedInquiry) , lastError(QBluetoothDeviceDiscoveryAgent::NoError) @@ -137,3 +139,5 @@ uint QBluetoothDeviceDiscoveryAgentPrivate::inquiryTypeToIAC() const { return inquiryType == QBluetoothDeviceDiscoveryAgent::LimitedInquiry ? KLIAC : KGIAC; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp index 4f3ee079..adb29a8c 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.cpp +++ b/src/bluetooth/qbluetoothdeviceinfo.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include <QDebug> +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothDeviceInfo \brief The QBluetoothDeviceInfo class provides information about Bluetooth devices. @@ -527,3 +529,5 @@ void QBluetoothDeviceInfo::setCached(bool cached) d->cached = cached; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index 850414fb..41e9a9df 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothDeviceInfoPrivate; class QBluetoothAddress; class QBluetoothUuid; @@ -240,6 +242,8 @@ private: Q_DECLARE_PRIVATE(QBluetoothDeviceInfo) }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothdeviceinfo_p.h b/src/bluetooth/qbluetoothdeviceinfo_p.h index 21864741..2747b3f1 100644 --- a/src/bluetooth/qbluetoothdeviceinfo_p.h +++ b/src/bluetooth/qbluetoothdeviceinfo_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothDeviceInfoPrivate { public: @@ -71,6 +73,8 @@ public: QList<QBluetoothUuid> serviceUuids; }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothglobal.h b/src/bluetooth/qbluetoothglobal.h index 973e517b..dc0b5ce7 100644 --- a/src/bluetooth/qbluetoothglobal.h +++ b/src/bluetooth/qbluetoothglobal.h @@ -43,6 +43,11 @@ #include <QtCore/qglobal.h> +#define QTBLUETOOTH_PREPEND_NAMESPACE(name) ::QtBluetooth::name +#define QTBLUETOOTH_BEGIN_NAMESPACE namespace QtBluetooth { +#define QTBLUETOOTH_END_NAMESPACE } +#define QTBLUETOOTH_USE_NAMESPACE using namespace QtBluetooth; + #if defined(Q_OS_WIN) # if defined(QT_NODLL) # undef QT_MAKEDLL diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp index 8cba00e7..587287c7 100644 --- a/src/bluetooth/qbluetoothlocaldevice.cpp +++ b/src/bluetooth/qbluetoothlocaldevice.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include <QtCore/QString> #include <QDebug> +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothLocalDevice \brief The QBluetoothLocalDevice class provides access to local Bluetooth devices. @@ -235,5 +237,6 @@ bool QBluetoothLocalDevice::isValid() const Construct new QBluetoothLocalDevice for \a address. */ - #include "moc_qbluetoothlocaldevice.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index e7f18108..f391b052 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -53,6 +53,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothLocalDevicePrivate; class Q_BLUETOOTH_EXPORT QBluetoothHostInfo @@ -142,9 +144,11 @@ private: #endif //QT_SYMBIAN_BLUETOOTH }; -Q_DECLARE_METATYPE(QBluetoothLocalDevice::HostMode) -Q_DECLARE_METATYPE(QBluetoothLocalDevice::Pairing) -Q_DECLARE_METATYPE(QBluetoothLocalDevice::Error) +QTBLUETOOTH_END_NAMESPACE + +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::HostMode) +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::Pairing) +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothLocalDevice::Error) QT_END_HEADER diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp index 124a18b0..9b01b8fc 100644 --- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -51,6 +51,8 @@ #include "bluez/agent_p.h" #include "bluez/device_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE + static const QLatin1String agentPath("/qt/agent"); QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) @@ -516,3 +518,5 @@ void QBluetoothLocalDevicePrivate::PropertyChanged(QString property, QDBusVarian //#include "qbluetoothlocaldevice.moc" #include "moc_qbluetoothlocaldevice_p.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothlocaldevice_p.cpp b/src/bluetooth/qbluetoothlocaldevice_p.cpp index 8173d26e..b4a32985 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,7 @@ #include "qbluetoothlocaldevice.h" #include "qbluetoothaddress.h" +QTBLUETOOTH_BEGIN_NAMESPACE QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) : QObject(parent) @@ -101,3 +102,4 @@ void QBluetoothLocalDevice::pairingConfirmation(bool confirmation) Q_UNUSED(confirmation); } +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 40c94850..f6770512 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -64,6 +64,8 @@ class QDBusPendingCallWatcher; QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothAddress; #if defined(QT_BLUEZ_BLUETOOTH) @@ -150,6 +152,8 @@ class QBluetoothLocalDevicePrivate : public QObject }; #endif +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QBLUETOOTHLOCALDEVICE_P_H diff --git a/src/bluetooth/qbluetoothlocaldevice_symbian.cpp b/src/bluetooth/qbluetoothlocaldevice_symbian.cpp index d842d3dc..508ecb0e 100644 --- a/src/bluetooth/qbluetoothlocaldevice_symbian.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -53,6 +53,7 @@ #include "bluetoothsymbianregistryadapter.h" #endif //USING_BTENGDEVMAN +QTBLUETOOTH_BEGIN_NAMESPACE QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate() : m_settings(NULL) @@ -419,3 +420,5 @@ void QBluetoothLocalDevice::pairingConfirmation(bool confirmation) return d_ptr->pairingConfirmation(confirmation); } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index 754e07e0..c4432114 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include "qbluetoothdevicediscoveryagent.h" +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothServiceDiscoveryAgent \brief The QBluetoothServiceDiscoveryAgent class provides an API for querying the services @@ -408,5 +410,6 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_serviceDiscoveryFinished() startServiceDiscovery(); } - #include "moc_qbluetoothservicediscoveryagent.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index 2f557db5..d98b1700 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -51,6 +51,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothAddress; class QBluetoothServiceDiscoveryAgentPrivate; @@ -109,6 +111,8 @@ private: #endif }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index af24f8ac..0583f4ed 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -54,6 +54,8 @@ #include <QtCore/QDebug> #endif +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &address) : error(QBluetoothServiceDiscoveryAgent::NoError), state(Inactive), deviceAddress(address), deviceDiscoveryAgent(0), mode(QBluetoothServiceDiscoveryAgent::MinimalDiscovery), @@ -321,3 +323,5 @@ QVariant QBluetoothServiceDiscoveryAgentPrivate::readAttributeValue(QXmlStreamRe return QVariant(); } } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp index fd82a5d3..35ae1990 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,6 +42,8 @@ #include "qbluetoothservicediscoveryagent.h" #include "qbluetoothservicediscoveryagent_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &address) { Q_UNUSED(address); @@ -59,3 +61,5 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr void QBluetoothServiceDiscoveryAgentPrivate::stop() { } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h index e60a1ae3..624e0cf8 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -63,6 +63,8 @@ class QXmlStreamReader; QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothDeviceDiscoveryAgent; class QBluetoothServiceDiscoveryAgentPrivate @@ -161,6 +163,8 @@ protected: QBluetoothServiceDiscoveryAgent *q_ptr; }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_symbian.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_symbian.cpp index da84c0d0..424b3ed4 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_symbian.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,6 +47,8 @@ #include <arpa/inet.h> #include <netinet/in.h> +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &address) : error(QBluetoothServiceDiscoveryAgent::NoError) , state(Inactive) @@ -309,3 +311,5 @@ void QBluetoothServiceDiscoveryAgentPrivate::EndListL() } } } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserviceinfo.cpp b/src/bluetooth/qbluetoothserviceinfo.cpp index efd9d4bf..acc6b521 100644 --- a/src/bluetooth/qbluetoothserviceinfo.cpp +++ b/src/bluetooth/qbluetoothserviceinfo.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include <QUrl> +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothServiceInfo::Sequence \brief The Sequence class provides a data type for Bluetooth Data @@ -602,3 +604,5 @@ QDebug operator<<(QDebug dbg, const QBluetoothServiceInfo &info) } return dbg; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h index 28e23fa0..ecb5f1d9 100644 --- a/src/bluetooth/qbluetoothserviceinfo.h +++ b/src/bluetooth/qbluetoothserviceinfo.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -54,6 +54,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothServiceInfoPrivate; class QBluetoothDeviceInfo; @@ -149,10 +151,14 @@ private: Q_DECLARE_PRIVATE(QBluetoothServiceInfo) }; -Q_DECLARE_METATYPE(QBluetoothServiceInfo) -Q_DECLARE_METATYPE(QBluetoothServiceInfo::Sequence) -Q_DECLARE_METATYPE(QBluetoothServiceInfo::Alternative) -Q_DECLARE_METATYPE(QList<QBluetoothUuid>) +QTBLUETOOTH_END_NAMESPACE + +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo) +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo::Sequence) +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo::Alternative) +Q_DECLARE_METATYPE(QList<QtBluetooth::QBluetoothUuid>) + +QTBLUETOOTH_BEGIN_NAMESPACE inline void QBluetoothServiceInfo::setAttribute(quint16 attributeId, const QBluetoothUuid &value) { @@ -224,6 +230,8 @@ inline QList<QBluetoothUuid> QBluetoothServiceInfo::serviceClassUuids() const return attribute(ServiceClassIds).value<QList<QBluetoothUuid> >(); } +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp index 1bf2b96e..8128469e 100644 --- a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,6 +47,8 @@ #include <QtCore/QXmlStreamWriter> +QTBLUETOOTH_BEGIN_NAMESPACE + static void writeAttribute(QXmlStreamWriter *stream, const QVariant &attribute) { const QString unsignedFormat(QLatin1String("0x%1")); @@ -294,3 +296,5 @@ bool QBluetoothServiceInfoPrivate::registerService() const registered = true; return true; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserviceinfo_p.cpp b/src/bluetooth/qbluetoothserviceinfo_p.cpp index 6eb40cab..87ee8018 100644 --- a/src/bluetooth/qbluetoothserviceinfo_p.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,6 +42,7 @@ #include "qbluetoothserviceinfo.h" #include "qbluetoothserviceinfo_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE bool QBluetoothServiceInfo::isRegistered() const { @@ -83,3 +84,5 @@ bool QBluetoothServiceInfoPrivate::registerService() const return false; } #endif + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothserviceinfo_p.h b/src/bluetooth/qbluetoothserviceinfo_p.h index 13cbce1c..a782c823 100644 --- a/src/bluetooth/qbluetoothserviceinfo_p.h +++ b/src/bluetooth/qbluetoothserviceinfo_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -56,6 +56,8 @@ class OrgBluezServiceInterface; QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothServiceInfo; class QBluetoothServiceInfoPrivate @@ -97,6 +99,8 @@ private: QBluetoothServiceInfo *q_ptr; }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothserviceinfo_symbian.cpp b/src/bluetooth/qbluetoothserviceinfo_symbian.cpp index 939a74b5..36d1836b 100644 --- a/src/bluetooth/qbluetoothserviceinfo_symbian.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,6 +47,7 @@ #include <QDebug> +QTBLUETOOTH_BEGIN_NAMESPACE QBluetoothServiceInfoPrivate::QBluetoothServiceInfoPrivate() :serviceRecord(0) @@ -300,3 +301,5 @@ bool QBluetoothServiceInfo::unregisterService() const d->serviceRecord = 0; return true; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index d265cc22..444acd9c 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ #include <QDebug> #include <QSocketNotifier> +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothSocket \brief The QBluetoothSocket class provides a Bluetooth socket. @@ -658,3 +660,5 @@ QDebug operator<<(QDebug debug, QBluetoothSocket::SocketState state) #endif #include "moc_qbluetoothsocket.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index 25c50079..4505c70f 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothSocketPrivate; class QBluetoothServiceInfo; @@ -176,6 +178,8 @@ Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketError); Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketState); #endif +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index 78c0d995..9880197d 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -58,6 +58,8 @@ #include <QtCore/QSocketNotifier> +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothSocketPrivate::QBluetoothSocketPrivate() : socket(-1), socketType(QBluetoothSocket::UnknownSocketType), @@ -547,3 +549,4 @@ qint64 QBluetoothSocketPrivate::bytesAvailable() const return buffer.size(); } +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp index 3a893799..cdf2f179 100644 --- a/src/bluetooth/qbluetoothsocket_p.cpp +++ b/src/bluetooth/qbluetoothsocket_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,6 +42,8 @@ #include "qbluetoothsocket.h" #include "qbluetoothsocket_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothSocketPrivate::QBluetoothSocketPrivate() { } @@ -142,3 +144,4 @@ qint64 QBluetoothSocketPrivate::bytesAvailable() const return 0; } +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h index 302cf638..8594761c 100644 --- a/src/bluetooth/qbluetoothsocket_p.h +++ b/src/bluetooth/qbluetoothsocket_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -61,6 +61,8 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothServiceDiscoveryAgent; class QSocketServerPrivate @@ -204,6 +206,8 @@ static inline void convertAddress(quint8 (&from)[6], quint64 &to) (quint64(from[5]) << 40); } +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qbluetoothsocket_symbian.cpp b/src/bluetooth/qbluetoothsocket_symbian.cpp index d17a6f5c..22a59d9e 100644 --- a/src/bluetooth/qbluetoothsocket_symbian.cpp +++ b/src/bluetooth/qbluetoothsocket_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ #include <bt_sock.h> #include <es_sock.h> +QTBLUETOOTH_BEGIN_NAMESPACE + Q_GLOBAL_STATIC(QSocketServerPrivate, getSocketServer) QBluetoothSocketPrivate::QBluetoothSocketPrivate() @@ -589,3 +591,4 @@ bool QBluetoothSocketPrivate::tryToSend() return transmitting; } +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp index a52f93df..a7b7fcff 100644 --- a/src/bluetooth/qbluetoothtransfermanager.cpp +++ b/src/bluetooth/qbluetoothtransfermanager.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,6 +42,8 @@ #include "qbluetoothtransfermanager.h" #include "qbluetoothtransferrequest.h" +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothTransferManager \brief The QBluetoothTransferManager class allows the application to send data objects to other @@ -93,5 +95,6 @@ QBluetoothTransferManager::~QBluetoothTransferManager() { } - #include "moc_qbluetoothtransfermanager.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h index b8359ab8..d3839eb1 100644 --- a/src/bluetooth/qbluetoothtransfermanager.h +++ b/src/bluetooth/qbluetoothtransfermanager.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -51,6 +51,8 @@ QT_FORWARD_DECLARE_CLASS(QIODevice) QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothTransferReply; class QBluetoothTransferRequest; class QBluetoothTranferManagerPrivate; @@ -75,6 +77,8 @@ signals: }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QBLUETOOTHTRANSFERMANAGER_H diff --git a/src/bluetooth/qbluetoothtransfermanager_bluez.cpp b/src/bluetooth/qbluetoothtransfermanager_bluez.cpp index fba6cea0..da902597 100644 --- a/src/bluetooth/qbluetoothtransfermanager_bluez.cpp +++ b/src/bluetooth/qbluetoothtransfermanager_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include "qbluetoothtransferreply.h" #include "qbluetoothtransferreply_bluez_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransferRequest &request, QIODevice *data) { @@ -58,3 +60,5 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer return rep; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransfermanager_p.cpp b/src/bluetooth/qbluetoothtransfermanager_p.cpp index 77a85187..00eeb7d7 100644 --- a/src/bluetooth/qbluetoothtransfermanager_p.cpp +++ b/src/bluetooth/qbluetoothtransfermanager_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,8 +43,12 @@ #include "qbluetoothtransferrequest.h" #include "qbluetoothtransferreply.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransferRequest &request, QIODevice *data) { return 0; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransfermanager_symbian.cpp b/src/bluetooth/qbluetoothtransfermanager_symbian.cpp index 73828dcd..3221420b 100644 --- a/src/bluetooth/qbluetoothtransfermanager_symbian.cpp +++ b/src/bluetooth/qbluetoothtransfermanager_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include "qbluetoothtransferreply.h" #include "qbluetoothtransferreply_symbian_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransferRequest &request, QIODevice *data) { @@ -58,3 +60,5 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer return reply; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferreply.cpp b/src/bluetooth/qbluetoothtransferreply.cpp index e8af9707..b143e65a 100644 --- a/src/bluetooth/qbluetoothtransferreply.cpp +++ b/src/bluetooth/qbluetoothtransferreply.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include "qbluetoothtransferreply_p.h" #include "qbluetoothaddress.h" +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothTransferReply \brief The QBluetoothTransferReply class contains the data and headers for a request sent with @@ -215,3 +217,5 @@ QBluetoothTransferReplyPrivate::QBluetoothTransferReplyPrivate() } #include "moc_qbluetoothtransferreply.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h index a3b12923..a9be492a 100644 --- a/src/bluetooth/qbluetoothtransferreply.h +++ b/src/bluetooth/qbluetoothtransferreply.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothTransferReplyPrivate; class Q_BLUETOOTH_EXPORT QBluetoothTransferReply : public QObject @@ -101,7 +103,9 @@ private: }; -Q_DECLARE_METATYPE(QBluetoothTransferReply *); +QTBLUETOOTH_END_NAMESPACE + +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothTransferReply *); QT_END_HEADER diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp index d9e28efa..df0e3bc2 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp +++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -55,6 +55,8 @@ static const QLatin1String agentPath("/qt/agent"); +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothTransferReplyBluez::QBluetoothTransferReplyBluez(QIODevice *input, QObject *parent) : QBluetoothTransferReply(parent), tempfile(0), source(input), @@ -340,5 +342,6 @@ qint64 QBluetoothTransferReplyBluez::writeData(const char*, qint64) return 0; } - #include "moc_qbluetoothtransferreply_bluez_p.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferreply_bluez_p.h b/src/bluetooth/qbluetoothtransferreply_bluez_p.h index 1682a8df..95cafa37 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez_p.h +++ b/src/bluetooth/qbluetoothtransferreply_bluez_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -60,6 +60,8 @@ class OrgOpenobexClientInterface; class OrgOpenobexManagerInterface; class AgentAdaptor; +QTBLUETOOTH_BEGIN_NAMESPACE + class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyBluez : public QBluetoothTransferReply { Q_OBJECT @@ -132,6 +134,8 @@ public slots: }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QBLUETOOTHTRANSFERREPLY_H diff --git a/src/bluetooth/qbluetoothtransferreply_p.h b/src/bluetooth/qbluetoothtransferreply_p.h index e05eca04..eb9a5c73 100644 --- a/src/bluetooth/qbluetoothtransferreply_p.h +++ b/src/bluetooth/qbluetoothtransferreply_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyPrivate { public: @@ -60,6 +62,8 @@ public: }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QBLUETOOTHTRANSFERREPLY_H diff --git a/src/bluetooth/qbluetoothtransferreply_symbian.cpp b/src/bluetooth/qbluetoothtransferreply_symbian.cpp index e90c6017..31ed3156 100644 --- a/src/bluetooth/qbluetoothtransferreply_symbian.cpp +++ b/src/bluetooth/qbluetoothtransferreply_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -51,6 +51,8 @@ #include <QFileInfo> #include <QDir> +QTBLUETOOTH_BEGIN_NAMESPACE + QBluetoothTransferReplySymbian::QBluetoothTransferReplySymbian(QIODevice *input, QBluetoothTransferManager::Operation operation, QObject *parent) : QBluetoothTransferReply(parent) @@ -312,4 +314,6 @@ bool QBluetoothTransferReplySymbian::copyToTempFile(QIODevice *to, QIODevice *fr return true; } +QTBLUETOOTH_END_NAMESPACE + #include "moc_qbluetoothtransferreply_symbian_p.cpp" diff --git a/src/bluetooth/qbluetoothtransferreply_symbian_p.h b/src/bluetooth/qbluetoothtransferreply_symbian_p.h index 002451ac..63047770 100644 --- a/src/bluetooth/qbluetoothtransferreply_symbian_p.h +++ b/src/bluetooth/qbluetoothtransferreply_symbian_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -63,6 +63,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothServiceDiscoveryAgent; class QBluetoothServiceInfo; @@ -136,6 +138,8 @@ private: QTimer *m_timer; }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QBLUETOOTHTRANSFERREPLYPRIVATE_H diff --git a/src/bluetooth/qbluetoothtransferrequest.cpp b/src/bluetooth/qbluetoothtransferrequest.cpp index e7245436..0d6790c1 100644 --- a/src/bluetooth/qbluetoothtransferrequest.cpp +++ b/src/bluetooth/qbluetoothtransferrequest.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include "qbluetoothtransferrequest_p.h" +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QBluetoothTransferRequest \brief The QBluetoothTransferRequest class holds a request to be sent with @@ -182,3 +184,4 @@ QBluetoothTransferRequestPrivate::QBluetoothTransferRequestPrivate() { } +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothtransferrequest.h b/src/bluetooth/qbluetoothtransferrequest.h index 19896a4a..416e5666 100644 --- a/src/bluetooth/qbluetoothtransferrequest.h +++ b/src/bluetooth/qbluetoothtransferrequest.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothAddress; class QBluetoothTransferRequestPrivate; @@ -84,6 +86,8 @@ private: }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QBLUETOOTHTRANSFERREQUEST_H diff --git a/src/bluetooth/qbluetoothtransferrequest_p.h b/src/bluetooth/qbluetoothtransferrequest_p.h index cb014a8f..fccfce5a 100644 --- a/src/bluetooth/qbluetoothtransferrequest_p.h +++ b/src/bluetooth/qbluetoothtransferrequest_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,6 +47,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothAddress; class QBluetoothTransferRequestPrivate @@ -58,6 +60,8 @@ public: QMap<int, QVariant> m_parameters; }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QBLUETOOTHTRANSFERREQUESTPRIVATE_H diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp index c4b57c5b..5b0fa19c 100644 --- a/src/bluetooth/qbluetoothuuid.cpp +++ b/src/bluetooth/qbluetoothuuid.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -51,6 +51,8 @@ //#include <netinet/in.h> #include <string.h> +QTBLUETOOTH_BEGIN_NAMESPACE + // Bluetooth base UUID 00000000-0000-1000-8000-00805F9B34FB // TODO: make more efficient Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34FB}")) @@ -356,3 +358,5 @@ bool QBluetoothUuid::operator==(const QBluetoothUuid &other) const { return QUuid::operator==(other); } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index baa0ac2a..9530c91b 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + struct quint128 { quint8 data[16]; @@ -171,7 +173,9 @@ inline QDebug operator<<(QDebug debug, const QBluetoothUuid &uuid) return debug; } -Q_DECLARE_METATYPE(QBluetoothUuid) +QTBLUETOOTH_END_NAMESPACE + +Q_DECLARE_METATYPE(QtBluetooth::QBluetoothUuid) QT_END_HEADER diff --git a/src/bluetooth/ql2capserver.cpp b/src/bluetooth/ql2capserver.cpp index 97676c2e..8c4ea8c6 100644 --- a/src/bluetooth/ql2capserver.cpp +++ b/src/bluetooth/ql2capserver.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,8 @@ #include "ql2capserver_p.h" #include "qbluetoothsocket.h" +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QL2capServer \brief The QL2capServer class provides an L2CAP server. @@ -178,3 +180,5 @@ int QL2capServer::maxPendingConnections() const */ #include "moc_ql2capserver.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/ql2capserver.h b/src/bluetooth/ql2capserver.h index 18655b38..3ffa9fee 100644 --- a/src/bluetooth/ql2capserver.h +++ b/src/bluetooth/ql2capserver.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QL2capServerPrivate; class QBluetoothSocket; @@ -101,6 +103,8 @@ private: }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/ql2capserver_bluez.cpp b/src/bluetooth/ql2capserver_bluez.cpp index 7f02c521..f8e00615 100644 --- a/src/bluetooth/ql2capserver_bluez.cpp +++ b/src/bluetooth/ql2capserver_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ #include <errno.h> +QTBLUETOOTH_BEGIN_NAMESPACE + static inline void convertAddress(quint64 from, quint8 (&to)[6]) { to[0] = (from >> 0) & 0xff; @@ -243,3 +245,4 @@ QBluetooth::SecurityFlags QL2capServer::securityFlags() const return static_cast<QBluetooth::SecurityFlags>(security); } +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/ql2capserver_p.cpp b/src/bluetooth/ql2capserver_p.cpp index 0a284ced..08d0e15d 100644 --- a/src/bluetooth/ql2capserver_p.cpp +++ b/src/bluetooth/ql2capserver_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,8 @@ #include "ql2capserver_p.h" #include "qbluetoothsocket.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QL2capServerPrivate::QL2capServerPrivate() { } @@ -104,3 +106,5 @@ void QL2capServerPrivate::_q_newConnection() { } #endif + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/ql2capserver_p.h b/src/bluetooth/ql2capserver_p.h index d51139e4..49b293a4 100644 --- a/src/bluetooth/ql2capserver_p.h +++ b/src/bluetooth/ql2capserver_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -56,6 +56,8 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothAddress; class QBluetoothSocket; @@ -106,6 +108,8 @@ private: #endif }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/ql2capserver_symbian.cpp b/src/bluetooth/ql2capserver_symbian.cpp index 1b35740b..d42fce67 100644 --- a/src/bluetooth/ql2capserver_symbian.cpp +++ b/src/bluetooth/ql2capserver_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ #include <QDebug> +QTBLUETOOTH_BEGIN_NAMESPACE + QL2capServerPrivate::QL2capServerPrivate() : socket(0),pending(false),maxPendingConnections(1),securityFlags(QBluetooth::NoSecurity) { @@ -283,3 +285,5 @@ QBluetooth::SecurityFlags QL2capServer::securityFlags() const Q_D(const QL2capServer); return d->securityFlags; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/ql2capsocket.cpp b/src/bluetooth/ql2capsocket.cpp index dda5af05..5cdfe37a 100644 --- a/src/bluetooth/ql2capsocket.cpp +++ b/src/bluetooth/ql2capsocket.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,9 +41,13 @@ #include "ql2capsocket.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QL2capSocket::QL2capSocket(QObject *parent) : QBluetoothSocket(parent) { } #include "moc_ql2capsocket.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/ql2capsocket.h b/src/bluetooth/ql2capsocket.h index cf63b62e..f5acc060 100644 --- a/src/bluetooth/ql2capsocket.h +++ b/src/bluetooth/ql2capsocket.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QL2capSocket : public QBluetoothSocket { Q_OBJECT @@ -69,6 +71,8 @@ private: Q_DISABLE_COPY(QL2capSocket) }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QL2CAPSOCKET_H diff --git a/src/bluetooth/qrfcommserver.cpp b/src/bluetooth/qrfcommserver.cpp index cc3e4e35..d7f51305 100644 --- a/src/bluetooth/qrfcommserver.cpp +++ b/src/bluetooth/qrfcommserver.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,8 @@ #include "qrfcommserver_p.h" #include "qbluetoothsocket.h" +QTBLUETOOTH_BEGIN_NAMESPACE + /*! \class QRfcommServer \brief The QRfcommServer class provides an RFCOMM server. @@ -177,3 +179,5 @@ int QRfcommServer::maxPendingConnections() const */ #include "moc_qrfcommserver.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qrfcommserver.h b/src/bluetooth/qrfcommserver.h index 1b104330..da1a41f3 100644 --- a/src/bluetooth/qrfcommserver.h +++ b/src/bluetooth/qrfcommserver.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QRfcommServerPrivate; class QBluetoothSocket; @@ -100,6 +102,7 @@ private: #endif }; +QTBLUETOOTH_END_NAMESPACE QT_END_HEADER diff --git a/src/bluetooth/qrfcommserver_bluez.cpp b/src/bluetooth/qrfcommserver_bluez.cpp index 0f5dff02..2618784d 100644 --- a/src/bluetooth/qrfcommserver_bluez.cpp +++ b/src/bluetooth/qrfcommserver_bluez.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ #include <errno.h> +QTBLUETOOTH_BEGIN_NAMESPACE + static inline void convertAddress(quint64 from, quint8 (&to)[6]) { to[0] = (from >> 0) & 0xff; @@ -246,3 +248,4 @@ QBluetooth::SecurityFlags QRfcommServer::securityFlags() const return static_cast<QBluetooth::Security>(security); } +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qrfcommserver_p.cpp b/src/bluetooth/qrfcommserver_p.cpp index 6b7d1aab..7d167e20 100644 --- a/src/bluetooth/qrfcommserver_p.cpp +++ b/src/bluetooth/qrfcommserver_p.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,8 @@ #include "qrfcommserver_p.h" #include "qbluetoothsocket.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QRfcommServerPrivate::QRfcommServerPrivate() { } @@ -128,3 +130,4 @@ QBluetooth::SecurityFlags QRfcommServer::securityFlags() const return QBluetooth::NoSecurity; } +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qrfcommserver_p.h b/src/bluetooth/qrfcommserver_p.h index a4ea301e..c39a27c5 100644 --- a/src/bluetooth/qrfcommserver_p.h +++ b/src/bluetooth/qrfcommserver_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -57,6 +57,8 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QBluetoothAddress; class QBluetoothSocket; @@ -105,6 +107,8 @@ private: #endif }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/bluetooth/qrfcommserver_symbian.cpp b/src/bluetooth/qrfcommserver_symbian.cpp index 0f5c4506..652dde8e 100644 --- a/src/bluetooth/qrfcommserver_symbian.cpp +++ b/src/bluetooth/qrfcommserver_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -51,6 +51,8 @@ #include <QDebug> +QTBLUETOOTH_BEGIN_NAMESPACE + QRfcommServerPrivate::QRfcommServerPrivate() : socket(0),maxPendingConnections(1),securityFlags(QBluetooth::NoSecurity) { @@ -282,3 +284,5 @@ QBluetooth::SecurityFlags QRfcommServer::securityFlags() const Q_D(const QRfcommServer); return d->securityFlags; } + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qrfcommsocket.cpp b/src/bluetooth/qrfcommsocket.cpp index 0c9b4ba3..17092cb8 100644 --- a/src/bluetooth/qrfcommsocket.cpp +++ b/src/bluetooth/qrfcommsocket.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,9 +41,13 @@ #include "qrfcommsocket.h" +QTBLUETOOTH_BEGIN_NAMESPACE + QRfcommSocket::QRfcommSocket(QObject *parent) : QBluetoothSocket(parent) { } #include "moc_qrfcommsocket.cpp" + +QTBLUETOOTH_END_NAMESPACE diff --git a/src/bluetooth/qrfcommsocket.h b/src/bluetooth/qrfcommsocket.h index eaf25514..2f9cc0cd 100644 --- a/src/bluetooth/qrfcommsocket.h +++ b/src/bluetooth/qrfcommsocket.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ QT_BEGIN_HEADER +QTBLUETOOTH_BEGIN_NAMESPACE + class QRfcommSocket : public QBluetoothSocket { Q_OBJECT @@ -57,6 +59,8 @@ private: Q_DISABLE_COPY(QRfcommSocket) }; +QTBLUETOOTH_END_NAMESPACE + QT_END_HEADER #endif // QRFCOMMSOCKET_H diff --git a/src/bluetooth/symbian/bluetoothlinkmanagerdevicediscoverer.h b/src/bluetooth/symbian/bluetoothlinkmanagerdevicediscoverer.h index 328222c9..e0b13077 100644 --- a/src/bluetooth/symbian/bluetoothlinkmanagerdevicediscoverer.h +++ b/src/bluetooth/symbian/bluetoothlinkmanagerdevicediscoverer.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/bluetooth/symbian/bluetoothsymbianpairingadapter.h b/src/bluetooth/symbian/bluetoothsymbianpairingadapter.h index 68be17d5..c457b821 100644 --- a/src/bluetooth/symbian/bluetoothsymbianpairingadapter.h +++ b/src/bluetooth/symbian/bluetoothsymbianpairingadapter.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/bluetooth/symbian/bluetoothsymbianregistryadapter.h b/src/bluetooth/symbian/bluetoothsymbianregistryadapter.h index 9733533d..761dfb2b 100644 --- a/src/bluetooth/symbian/bluetoothsymbianregistryadapter.h +++ b/src/bluetooth/symbian/bluetoothsymbianregistryadapter.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/bluetooth/symbian/utils_symbian_p.h b/src/bluetooth/symbian/utils_symbian_p.h index 5f7a3dc9..133842e5 100644 --- a/src/bluetooth/symbian/utils_symbian_p.h +++ b/src/bluetooth/symbian/utils_symbian_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtBluetooth module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage |