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 | |
parent | ae1cbc39bfdbf42a2788e8a94ca1e7f4e1058641 (diff) | |
download | qtconnectivity-f0daca9ff8108b15e0ede3ea638393541d2149e0.tar.gz |
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>
240 files changed, 890 insertions, 259 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 diff --git a/src/nfc/checksum_p.h b/src/nfc/checksum_p.h index 48b761b9..dd2c666d 100644 --- a/src/nfc/checksum_p.h +++ b/src/nfc/checksum_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/adapter_interface.cpp b/src/nfc/maemo6/adapter_interface.cpp index bb50f38e..8d2fb91b 100644 --- a/src/nfc/maemo6/adapter_interface.cpp +++ b/src/nfc/maemo6/adapter_interface.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/adapter_interface_p.h b/src/nfc/maemo6/adapter_interface_p.h index 57df898d..d5ccf8c7 100644 --- a/src/nfc/maemo6/adapter_interface_p.h +++ b/src/nfc/maemo6/adapter_interface_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/device_interface.cpp b/src/nfc/maemo6/device_interface.cpp index 69b2c930..802e8a67 100644 --- a/src/nfc/maemo6/device_interface.cpp +++ b/src/nfc/maemo6/device_interface.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/device_interface_p.h b/src/nfc/maemo6/device_interface_p.h index ff2d5604..5c764320 100644 --- a/src/nfc/maemo6/device_interface_p.h +++ b/src/nfc/maemo6/device_interface_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/socketrequestor.cpp b/src/nfc/maemo6/socketrequestor.cpp index b7595bc8..3ff527cb 100644 --- a/src/nfc/maemo6/socketrequestor.cpp +++ b/src/nfc/maemo6/socketrequestor.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/socketrequestor_p.h b/src/nfc/maemo6/socketrequestor_p.h index 25c46865..e2a95580 100644 --- a/src/nfc/maemo6/socketrequestor_p.h +++ b/src/nfc/maemo6/socketrequestor_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/tag_interface.cpp b/src/nfc/maemo6/tag_interface.cpp index 61f3b05c..42380fdb 100644 --- a/src/nfc/maemo6/tag_interface.cpp +++ b/src/nfc/maemo6/tag_interface.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/tag_interface_p.h b/src/nfc/maemo6/tag_interface_p.h index f7bdec57..6652d88e 100644 --- a/src/nfc/maemo6/tag_interface_p.h +++ b/src/nfc/maemo6/tag_interface_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/target_interface.cpp b/src/nfc/maemo6/target_interface.cpp index ce64a6f2..aa08d3d8 100644 --- a/src/nfc/maemo6/target_interface.cpp +++ b/src/nfc/maemo6/target_interface.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/maemo6/target_interface_p.h b/src/nfc/maemo6/target_interface_p.h index a4a7dced..0a00228f 100644 --- a/src/nfc/maemo6/target_interface_p.h +++ b/src/nfc/maemo6/target_interface_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp index 5b404fa6..e765866b 100644 --- a/src/nfc/qdeclarativendefrecord.cpp +++ b/src/nfc/qdeclarativendefrecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include <QtCore/QMap> #include <QtCore/QRegExp> +QTNFC_BEGIN_NAMESPACE + /*! \class QDeclarativeNdefRecord \brief The QDeclarativeNdefRecord class implements the NdefRecord element in QML. @@ -270,3 +272,5 @@ void QDeclarativeNdefRecord::setRecord(const QNdefRecord &record) } #include "moc_qdeclarativendefrecord.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qdeclarativendefrecord.h b/src/nfc/qdeclarativendefrecord.h index 612e1ca7..1635c82c 100644 --- a/src/nfc/qdeclarativendefrecord.h +++ b/src/nfc/qdeclarativendefrecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QDeclarativeNdefRecordPrivate; class Q_NFC_EXPORT QDeclarativeNdefRecord : public QObject @@ -91,6 +93,8 @@ bool qRegisterNdefRecordType(QNdefRecord::TypeNameFormat typeNameFormat, const Q #define Q_DECLARE_NDEFRECORD(className, typeNameFormat, type) \ static bool _q_##className##_registered = qRegisterNdefRecordType<className>(typeNameFormat, type); +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QDECLARATIVENDEFRECORD_P_H diff --git a/src/nfc/qllcpserver.cpp b/src/nfc/qllcpserver.cpp index f7f165e6..bcb7dfcc 100644 --- a/src/nfc/qllcpserver.cpp +++ b/src/nfc/qllcpserver.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -51,6 +51,8 @@ #include "qllcpserver_p.h" #endif +QTNFC_BEGIN_NAMESPACE + /*! \class QLlcpServer \brief The QLlcpServer class provides an NFC LLCP socket based server. @@ -201,3 +203,5 @@ QLlcpSocket::SocketError QLlcpServer::serverError() const } #include "moc_qllcpserver.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpserver.h b/src/nfc/qllcpserver.h index fad019cf..ed65c65e 100644 --- a/src/nfc/qllcpserver.h +++ b/src/nfc/qllcpserver.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QLlcpServerPrivate; class Q_NFC_EXPORT QLlcpServer : public QObject @@ -81,6 +83,8 @@ private: QLlcpServerPrivate *d_ptr; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QLLCPSERVER_H diff --git a/src/nfc/qllcpserver_maemo6_p.cpp b/src/nfc/qllcpserver_maemo6_p.cpp index 2b964bc1..2855dc71 100644 --- a/src/nfc/qllcpserver_maemo6_p.cpp +++ b/src/nfc/qllcpserver_maemo6_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ using namespace com::nokia::nfc; +QTNFC_BEGIN_NAMESPACE + static QAtomicInt requestorId = 0; static const char * const requestorBasePath = "/com/nokia/nfc/llcpserver/"; @@ -195,4 +197,6 @@ void QLlcpServerPrivate::Socket(const QDBusVariant &lsap, int fd, const QVariant Q_UNUSED(properties); } +QTNFC_END_NAMESPACE + #include "moc_qllcpserver_maemo6_p.cpp" diff --git a/src/nfc/qllcpserver_maemo6_p.h b/src/nfc/qllcpserver_maemo6_p.h index 0543f321..a4c511b9 100644 --- a/src/nfc/qllcpserver_maemo6_p.h +++ b/src/nfc/qllcpserver_maemo6_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -54,6 +54,8 @@ QT_FORWARD_DECLARE_CLASS(QDBusVariant) class AccessRequestorAdaptor; class LLCPRequestorAdaptor; +QTNFC_BEGIN_NAMESPACE + class SocketRequestor; class QLlcpServerPrivate : public QObject @@ -106,4 +108,6 @@ private: QLlcpSocket::SocketError m_error; }; +QTNFC_END_NAMESPACE + #endif // QLLCPSERVER_MAEMO6_P_H diff --git a/src/nfc/qllcpserver_p.cpp b/src/nfc/qllcpserver_p.cpp index 1e21ee34..d6dcd12f 100644 --- a/src/nfc/qllcpserver_p.cpp +++ b/src/nfc/qllcpserver_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qllcpserver_p.h" +QTNFC_BEGIN_NAMESPACE + QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q) : q_ptr(q) { @@ -90,3 +92,5 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const { return QLlcpSocket::UnknownSocketError; } + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpserver_p.h b/src/nfc/qllcpserver_p.h index 1bd505fc..b75819ab 100644 --- a/src/nfc/qllcpserver_p.h +++ b/src/nfc/qllcpserver_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include "qllcpserver.h" +QTNFC_BEGIN_NAMESPACE + class QLlcpServerPrivate { Q_DECLARE_PUBLIC(QLlcpServer) @@ -71,4 +73,6 @@ private: QLlcpServer *q_ptr; }; +QTNFC_END_NAMESPACE + #endif // QLLCPSERVER_P_H diff --git a/src/nfc/qllcpserver_simulator_p.cpp b/src/nfc/qllcpserver_simulator_p.cpp index 5ef6f963..75edbec3 100644 --- a/src/nfc/qllcpserver_simulator_p.cpp +++ b/src/nfc/qllcpserver_simulator_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qllcpserver_simulator_p.h" +QTNFC_BEGIN_NAMESPACE + QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q) : q_ptr(q) { @@ -86,3 +88,5 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const { return QLlcpSocket::UnknownSocketError; } + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpserver_simulator_p.h b/src/nfc/qllcpserver_simulator_p.h index dfda5b5d..ccdd4671 100644 --- a/src/nfc/qllcpserver_simulator_p.h +++ b/src/nfc/qllcpserver_simulator_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include "qllcpserver.h" +QTNFC_BEGIN_NAMESPACE + class QLlcpServerPrivate { public: @@ -68,4 +70,6 @@ private: QLlcpServer *q_ptr; }; +QTNFC_END_NAMESPACE + #endif // QLLCPSERVER_P_H diff --git a/src/nfc/qllcpserver_symbian_p.cpp b/src/nfc/qllcpserver_symbian_p.cpp index 4497ae15..4e1a2fb0 100644 --- a/src/nfc/qllcpserver_symbian_p.cpp +++ b/src/nfc/qllcpserver_symbian_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include "symbian/debug.h" +QTNFC_BEGIN_NAMESPACE + QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q) :q_ptr(q) { @@ -156,5 +158,7 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const return QLlcpSocket::UnknownSocketError; } +QTNFC_END_NAMESPACE + //EOF diff --git a/src/nfc/qllcpserver_symbian_p.h b/src/nfc/qllcpserver_symbian_p.h index e8d67654..3e3530f5 100644 --- a/src/nfc/qllcpserver_symbian_p.h +++ b/src/nfc/qllcpserver_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -53,6 +53,8 @@ class QLlcpSocket; QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QLlcpServerPrivate { Q_DECLARE_PUBLIC(QLlcpServer) @@ -81,6 +83,8 @@ private: QList<QPointer<QLlcpSocket> > m_pendingConnections; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QLLCPSERVER_P_H diff --git a/src/nfc/qllcpsocket.cpp b/src/nfc/qllcpsocket.cpp index 5b7e9e65..a27a0d17 100644 --- a/src/nfc/qllcpsocket.cpp +++ b/src/nfc/qllcpsocket.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -51,6 +51,8 @@ #include "qllcpsocket_p.h" #endif +QTNFC_BEGIN_NAMESPACE + /*! \class QLlcpSocket \brief The QLlcpSocket class provides an NFC LLCP socket. @@ -402,3 +404,5 @@ qint64 QLlcpSocket::writeData(const char *data, qint64 len) } #include <moc_qllcpsocket.cpp> + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpsocket.h b/src/nfc/qllcpsocket.h index efdd9cf2..33c8a280 100644 --- a/src/nfc/qllcpsocket.h +++ b/src/nfc/qllcpsocket.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldTarget; class QLlcpSocketPrivate; @@ -126,6 +128,8 @@ private: QLlcpSocketPrivate *d_ptr; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QLLCPSOCKET_H diff --git a/src/nfc/qllcpsocket_maemo6_p.cpp b/src/nfc/qllcpsocket_maemo6_p.cpp index a2cd15f6..54393bd0 100644 --- a/src/nfc/qllcpsocket_maemo6_p.cpp +++ b/src/nfc/qllcpsocket_maemo6_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -53,6 +53,8 @@ using namespace com::nokia::nfc; +QTNFC_BEGIN_NAMESPACE + static QAtomicInt requestorId = 0; static const char * const requestorBasePath = "/com/nokia/nfc/llcpclient/"; @@ -636,3 +638,5 @@ void QLlcpSocketPrivate::initializeRequestor() } #include "moc_qllcpsocket_maemo6_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpsocket_maemo6_p.h b/src/nfc/qllcpsocket_maemo6_p.h index bfece31f..bffa1f12 100644 --- a/src/nfc/qllcpsocket_maemo6_p.h +++ b/src/nfc/qllcpsocket_maemo6_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -55,6 +55,8 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) class AccessRequestorAdaptor; class LLCPRequestorAdaptor; +QTNFC_BEGIN_NAMESPACE + class SocketRequestor; class QLlcpSocketPrivate : public QObject @@ -140,4 +142,6 @@ private: QLlcpSocket::SocketError m_error; }; +QTNFC_END_NAMESPACE + #endif // QLLCPSOCKET_MAEMO6_P_H diff --git a/src/nfc/qllcpsocket_p.cpp b/src/nfc/qllcpsocket_p.cpp index 820cbb64..aac2d10d 100644 --- a/src/nfc/qllcpsocket_p.cpp +++ b/src/nfc/qllcpsocket_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qllcpsocket_p.h" +QTNFC_BEGIN_NAMESPACE + QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q) : q_ptr(q) { @@ -188,3 +190,5 @@ bool QLlcpSocketPrivate::waitForDisconnected(int msecs) return false; } + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h index 598361c4..0c0aac4f 100644 --- a/src/nfc/qllcpsocket_p.h +++ b/src/nfc/qllcpsocket_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include "qllcpsocket.h" +QTNFC_BEGIN_NAMESPACE + class QLlcpSocketPrivate { Q_DECLARE_PUBLIC(QLlcpSocket) @@ -90,4 +92,6 @@ private: QLlcpSocket *q_ptr; }; +QTNFC_END_NAMESPACE + #endif // QLLCPSOCKET_P_H diff --git a/src/nfc/qllcpsocket_simulator_p.cpp b/src/nfc/qllcpsocket_simulator_p.cpp index 2749c250..f9c09d09 100644 --- a/src/nfc/qllcpsocket_simulator_p.cpp +++ b/src/nfc/qllcpsocket_simulator_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qllcpsocket_simulator_p.h" +QTNFC_BEGIN_NAMESPACE + QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q) : q_ptr(q) { @@ -184,3 +186,4 @@ bool QLlcpSocketPrivate::waitForDisconnected(int msecs) return false; } +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpsocket_simulator_p.h b/src/nfc/qllcpsocket_simulator_p.h index e232eda8..b05e5a94 100644 --- a/src/nfc/qllcpsocket_simulator_p.h +++ b/src/nfc/qllcpsocket_simulator_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include "qllcpsocket.h" +QTNFC_BEGIN_NAMESPACE + class QLlcpSocketPrivate { Q_DECLARE_PUBLIC(QLlcpSocket) @@ -88,4 +90,6 @@ private: QLlcpSocket *q_ptr; }; +QTNFC_END_NAMESPACE + #endif // QLLCPSOCKET_P_H diff --git a/src/nfc/qllcpsocket_symbian_p.cpp b/src/nfc/qllcpsocket_symbian_p.cpp index ccf637f0..eb5ae94a 100644 --- a/src/nfc/qllcpsocket_symbian_p.cpp +++ b/src/nfc/qllcpsocket_symbian_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include "symbian/nearfieldutility_symbian.h" #include "symbian/debug.h" +QTNFC_BEGIN_NAMESPACE + /*! Constructor */ @@ -407,3 +409,4 @@ void QLlcpSocketPrivate::changeState(QLLCPSocketState* state) BEGIN_END } +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpsocket_symbian_p.h b/src/nfc/qllcpsocket_symbian_p.h index 8b4cebe4..b3e95179 100644 --- a/src/nfc/qllcpsocket_symbian_p.h +++ b/src/nfc/qllcpsocket_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -53,6 +53,8 @@ class CLlcpSocketType2; QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QLLCPSocketState; class QLlcpSocketPrivate @@ -148,6 +150,8 @@ public: int m_writeDatagramRefCount; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QLLCPSOCKET_P_H diff --git a/src/nfc/qllcpstate_symbian_p.cpp b/src/nfc/qllcpstate_symbian_p.cpp index 35b03cc0..c9064395 100644 --- a/src/nfc/qllcpstate_symbian_p.cpp +++ b/src/nfc/qllcpstate_symbian_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include "symbian/debug.h" +QTNFC_BEGIN_NAMESPACE + QLLCPSocketState::QLLCPSocketState(QLlcpSocketPrivate* socket) :m_socket(socket) {} @@ -549,3 +551,4 @@ void QLLCPSocketState::DisconnectFromService() BEGIN_END } +QTNFC_END_NAMESPACE diff --git a/src/nfc/qllcpstate_symbian_p.h b/src/nfc/qllcpstate_symbian_p.h index 38d6bb17..890bc4f5 100644 --- a/src/nfc/qllcpstate_symbian_p.h +++ b/src/nfc/qllcpstate_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QLlcpSocketPrivate; /*! @@ -166,6 +168,8 @@ public://from base class bool WaitForReadyRead(int msecs); }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif //QLLCPSTATE_P_H diff --git a/src/nfc/qndeffilter.cpp b/src/nfc/qndeffilter.cpp index ce25c4ab..aaa34ebd 100644 --- a/src/nfc/qndeffilter.cpp +++ b/src/nfc/qndeffilter.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,8 @@ #include <QtCore/QList> +QTNFC_BEGIN_NAMESPACE + /*! \class QNdefFilter \brief The QNdefFilter class provides a filter for matching NDEF messages. @@ -200,3 +202,4 @@ int QNdefFilter::recordCount() const return d->filterRecords.count(); } +QTNFC_END_NAMESPACE diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h index 82344e43..5ecdebd6 100644 --- a/src/nfc/qndeffilter.h +++ b/src/nfc/qndeffilter.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNdefFilterPrivate; class Q_NFC_EXPORT QNdefFilter { @@ -93,6 +95,8 @@ void QNdefFilter::appendRecord(unsigned int min, unsigned int max) appendRecord(record.typeNameFormat(), record.type(), min, max); } +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNDEFFILTER_H diff --git a/src/nfc/qndefmessage.cpp b/src/nfc/qndefmessage.cpp index 532e8bff..34efbe08 100644 --- a/src/nfc/qndefmessage.cpp +++ b/src/nfc/qndefmessage.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,6 +42,8 @@ #include "qndefmessage.h" #include "qndefrecord_p.h" +QTNFC_BEGIN_NAMESPACE + /*! \class QNdefMessage \brief The QNdefMessage class provides an NFC NDEF message. @@ -317,3 +319,5 @@ QByteArray QNdefMessage::toByteArray() const return m; } + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qndefmessage.h b/src/nfc/qndefmessage.h index b4d11a9d..8829a75b 100644 --- a/src/nfc/qndefmessage.h +++ b/src/nfc/qndefmessage.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -53,6 +53,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class Q_NFC_EXPORT QNdefMessage : public QList<QNdefRecord> { public: @@ -68,7 +70,9 @@ public: static QNdefMessage fromByteArray(const QByteArray &message); }; -Q_DECLARE_METATYPE(QNdefMessage) +QTNFC_END_NAMESPACE + +Q_DECLARE_METATYPE(QtNfc::QNdefMessage) QT_END_HEADER diff --git a/src/nfc/qndefnfctextrecord.cpp b/src/nfc/qndefnfctextrecord.cpp index b9146f9a..a437ebc9 100644 --- a/src/nfc/qndefnfctextrecord.cpp +++ b/src/nfc/qndefnfctextrecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include <QtCore/QTextCodec> #include <QtCore/QLocale> +QTNFC_BEGIN_NAMESPACE + /*! \class QNdefNfcTextRecord \brief The QNdefNfcTextRecord class provides an NFC RTD-Text @@ -187,3 +189,4 @@ void QNdefNfcTextRecord::setEncoding(Encoding encoding) setText(string); } +QTNFC_END_NAMESPACE diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h index fbd5e4af..31071338 100644 --- a/src/nfc/qndefnfctextrecord.h +++ b/src/nfc/qndefnfctextrecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class Q_NFC_EXPORT QNdefNfcTextRecord : public QNdefRecord { public: @@ -68,6 +70,8 @@ public: void setEncoding(Encoding encoding); }; +QTNFC_END_NAMESPACE + Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcTextRecord, QNdefRecord::NfcRtd, "T") QT_END_HEADER diff --git a/src/nfc/qndefnfcurirecord.cpp b/src/nfc/qndefnfcurirecord.cpp index 4a495d2d..d9d44f83 100644 --- a/src/nfc/qndefnfcurirecord.cpp +++ b/src/nfc/qndefnfcurirecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include <QtCore/QDebug> +QTNFC_BEGIN_NAMESPACE + /*! \class QNdefNfcUriRecord \brief The QNdefNfcUriRecord class provides an NFC RTD-URI @@ -140,3 +142,4 @@ void QNdefNfcUriRecord::setUri(const QUrl &uri) setPayload(p); } +QTNFC_END_NAMESPACE diff --git a/src/nfc/qndefnfcurirecord.h b/src/nfc/qndefnfcurirecord.h index bd8ac124..cbcdc19a 100644 --- a/src/nfc/qndefnfcurirecord.h +++ b/src/nfc/qndefnfcurirecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QT_FORWARD_DECLARE_CLASS(QUrl) QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class Q_NFC_EXPORT QNdefNfcUriRecord : public QNdefRecord { public: @@ -59,6 +61,8 @@ public: void setUri(const QUrl &uri); }; +QTNFC_END_NAMESPACE + Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcUriRecord, QNdefRecord::NfcRtd, "U") QT_END_HEADER diff --git a/src/nfc/qndefrecord.cpp b/src/nfc/qndefrecord.cpp index 4db78e2b..884634c3 100644 --- a/src/nfc/qndefrecord.cpp +++ b/src/nfc/qndefrecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -45,6 +45,8 @@ #include <QtCore/QHash> +QTNFC_BEGIN_NAMESPACE + /*! \class QNdefRecord \brief The QNdefRecord class provides an NFC NDEF record. @@ -347,3 +349,5 @@ bool QNdefRecord::operator==(const QNdefRecord &other) const return true; } + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qndefrecord.h b/src/nfc/qndefrecord.h index a1ab59b6..8e7b4b7d 100644 --- a/src/nfc/qndefrecord.h +++ b/src/nfc/qndefrecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNdefRecordPrivate; class Q_NFC_EXPORT QNdefRecord @@ -106,13 +108,17 @@ private: className(const QNdefRecord &other) : QNdefRecord(other, typeNameFormat, type) { } #define Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(className, typeNameFormat_, type_) \ + QTNFC_BEGIN_NAMESPACE \ template<> inline bool QNdefRecord::isRecordType<className>() const\ { \ return (typeNameFormat() == typeNameFormat_ && type() == type_); \ - } + } \ + QTNFC_END_NAMESPACE uint qHash(const QNdefRecord &key); +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNDEFRECORD_H diff --git a/src/nfc/qndefrecord_p.h b/src/nfc/qndefrecord_p.h index 4535296d..6ea5184a 100644 --- a/src/nfc/qndefrecord_p.h +++ b/src/nfc/qndefrecord_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ #include <QtCore/QSharedData> #include <QtCore/QByteArray> +QTNFC_BEGIN_NAMESPACE + class QNdefRecordPrivate : public QSharedData { public: @@ -60,4 +62,6 @@ public: QByteArray payload; }; +QTNFC_END_NAMESPACE + #endif // QNDEFRECORD_P_H diff --git a/src/nfc/qnearfieldllcpdevice_symbian.cpp b/src/nfc/qnearfieldllcpdevice_symbian.cpp index 38f9968c..93e44c02 100644 --- a/src/nfc/qnearfieldllcpdevice_symbian.cpp +++ b/src/nfc/qnearfieldllcpdevice_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qnearfieldllcpdevice_symbian_p.h" +QTNFC_BEGIN_NAMESPACE + QNearFieldLlcpDeviceSymbian::QNearFieldLlcpDeviceSymbian(RNfcServer& nfcServer, QObject *parent) : QNearFieldTarget(parent), mNfcServer(nfcServer) { @@ -67,3 +69,5 @@ void QNearFieldLlcpDeviceSymbian::setAccessMethods(const QNearFieldTarget::Acces } #include "moc_qnearfieldllcpdevice_symbian_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldllcpdevice_symbian_p.h b/src/nfc/qnearfieldllcpdevice_symbian_p.h index e4ecb639..c211bc3e 100644 --- a/src/nfc/qnearfieldllcpdevice_symbian_p.h +++ b/src/nfc/qnearfieldllcpdevice_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldLlcpDeviceSymbian : public QNearFieldTarget { Q_OBJECT @@ -64,6 +66,8 @@ private: RNfcServer& mNfcServer; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDLLCPDEVICE_H diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp index 2d9fb60e..127f2626 100644 --- a/src/nfc/qnearfieldmanager.cpp +++ b/src/nfc/qnearfieldmanager.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -55,6 +55,8 @@ #include <QtCore/QMetaType> #include <QtCore/QMetaMethod> +QTNFC_BEGIN_NAMESPACE + /*! \class QNearFieldManager \brief The QNearFieldManager class provides access to notifications for NFC events. @@ -103,7 +105,7 @@ and using system resources. The process of registering the handler is different on each platform. The platform specifics - are documented in the sections below. Qt Mobility provides a tool, \c {ndefhandlergen}, to + are documented in the sections below. QtNfc provides a tool, \c {ndefhandlergen}, to generate the platform specific registration files. The output of \c {ndefhandlergen -help} is reproduced here for convenience: @@ -552,3 +554,5 @@ QNearFieldManager::TargetAccessModes QNearFieldManager::targetAccessModes() cons #include "moc_qnearfieldmanager.cpp" #include "moc_qnearfieldmanager_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h index cffda098..34daeddb 100644 --- a/src/nfc/qnearfieldmanager.h +++ b/src/nfc/qnearfieldmanager.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldManagerPrivate; class Q_NFC_EXPORT QNearFieldManager : public QObject { @@ -111,6 +113,8 @@ int QNearFieldManager::registerNdefMessageHandler(QObject *object, const char *m Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldManager::TargetAccessModes) +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDMANAGER_H diff --git a/src/nfc/qnearfieldmanager_maemo6.cpp b/src/nfc/qnearfieldmanager_maemo6.cpp index a8c21bac..88ce6135 100644 --- a/src/nfc/qnearfieldmanager_maemo6.cpp +++ b/src/nfc/qnearfieldmanager_maemo6.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -54,6 +54,8 @@ using namespace com::nokia::nfc; +QTNFC_BEGIN_NAMESPACE + static QAtomicInt handlerId = 0; static const char * const registeredHandlerPath = "/com/nokia/nfc/ndefhandler"; static const char * const accessRequesterPath = "/com/nokia/nfc/accessRequester/"; @@ -447,3 +449,5 @@ void QNearFieldManagerPrivateImpl::_q_targetLost(const QDBusObjectPath &targetPa } #include "moc_qnearfieldmanager_maemo6_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanager_maemo6_p.h b/src/nfc/qnearfieldmanager_maemo6_p.h index f342398a..7e5f7950 100644 --- a/src/nfc/qnearfieldmanager_maemo6_p.h +++ b/src/nfc/qnearfieldmanager_maemo6_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -61,6 +61,8 @@ class ComNokiaNfcAdapterInterface; class NDEFHandlerAdaptor; class AccessRequestorAdaptor; +QTNFC_BEGIN_NAMESPACE + class QNearFieldManagerPrivateImpl; class NdefHandler : public QObject @@ -141,4 +143,6 @@ private: QMap<QString, QBasicTimer> m_pendingDetectedTargets; }; +QTNFC_END_NAMESPACE + #endif // QNEARFIELDMANAGER_MAEMO6_P_H diff --git a/src/nfc/qnearfieldmanager_p.h b/src/nfc/qnearfieldmanager_p.h index 3e640000..f2321af9 100644 --- a/src/nfc/qnearfieldmanager_p.h +++ b/src/nfc/qnearfieldmanager_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNdefFilter; class Q_AUTOTEST_EXPORT QNearFieldManagerPrivate : public QObject @@ -124,6 +126,8 @@ public: QNearFieldManager::TargetAccessModes m_requestedModes; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDMANAGER_P_H diff --git a/src/nfc/qnearfieldmanager_simulator.cpp b/src/nfc/qnearfieldmanager_simulator.cpp index 1d7f5318..8287586a 100644 --- a/src/nfc/qnearfieldmanager_simulator.cpp +++ b/src/nfc/qnearfieldmanager_simulator.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ #include <QtCore/QCoreApplication> +QTNFC_BEGIN_NAMESPACE + using namespace QtSimulatorPrivate; namespace Simulator { @@ -202,3 +204,5 @@ void QNearFieldManagerPrivateImpl::targetLeavingProximity(const QByteArray &uid) #include "qnearfieldmanager_simulator.moc" #include "moc_qnearfieldmanager_simulator_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanager_simulator_p.h b/src/nfc/qnearfieldmanager_simulator_p.h index a55f3e94..1cc3f1db 100644 --- a/src/nfc/qnearfieldmanager_simulator_p.h +++ b/src/nfc/qnearfieldmanager_simulator_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + namespace Simulator { class NfcConnection; } @@ -71,6 +73,8 @@ private: QMap<QByteArray, QWeakPointer<QNearFieldTarget> > m_targets; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDMANAGER_SIMULATOR_P_H diff --git a/src/nfc/qnearfieldmanager_symbian.cpp b/src/nfc/qnearfieldmanager_symbian.cpp index 8492d526..dff75b21 100644 --- a/src/nfc/qnearfieldmanager_symbian.cpp +++ b/src/nfc/qnearfieldmanager_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ #include "symbian/debug.h" #include "symbian/nearfieldutility_symbian.h" +QTNFC_BEGIN_NAMESPACE + Proxy contentHandlerProxy; Proxy::Proxy(QObject* parent) : QObject (parent) @@ -383,3 +385,5 @@ void QNearFieldManagerPrivateImpl::targetDisconnected() } #include "moc_qnearfieldmanager_symbian_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanager_symbian_p.h b/src/nfc/qnearfieldmanager_symbian_p.h index d1df3397..051bfad9 100644 --- a/src/nfc/qnearfieldmanager_symbian_p.h +++ b/src/nfc/qnearfieldmanager_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -58,6 +58,8 @@ class CNdefMessage; QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class Proxy : public QObject { Q_OBJECT @@ -131,5 +133,7 @@ private: QRemoteServiceRegister* m_serviceRegister ; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif /* QNEARFIELDMANAGER_SYMBIAN_P_H_ */ diff --git a/src/nfc/qnearfieldmanagerimpl_p.cpp b/src/nfc/qnearfieldmanagerimpl_p.cpp index 24609b30..28129f1b 100644 --- a/src/nfc/qnearfieldmanagerimpl_p.cpp +++ b/src/nfc/qnearfieldmanagerimpl_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,7 @@ #include "qnearfieldmanagerimpl_p.h" +QTNFC_BEGIN_NAMESPACE /* Constructs a new near field manager private implementation. @@ -59,3 +60,4 @@ QNearFieldManagerPrivateImpl::~QNearFieldManagerPrivateImpl() } //#include "moc_qnearfieldmanagerimpl_p.cpp" +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanagerimpl_p.h b/src/nfc/qnearfieldmanagerimpl_p.h index fffcebd2..3183f1e3 100644 --- a/src/nfc/qnearfieldmanagerimpl_p.h +++ b/src/nfc/qnearfieldmanagerimpl_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,6 +44,8 @@ #include "qnearfieldmanager_p.h" +QTNFC_BEGIN_NAMESPACE + class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate { public: @@ -51,4 +53,6 @@ public: ~QNearFieldManagerPrivateImpl(); }; +QTNFC_END_NAMESPACE + #endif // QNEARFIELDMANAGERIMPL_P_H diff --git a/src/nfc/qnearfieldmanagervirtualbase.cpp b/src/nfc/qnearfieldmanagervirtualbase.cpp index 84b88f2f..58379a1e 100644 --- a/src/nfc/qnearfieldmanagervirtualbase.cpp +++ b/src/nfc/qnearfieldmanagervirtualbase.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,8 @@ #include "qndefmessage.h" #include "qtlv_p.h" +QTNFC_BEGIN_NAMESPACE + static inline bool matchesTarget(QNearFieldTarget::Type type, const QList<QNearFieldTarget::Type> &types) { @@ -213,3 +215,5 @@ void QNearFieldManagerPrivateVirtualBase::ndefReceived(const QNdefMessage &messa } #include "moc_qnearfieldmanagervirtualbase_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldmanagervirtualbase_p.h b/src/nfc/qnearfieldmanagervirtualbase_p.h index 6dac5657..5f17462a 100644 --- a/src/nfc/qnearfieldmanagervirtualbase_p.h +++ b/src/nfc/qnearfieldmanagervirtualbase_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldManagerPrivateVirtualBase : public QNearFieldManagerPrivate { Q_OBJECT @@ -85,6 +87,8 @@ private: QList<QNearFieldTarget::Type> m_detectTargetTypes; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDMANAGERVIRTUALBASE_P_H diff --git a/src/nfc/qnearfieldtagmifare_symbian.cpp b/src/nfc/qnearfieldtagmifare_symbian.cpp index 14f13205..237bde1f 100644 --- a/src/nfc/qnearfieldtagmifare_symbian.cpp +++ b/src/nfc/qnearfieldtagmifare_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,6 +43,8 @@ #include <QVariant> #include "qnearfieldtagmifare_symbian_p.h" +QTNFC_BEGIN_NAMESPACE + QNearFieldTagMifareSymbian::QNearFieldTagMifareSymbian(CNearFieldNdefTarget *tag, QObject *parent) : QNearFieldTarget(parent), QNearFieldTagImpl(tag) { @@ -96,3 +98,5 @@ bool QNearFieldTagMifareSymbian::waitForRequestCompleted(const RequestId &id, in return _waitForRequestCompleted(id, msecs); } #include "moc_qnearfieldtagmifare_symbian_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagmifare_symbian_p.h b/src/nfc/qnearfieldtagmifare_symbian_p.h index f9714e38..d1779eca 100644 --- a/src/nfc/qnearfieldtagmifare_symbian_p.h +++ b/src/nfc/qnearfieldtagmifare_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNdefMessage; class QNearFieldTagMifareSymbian : public QNearFieldTarget, private QNearFieldTagImpl<QNearFieldTagMifareSymbian> @@ -92,6 +94,8 @@ signals: friend class QNearFieldTagImpl<QNearFieldTagMifareSymbian>; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDTAGMIFARE_H diff --git a/src/nfc/qnearfieldtagtype1.cpp b/src/nfc/qnearfieldtagtype1.cpp index eb1d6c7e..aa05e94b 100644 --- a/src/nfc/qnearfieldtagtype1.cpp +++ b/src/nfc/qnearfieldtagtype1.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ #include <QtCore/QDebug> +QTNFC_BEGIN_NAMESPACE + /*! \class QNearFieldTagType1 \brief The QNearFieldTagType1 class provides an interface for communicating with an NFC Tag @@ -733,3 +735,5 @@ bool QNearFieldTagType1::handleResponse(const QNearFieldTarget::RequestId &id, } #include "moc_qnearfieldtagtype1.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype1.h b/src/nfc/qnearfieldtagtype1.h index df902387..afb81175 100644 --- a/src/nfc/qnearfieldtagtype1.h +++ b/src/nfc/qnearfieldtagtype1.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldTagType1Private; class Q_NFC_EXPORT QNearFieldTagType1 : public QNearFieldTarget @@ -93,6 +95,8 @@ private: QNearFieldTagType1Private *d_ptr; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDTAGTYPE1_H diff --git a/src/nfc/qnearfieldtagtype1_symbian.cpp b/src/nfc/qnearfieldtagtype1_symbian.cpp index fc7be21a..7284595a 100644 --- a/src/nfc/qnearfieldtagtype1_symbian.cpp +++ b/src/nfc/qnearfieldtagtype1_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,6 +47,8 @@ //#define SYMBIAN_BUG_NOT_FIX +QTNFC_BEGIN_NAMESPACE + static void OutputByteArray(const QByteArray& data) { for(int i = 0; i < data.count(); ++i) @@ -400,3 +402,5 @@ void QNearFieldTagType1Symbian::handleTagOperationResponse(const RequestId &id, } #include "moc_qnearfieldtagtype1_symbian_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype1_symbian_p.h b/src/nfc/qnearfieldtagtype1_symbian_p.h index cfcdbe70..7c5ec0b6 100644 --- a/src/nfc/qnearfieldtagtype1_symbian_p.h +++ b/src/nfc/qnearfieldtagtype1_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldTagType1Symbian : public QNearFieldTagType1, private QNearFieldTagImpl<QNearFieldTagType1Symbian> { Q_OBJECT @@ -99,6 +101,8 @@ public: friend class QNearFieldTagImpl<QNearFieldTagType1Symbian>; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDTAGTYPE1SYMBIAN_H diff --git a/src/nfc/qnearfieldtagtype2.cpp b/src/nfc/qnearfieldtagtype2.cpp index f54567ec..8c1f1b6d 100644 --- a/src/nfc/qnearfieldtagtype2.cpp +++ b/src/nfc/qnearfieldtagtype2.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ #include <QtCore/QDebug> +QTNFC_BEGIN_NAMESPACE + /*! \class QNearFieldTagType2 \brief The QNearFieldTagType2 class provides an interface for communicating with an NFC Tag @@ -346,3 +348,5 @@ void QNearFieldTagType2::timerEvent(QTimerEvent *event) } #include "moc_qnearfieldtagtype2.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype2.h b/src/nfc/qnearfieldtagtype2.h index b991af1d..67e33578 100644 --- a/src/nfc/qnearfieldtagtype2.h +++ b/src/nfc/qnearfieldtagtype2.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldTagType2Private; class Q_NFC_EXPORT QNearFieldTagType2 : public QNearFieldTarget @@ -82,6 +84,8 @@ private: QNearFieldTagType2Private *d_ptr; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDTAGTYPE2_H diff --git a/src/nfc/qnearfieldtagtype2_symbian.cpp b/src/nfc/qnearfieldtagtype2_symbian.cpp index adac6370..7aa56b13 100644 --- a/src/nfc/qnearfieldtagtype2_symbian.cpp +++ b/src/nfc/qnearfieldtagtype2_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ //#define SYMBIAN_RETURN_CRC //#define SYMBIAN_RETURN_NO_ACK +QTNFC_BEGIN_NAMESPACE + static void OutputByteArray(const QByteArray& data) { for(int i = 0; i < data.count(); ++i) @@ -243,3 +245,5 @@ bool QNearFieldTagType2Symbian::waitForRequestCompleted(const RequestId &id, int } #include "moc_qnearfieldtagtype2_symbian_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype2_symbian_p.h b/src/nfc/qnearfieldtagtype2_symbian_p.h index 10ac6066..8efc1b4c 100644 --- a/src/nfc/qnearfieldtagtype2_symbian_p.h +++ b/src/nfc/qnearfieldtagtype2_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldTagType2Symbian : public QNearFieldTagType2, private QNearFieldTagImpl<QNearFieldTagType2Symbian> { Q_OBJECT @@ -91,6 +93,8 @@ private: quint8 mCurrentSector; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif //QNEARFIELDTAGTYPE2SYMBIAN_H diff --git a/src/nfc/qnearfieldtagtype3.cpp b/src/nfc/qnearfieldtagtype3.cpp index 2c751b09..fd9347b5 100644 --- a/src/nfc/qnearfieldtagtype3.cpp +++ b/src/nfc/qnearfieldtagtype3.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qnearfieldtagtype3.h" +QTNFC_BEGIN_NAMESPACE + /*! \class QNearFieldTagType3 \brief The QNearFieldTagType3 class provides an interface for communicating with an NFC Tag @@ -183,3 +185,5 @@ bool QNearFieldTagType3::handleResponse(const QNearFieldTarget::RequestId &id, } #include "moc_qnearfieldtagtype3.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype3.h b/src/nfc/qnearfieldtagtype3.h index 1de30935..acbd771a 100644 --- a/src/nfc/qnearfieldtagtype3.h +++ b/src/nfc/qnearfieldtagtype3.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class Q_NFC_EXPORT QNearFieldTagType3 : public QNearFieldTarget { Q_OBJECT @@ -73,6 +75,8 @@ protected: bool handleResponse(const QNearFieldTarget::RequestId &id, const QByteArray &response); }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDTAGTYPE3_H diff --git a/src/nfc/qnearfieldtagtype3_symbian.cpp b/src/nfc/qnearfieldtagtype3_symbian.cpp index b7c66a6a..01038c8e 100644 --- a/src/nfc/qnearfieldtagtype3_symbian.cpp +++ b/src/nfc/qnearfieldtagtype3_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -45,6 +45,8 @@ #include <QtEndian> #include <QVariant> +QTNFC_BEGIN_NAMESPACE + /* For all #if 0 blocks: this is due to symbian RawModeAccess API is not * available yet. After the RawModeAccess API is stable, those blocks * should be enabled. @@ -502,3 +504,5 @@ bool QNearFieldTagType3Symbian::waitForRequestCompleted(const RequestId &id, int } #include "moc_qnearfieldtagtype3_symbian_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype3_symbian_p.h b/src/nfc/qnearfieldtagtype3_symbian_p.h index a726ae8b..ad0c5138 100644 --- a/src/nfc/qnearfieldtagtype3_symbian_p.h +++ b/src/nfc/qnearfieldtagtype3_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldTagType3Symbian : public QNearFieldTagType3, private QNearFieldTagImpl<QNearFieldTagType3Symbian> { Q_OBJECT @@ -105,6 +107,8 @@ private: friend class QNearFieldTagImpl<QNearFieldTagType3Symbian>; }; +QTNFC_END_NAMESPACE + typedef QMap<quint16,QByteArray> checkResponseType; Q_DECLARE_METATYPE(checkResponseType) QT_END_HEADER diff --git a/src/nfc/qnearfieldtagtype4.cpp b/src/nfc/qnearfieldtagtype4.cpp index 19cf8b80..9dd90a69 100644 --- a/src/nfc/qnearfieldtagtype4.cpp +++ b/src/nfc/qnearfieldtagtype4.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qnearfieldtagtype4.h" +QTNFC_BEGIN_NAMESPACE + /*! \class QNearFieldTagType4 \brief The QNearFieldTagType4 class provides an interface for communicating with an NFC Tag @@ -159,3 +161,5 @@ bool QNearFieldTagType4::handleResponse(const QNearFieldTarget::RequestId &id, } #include "moc_qnearfieldtagtype4.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype4.h b/src/nfc/qnearfieldtagtype4.h index e01c8a0d..d169f616 100644 --- a/src/nfc/qnearfieldtagtype4.h +++ b/src/nfc/qnearfieldtagtype4.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class Q_NFC_EXPORT QNearFieldTagType4 : public QNearFieldTarget { Q_OBJECT @@ -68,6 +70,8 @@ protected: bool handleResponse(const QNearFieldTarget::RequestId &id, const QByteArray &response); }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDTAGTYPE4_H diff --git a/src/nfc/qnearfieldtagtype4_symbian.cpp b/src/nfc/qnearfieldtagtype4_symbian.cpp index b1940b62..6b71c226 100644 --- a/src/nfc/qnearfieldtagtype4_symbian.cpp +++ b/src/nfc/qnearfieldtagtype4_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -45,6 +45,8 @@ #include "symbian/nearfieldutility_symbian.h" #include "qnearfieldtagtype4_symbian_p.h" +QTNFC_BEGIN_NAMESPACE + static void OutputByteArray(const QByteArray& data) { for(int i = 0; i < data.count(); ++i) @@ -394,3 +396,5 @@ bool QNearFieldTagType4Symbian::waitForRequestCompleted(const RequestId &id, int return _waitForRequestCompleted(id, msecs); } #include "moc_qnearfieldtagtype4_symbian_p.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtagtype4_symbian_p.h b/src/nfc/qnearfieldtagtype4_symbian_p.h index 6bf8bf59..75a0737c 100644 --- a/src/nfc/qnearfieldtagtype4_symbian_p.h +++ b/src/nfc/qnearfieldtagtype4_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldTagType4Symbian : public QNearFieldTagType4, private QNearFieldTagImpl<QNearFieldTagType4Symbian> { Q_OBJECT @@ -99,6 +101,8 @@ private: friend class QNearFieldTagImpl<QNearFieldTagType4Symbian>; }; +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QNEARFIELDTAGTYPE4SYMBIAN_H diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp index b7c0a286..79caac34 100644 --- a/src/nfc/qnearfieldtarget.cpp +++ b/src/nfc/qnearfieldtarget.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ #include <QtCore/QDebug> +QTNFC_BEGIN_NAMESPACE + /*! \class QNearFieldTarget \brief The QNearFieldTarget class provides an interface for communicating with a target @@ -462,3 +464,5 @@ bool QNearFieldTarget::handleResponse(const QNearFieldTarget::RequestId &id, } #include "moc_qnearfieldtarget.cpp" + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index 7d839fd8..dc488e72 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -55,6 +55,8 @@ class QUrl; QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNdefMessage; class QNearFieldTargetPrivate; @@ -164,8 +166,10 @@ Q_NFC_EXPORT quint16 qNfcChecksum(const char * data, uint len); Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldTarget::AccessMethods) -Q_DECLARE_METATYPE(QNearFieldTarget::RequestId) -Q_DECLARE_METATYPE(QNearFieldTarget::Error) +QTNFC_END_NAMESPACE + +Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::RequestId) +Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::Error) QT_END_HEADER diff --git a/src/nfc/qnearfieldtarget_maemo6.cpp b/src/nfc/qnearfieldtarget_maemo6.cpp index dddf8776d..e649026c 100644 --- a/src/nfc/qnearfieldtarget_maemo6.cpp +++ b/src/nfc/qnearfieldtarget_maemo6.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qnearfieldtarget_maemo6_p.h" +QTNFC_BEGIN_NAMESPACE + void PendingCallWatcher::addSendCommand(const QDBusPendingReply<QByteArray> &reply, const QNearFieldTarget::RequestId &id) { @@ -174,3 +176,4 @@ int TagType4::memorySize() const #include <moc_qnearfieldtarget_maemo6_p.cpp> +QTNFC_END_NAMESPACE diff --git a/src/nfc/qnearfieldtarget_maemo6_p.h b/src/nfc/qnearfieldtarget_maemo6_p.h index 5002a08e..56e318f1 100644 --- a/src/nfc/qnearfieldtarget_maemo6_p.h +++ b/src/nfc/qnearfieldtarget_maemo6_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -63,6 +63,8 @@ using namespace com::nokia::nfc; +QTNFC_BEGIN_NAMESPACE + class PendingCallWatcher : public QObject { Q_OBJECT @@ -306,4 +308,6 @@ public: int memorySize() const; }; +QTNFC_END_NAMESPACE + #endif // QNEARFIELDTARGET_MAEMO6_P_H diff --git a/src/nfc/qnearfieldtarget_p.h b/src/nfc/qnearfieldtarget_p.h index 72dab2df..3412b227 100644 --- a/src/nfc/qnearfieldtarget_p.h +++ b/src/nfc/qnearfieldtarget_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ #include <QtCore/QMap> #include <QtCore/QSharedData> +QTNFC_BEGIN_NAMESPACE + class QNearFieldTarget::RequestIdPrivate : public QSharedData { }; @@ -59,4 +61,6 @@ public: QMap<QNearFieldTarget::RequestId, QVariant> m_decodedResponses; }; +QTNFC_END_NAMESPACE + #endif // QNEARFIELDTARGET_P_H diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h index f282bb19..4252a7bb 100644 --- a/src/nfc/qnfcglobal.h +++ b/src/nfc/qnfcglobal.h @@ -43,6 +43,11 @@ #include <QtCore/qglobal.h> +#define QTNFC_PREPEND_NAMESPACE(name) ::QtNfc::name +#define QTNFC_BEGIN_NAMESPACE namespace QtNfc { +#define QTNFC_END_NAMESPACE } +#define QTNFC_USE_NAMESPACE using namespace QtNfc; + #if defined(Q_OS_WIN) # if defined(QT_NODLL) # undef QT_MAKEDLL diff --git a/src/nfc/qtlv.cpp b/src/nfc/qtlv.cpp index 7aa61e9a..48288428 100644 --- a/src/nfc/qtlv.cpp +++ b/src/nfc/qtlv.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,6 +47,8 @@ #include <QtCore/QDebug> +QTNFC_BEGIN_NAMESPACE + QPair<int, int> qParseReservedMemoryControlTlv(const QByteArray &tlvData) { quint8 position = tlvData.at(0); @@ -526,3 +528,5 @@ int QTlvWriter::moveToNextAvailable() return length; } + +QTNFC_END_NAMESPACE diff --git a/src/nfc/qtlv_p.h b/src/nfc/qtlv_p.h index 0a79a3ee..5cc129d3 100644 --- a/src/nfc/qtlv_p.h +++ b/src/nfc/qtlv_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -52,6 +52,8 @@ QT_BEGIN_HEADER +QTNFC_BEGIN_NAMESPACE + class QNearFieldTarget; class Q_AUTOTEST_EXPORT QTlvReader { @@ -119,6 +121,8 @@ private: QPair<int, int> qParseReservedMemoryControlTlv(const QByteArray &tlvData); QPair<int, int> qParseLockControlTlv(const QByteArray &tlvData); +QTNFC_END_NAMESPACE + QT_END_HEADER #endif // QTLV_P_H diff --git a/src/nfc/symbian/debug.h b/src/nfc/symbian/debug.h index 06a4de9b..2c32c74e 100644 --- a/src/nfc/symbian/debug.h +++ b/src/nfc/symbian/debug.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/llcpserver_symbian.cpp b/src/nfc/symbian/llcpserver_symbian.cpp index 26f97874..7753898a 100644 --- a/src/nfc/symbian/llcpserver_symbian.cpp +++ b/src/nfc/symbian/llcpserver_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/llcpserver_symbian.h b/src/nfc/symbian/llcpserver_symbian.h index 10e0771f..cbdf16a6 100644 --- a/src/nfc/symbian/llcpserver_symbian.h +++ b/src/nfc/symbian/llcpserver_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/llcpsockettype1_symbian.cpp b/src/nfc/symbian/llcpsockettype1_symbian.cpp index 3baf39fd..f87baa28 100644 --- a/src/nfc/symbian/llcpsockettype1_symbian.cpp +++ b/src/nfc/symbian/llcpsockettype1_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/llcpsockettype1_symbian.h b/src/nfc/symbian/llcpsockettype1_symbian.h index d45e20e9..e335fdf3 100644 --- a/src/nfc/symbian/llcpsockettype1_symbian.h +++ b/src/nfc/symbian/llcpsockettype1_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/llcpsockettype2_symbian.cpp b/src/nfc/symbian/llcpsockettype2_symbian.cpp index 0cc92d2b..8cb42f26 100644 --- a/src/nfc/symbian/llcpsockettype2_symbian.cpp +++ b/src/nfc/symbian/llcpsockettype2_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/llcpsockettype2_symbian.h b/src/nfc/symbian/llcpsockettype2_symbian.h index e67ea2b9..cb67b3ee 100644 --- a/src/nfc/symbian/llcpsockettype2_symbian.h +++ b/src/nfc/symbian/llcpsockettype2_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldmanager_symbian.cpp b/src/nfc/symbian/nearfieldmanager_symbian.cpp index c0d485b3..582fa50f 100644 --- a/src/nfc/symbian/nearfieldmanager_symbian.cpp +++ b/src/nfc/symbian/nearfieldmanager_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldmanager_symbian.h b/src/nfc/symbian/nearfieldmanager_symbian.h index 82e05436..78733beb 100644 --- a/src/nfc/symbian/nearfieldmanager_symbian.h +++ b/src/nfc/symbian/nearfieldmanager_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldndeftarget_symbian.cpp b/src/nfc/symbian/nearfieldndeftarget_symbian.cpp index 0167462a..6df63174 100644 --- a/src/nfc/symbian/nearfieldndeftarget_symbian.cpp +++ b/src/nfc/symbian/nearfieldndeftarget_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldndeftarget_symbian.h b/src/nfc/symbian/nearfieldndeftarget_symbian.h index 485e2516..98373252 100644 --- a/src/nfc/symbian/nearfieldndeftarget_symbian.h +++ b/src/nfc/symbian/nearfieldndeftarget_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtag_symbian.cpp b/src/nfc/symbian/nearfieldtag_symbian.cpp index e6f9dbbe..dffa8da6 100644 --- a/src/nfc/symbian/nearfieldtag_symbian.cpp +++ b/src/nfc/symbian/nearfieldtag_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtag_symbian.h b/src/nfc/symbian/nearfieldtag_symbian.h index 5b59f05a..c53b865e 100644 --- a/src/nfc/symbian/nearfieldtag_symbian.h +++ b/src/nfc/symbian/nearfieldtag_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagasyncrequest_symbian.cpp b/src/nfc/symbian/nearfieldtagasyncrequest_symbian.cpp index 48dde301..d91d8496 100644 --- a/src/nfc/symbian/nearfieldtagasyncrequest_symbian.cpp +++ b/src/nfc/symbian/nearfieldtagasyncrequest_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagasyncrequest_symbian.h b/src/nfc/symbian/nearfieldtagasyncrequest_symbian.h index cf5aa96b..ef9dd297 100644 --- a/src/nfc/symbian/nearfieldtagasyncrequest_symbian.h +++ b/src/nfc/symbian/nearfieldtagasyncrequest_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagcommandrequest_symbian.cpp b/src/nfc/symbian/nearfieldtagcommandrequest_symbian.cpp index 79a9f0a8..0fc9c49b 100644 --- a/src/nfc/symbian/nearfieldtagcommandrequest_symbian.cpp +++ b/src/nfc/symbian/nearfieldtagcommandrequest_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagcommandrequest_symbian.h b/src/nfc/symbian/nearfieldtagcommandrequest_symbian.h index 6ff06243..c4a03b49 100644 --- a/src/nfc/symbian/nearfieldtagcommandrequest_symbian.h +++ b/src/nfc/symbian/nearfieldtagcommandrequest_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagcommandsrequest_symbian.cpp b/src/nfc/symbian/nearfieldtagcommandsrequest_symbian.cpp index 5d3a3816..9c20dd6f 100644 --- a/src/nfc/symbian/nearfieldtagcommandsrequest_symbian.cpp +++ b/src/nfc/symbian/nearfieldtagcommandsrequest_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagcommandsrequest_symbian.h b/src/nfc/symbian/nearfieldtagcommandsrequest_symbian.h index 605d691f..5b368a7e 100644 --- a/src/nfc/symbian/nearfieldtagcommandsrequest_symbian.h +++ b/src/nfc/symbian/nearfieldtagcommandsrequest_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagimpl_symbian.h b/src/nfc/symbian/nearfieldtagimpl_symbian.h index 00d2ec03..54876a5a 100644 --- a/src/nfc/symbian/nearfieldtagimpl_symbian.h +++ b/src/nfc/symbian/nearfieldtagimpl_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagimplcommon_symbian.cpp b/src/nfc/symbian/nearfieldtagimplcommon_symbian.cpp index bbfba7fc..8d367c7a 100644 --- a/src/nfc/symbian/nearfieldtagimplcommon_symbian.cpp +++ b/src/nfc/symbian/nearfieldtagimplcommon_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagimplcommon_symbian.h b/src/nfc/symbian/nearfieldtagimplcommon_symbian.h index 0d769863..11d5d8ad 100644 --- a/src/nfc/symbian/nearfieldtagimplcommon_symbian.h +++ b/src/nfc/symbian/nearfieldtagimplcommon_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagndefoperationcallback_symbian.h b/src/nfc/symbian/nearfieldtagndefoperationcallback_symbian.h index 594d4396..48120cc3 100644 --- a/src/nfc/symbian/nearfieldtagndefoperationcallback_symbian.h +++ b/src/nfc/symbian/nearfieldtagndefoperationcallback_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagndefrequest_symbian.cpp b/src/nfc/symbian/nearfieldtagndefrequest_symbian.cpp index 5ac41b2c..fdc4bed6 100644 --- a/src/nfc/symbian/nearfieldtagndefrequest_symbian.cpp +++ b/src/nfc/symbian/nearfieldtagndefrequest_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagndefrequest_symbian.h b/src/nfc/symbian/nearfieldtagndefrequest_symbian.h index f55829e5..2d3f65e5 100644 --- a/src/nfc/symbian/nearfieldtagndefrequest_symbian.h +++ b/src/nfc/symbian/nearfieldtagndefrequest_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtagoperationcallback_symbian.h b/src/nfc/symbian/nearfieldtagoperationcallback_symbian.h index f80da9c5..b3875204 100644 --- a/src/nfc/symbian/nearfieldtagoperationcallback_symbian.h +++ b/src/nfc/symbian/nearfieldtagoperationcallback_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtargetfactory_symbian.cpp b/src/nfc/symbian/nearfieldtargetfactory_symbian.cpp index 03a032a9..5fce5360 100644 --- a/src/nfc/symbian/nearfieldtargetfactory_symbian.cpp +++ b/src/nfc/symbian/nearfieldtargetfactory_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldtargetfactory_symbian.h b/src/nfc/symbian/nearfieldtargetfactory_symbian.h index 2795d9c7..7aa4d28c 100644 --- a/src/nfc/symbian/nearfieldtargetfactory_symbian.h +++ b/src/nfc/symbian/nearfieldtargetfactory_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldutility_symbian.cpp b/src/nfc/symbian/nearfieldutility_symbian.cpp index 44a0554d..04d98660 100644 --- a/src/nfc/symbian/nearfieldutility_symbian.cpp +++ b/src/nfc/symbian/nearfieldutility_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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/nfc/symbian/nearfieldutility_symbian.h b/src/nfc/symbian/nearfieldutility_symbian.h index de526f03..42a1f55f 100644 --- a/src/nfc/symbian/nearfieldutility_symbian.h +++ b/src/nfc/symbian/nearfieldutility_symbian.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp b/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp index 80755420..a59dc408 100644 --- a/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp +++ b/tests/auto/qbluetoothaddress/tst_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 @@ -45,6 +45,8 @@ #include <qbluetoothaddress.h> +QTBLUETOOTH_USE_NAMESPACE + class tst_QBluetoothAddress : public QObject { Q_OBJECT diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp index 41741bf9..69c8298a 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp +++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_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 @@ -48,6 +48,8 @@ #include <qbluetoothdevicediscoveryagent.h> #include <qbluetoothlocaldevice.h> +QTBLUETOOTH_USE_NAMESPACE + Q_DECLARE_METATYPE(QBluetoothDeviceInfo) Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::InquiryType) diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp index b5d346a8..fb2dd72b 100644 --- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp +++ b/tests/auto/qbluetoothdeviceinfo/tst_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 @@ -48,6 +48,8 @@ #include <qbluetoothlocaldevice.h> #include <qbluetoothuuid.h> +QTBLUETOOTH_USE_NAMESPACE + Q_DECLARE_METATYPE(QBluetoothDeviceInfo::ServiceClasses) Q_DECLARE_METATYPE(QBluetoothDeviceInfo::MajorDeviceClass) diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp index 6f2404ef..fe79a4ac 100644 --- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp +++ b/tests/auto/qbluetoothlocaldevice/tst_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 @@ -47,6 +47,8 @@ #include <qbluetoothaddress.h> #include <qbluetoothlocaldevice.h> +QTBLUETOOTH_USE_NAMESPACE + #define WAIT_FOR_CONDITION(a,e) \ for (int _i = 0; _i < 5000; _i += 1) { \ if ((a) == (e)) break; \ diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index 4b8f41d6..cc2f0822 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_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 @@ -50,6 +50,8 @@ #include <qbluetoothservicediscoveryagent.h> #include <qbluetoothlocaldevice.h> +QTBLUETOOTH_USE_NAMESPACE + Q_DECLARE_METATYPE(QBluetoothDeviceInfo) Q_DECLARE_METATYPE(QBluetoothServiceDiscoveryAgent::Error) diff --git a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp index 4089b2a0..9562ced6 100644 --- a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp +++ b/tests/auto/qbluetoothserviceinfo/tst_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 @@ -50,6 +50,8 @@ #include <qbluetoothlocaldevice.h> #include <qbluetoothuuid.h> +QTBLUETOOTH_USE_NAMESPACE + Q_DECLARE_METATYPE(QBluetoothUuid::ProtocolUuid) Q_DECLARE_METATYPE(QUuid) Q_DECLARE_METATYPE(QBluetoothServiceInfo::Protocol) diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp index 6eda9938..06298ecb 100644 --- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp +++ b/tests/auto/qbluetoothsocket/tst_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 @@ -55,6 +55,8 @@ #include <btclient.h> +QTBLUETOOTH_USE_NAMESPACE + Q_DECLARE_METATYPE(QBluetoothSocket::SocketState) Q_DECLARE_METATYPE(QBluetoothSocket::SocketType) diff --git a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp index 76131764..b14329f3 100644 --- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp +++ b/tests/auto/qbluetoothtransfermanager/tst_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 @@ -56,6 +56,7 @@ #include <qbluetoothservicediscoveryagent.h> #include <btclient.h> +QTBLUETOOTH_USE_NAMESPACE typedef QMap<int,QVariant> tst_QBluetoothTransferManager_QParameterMap; Q_DECLARE_METATYPE(tst_QBluetoothTransferManager_QParameterMap) @@ -227,7 +228,7 @@ void tst_QBluetoothTransferManager::tst_put() QCOMPARE(finishedSpy.count(), 1); int error = reply->error(); - qDebug()<<"QtMobilityBtTester::SendData reply->error ="<<error; + qDebug()<<"QtBluetoothTester::SendData reply->error ="<<error; QVERIFY(error == QBluetoothTransferReply::NoError); if (error != QBluetoothTransferReply::NoError) { @@ -283,7 +284,7 @@ void tst_QBluetoothTransferManager::tst_putAbort() reply->abort(); int error = reply->error(); - qDebug()<<"QtMobilityBtTester::SendData reply->error ="<<error; + qDebug()<<"QtBluetoothTester::SendData reply->error ="<<error; QVERIFY(error == QBluetoothTransferReply::NoError); if (error != QBluetoothTransferReply::NoError) { diff --git a/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp b/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp index 4805d794..20bdf987 100644 --- a/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp +++ b/tests/auto/qbluetoothtransferrequest/tst_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 @@ -48,6 +48,8 @@ #include <qbluetoothaddress.h> #include <qbluetoothlocaldevice.h> +QTBLUETOOTH_USE_NAMESPACE + typedef QMap<int,QVariant> tst_QBluetoothTransferRequest_QParameterMap; Q_DECLARE_METATYPE(tst_QBluetoothTransferRequest_QParameterMap) diff --git a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp index 0c4308da..abe1bbbd 100644 --- a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp +++ b/tests/auto/qbluetoothuuid/tst_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 @@ -53,6 +53,8 @@ #include <bttypes.h> #endif +QTBLUETOOTH_USE_NAMESPACE + Q_DECLARE_METATYPE(quint128) class tst_QBluetoothUuid : public QObject diff --git a/tests/auto/ql2capserver/tst_ql2capserver.cpp b/tests/auto/ql2capserver/tst_ql2capserver.cpp index 54d99117..1f72eed4 100644 --- a/tests/auto/ql2capserver/tst_ql2capserver.cpp +++ b/tests/auto/ql2capserver/tst_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 @@ -46,6 +46,8 @@ #include <ql2capserver.h> #include <qbluetoothsocket.h> +QTBLUETOOTH_USE_NAMESPACE + Q_DECLARE_METATYPE(QBluetooth::SecurityFlags); // Max time to wait for connection diff --git a/tests/auto/qndefmessage/tst_qndefmessage.cpp b/tests/auto/qndefmessage/tst_qndefmessage.cpp index e33cc79c..ab4ea728 100644 --- a/tests/auto/qndefmessage/tst_qndefmessage.cpp +++ b/tests/auto/qndefmessage/tst_qndefmessage.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include <qndefnfctextrecord.h> #include <qndefnfcurirecord.h> +QTNFC_USE_NAMESPACE + Q_DECLARE_METATYPE(QNdefRecord) class tst_QNdefMessage : public QObject diff --git a/tests/auto/qndefrecord/tst_qndefrecord.cpp b/tests/auto/qndefrecord/tst_qndefrecord.cpp index 3388bdca..793d4d82 100644 --- a/tests/auto/qndefrecord/tst_qndefrecord.cpp +++ b/tests/auto/qndefrecord/tst_qndefrecord.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -45,6 +45,8 @@ #include <qndefnfctextrecord.h> #include <qndefnfcurirecord.h> +QTNFC_USE_NAMESPACE + class tst_QNdefRecord : public QObject { Q_OBJECT diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index 304a5c10..4a4ed3dc 100644 --- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ #include <qndefmessage.h> #include <qndefrecord.h> +QTNFC_USE_NAMESPACE + Q_DECLARE_METATYPE(QNearFieldTarget*) Q_DECLARE_METATYPE(QNearFieldTarget::Type) Q_DECLARE_METATYPE(QNdefFilter) diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index 12f561cc..869ac061 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ #include <qnearfieldtagtype1.h> #include <qndefnfctextrecord.h> +QTNFC_USE_NAMESPACE + Q_DECLARE_METATYPE(QNearFieldTarget*) class tst_QNearFieldTagType1 : public QObject diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index 9aeb5272..bd7b8e5a 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ #include <qnearfieldtagtype2.h> #include <qndefnfctextrecord.h> +QTNFC_USE_NAMESPACE + Q_DECLARE_METATYPE(QNearFieldTarget*) static const char * const deadbeef = "\xde\xad\xbe\xef"; diff --git a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp b/tests/auto/qrfcommserver/tst_qrfcommserver.cpp index df2a10bc..5c1e6718 100644 --- a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp +++ b/tests/auto/qrfcommserver/tst_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 @@ -47,6 +47,8 @@ #include <qbluetoothsocket.h> #include <qbluetoothlocaldevice.h> +QTBLUETOOTH_USE_NAMESPACE + Q_DECLARE_METATYPE(QBluetooth::SecurityFlags); // Max time to wait for connection diff --git a/tests/btclient/btclient.c b/tests/btclient/btclient.c index 2d52718f..8a20f6ea 100644 --- a/tests/btclient/btclient.c +++ b/tests/btclient/btclient.c @@ -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/tests/btclient/btclient.h b/tests/btclient/btclient.h index d6ab932c..6d2a9b8c 100644 --- a/tests/btclient/btclient.h +++ b/tests/btclient/btclient.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/tests/nfcsymbianbackend/common/qautomsgbox.cpp b/tests/nfcsymbianbackend/common/qautomsgbox.cpp index c6576ea4..3e97d1ac 100644 --- a/tests/nfcsymbianbackend/common/qautomsgbox.cpp +++ b/tests/nfcsymbianbackend/common/qautomsgbox.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfcsymbianbackend/common/qautomsgbox.h b/tests/nfcsymbianbackend/common/qautomsgbox.h index ec27e77b..baca88f9 100644 --- a/tests/nfcsymbianbackend/common/qautomsgbox.h +++ b/tests/nfcsymbianbackend/common/qautomsgbox.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfcsymbianbackend/common/qdummyslot.cpp b/tests/nfcsymbianbackend/common/qdummyslot.cpp index 8503c244..90b6973d 100644 --- a/tests/nfcsymbianbackend/common/qdummyslot.cpp +++ b/tests/nfcsymbianbackend/common/qdummyslot.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qdummyslot.h" #include "qnfctagtestcommon.h" +QTNFC_USE_NAMESPACE + QDummySlot::QDummySlot(QObject *parent) : QObject(parent) { diff --git a/tests/nfcsymbianbackend/common/qdummyslot.h b/tests/nfcsymbianbackend/common/qdummyslot.h index 92f58008..6655b2a4 100644 --- a/tests/nfcsymbianbackend/common/qdummyslot.h +++ b/tests/nfcsymbianbackend/common/qdummyslot.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfcsymbianbackend/common/qnfctagtestcommon.h b/tests/nfcsymbianbackend/common/qnfctagtestcommon.h index 5dc389d8..fe69213e 100644 --- a/tests/nfcsymbianbackend/common/qnfctagtestcommon.h +++ b/tests/nfcsymbianbackend/common/qnfctagtestcommon.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfcsymbianbackend/common/qnfctagutil.cpp b/tests/nfcsymbianbackend/common/qnfctagutil.cpp index 67d88339..190e087f 100644 --- a/tests/nfcsymbianbackend/common/qnfctagutil.cpp +++ b/tests/nfcsymbianbackend/common/qnfctagutil.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,6 +41,8 @@ #include "qnfctagutil.h" +QTNFC_USE_NAMESPACE + bool QNfcTagUtil::WriteTextNdef2Tag(QNearFieldTarget& target, QString text) { QSignalSpy ndefMessageWriteSpy(&target, SIGNAL(ndefMessagesWritten())); diff --git a/tests/nfcsymbianbackend/common/qnfctagutil.h b/tests/nfcsymbianbackend/common/qnfctagutil.h index 0a78c6ae..46eb8a3a 100644 --- a/tests/nfcsymbianbackend/common/qnfctagutil.h +++ b/tests/nfcsymbianbackend/common/qnfctagutil.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfcsymbianbackend/nfctestserviceprovider/main.cpp b/tests/nfcsymbianbackend/nfctestserviceprovider/main.cpp index b519b03e..2b4ac860 100644 --- a/tests/nfcsymbianbackend/nfctestserviceprovider/main.cpp +++ b/tests/nfcsymbianbackend/nfctestserviceprovider/main.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -61,6 +61,8 @@ using namespace std; #include <sys/stat.h> #include <fcntl.h> +QTNFC_USE_NAMESPACE + void MyOutputHandler(QtMsgType type, const char *msg) { static int fd = -1; if (fd == -1) diff --git a/tests/nfcsymbianbackend/nfctestserviceprovider/nfctestserviceprovider.cpp b/tests/nfcsymbianbackend/nfctestserviceprovider/nfctestserviceprovider.cpp index b6477fc4..3c8cb856 100644 --- a/tests/nfcsymbianbackend/nfctestserviceprovider/nfctestserviceprovider.cpp +++ b/tests/nfcsymbianbackend/nfctestserviceprovider/nfctestserviceprovider.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfcsymbianbackend/nfctestserviceprovider/nfctestserviceprovider.h b/tests/nfcsymbianbackend/nfctestserviceprovider/nfctestserviceprovider.h index 31123adf..bc06994b 100644 --- a/tests/nfcsymbianbackend/nfctestserviceprovider/nfctestserviceprovider.h +++ b/tests/nfcsymbianbackend/nfctestserviceprovider/nfctestserviceprovider.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfcsymbianbackend/qcontenthandler/tst_qcontenthandler.cpp b/tests/nfcsymbianbackend/qcontenthandler/tst_qcontenthandler.cpp index 7bbdcbda..5c68e401 100644 --- a/tests/nfcsymbianbackend/qcontenthandler/tst_qcontenthandler.cpp +++ b/tests/nfcsymbianbackend/qcontenthandler/tst_qcontenthandler.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -54,6 +54,8 @@ #include <qndefmessage.h> #include <qndefrecord.h> +QTNFC_USE_NAMESPACE + Q_DECLARE_METATYPE(QNearFieldTarget*) Q_DECLARE_METATYPE(QNearFieldTarget::Type) Q_DECLARE_METATYPE(QNdefFilter) diff --git a/tests/nfcsymbianbackend/qllcpserver/tst_qllcpserver.cpp b/tests/nfcsymbianbackend/qllcpserver/tst_qllcpserver.cpp index 4018a934..b9ca5b92 100644 --- a/tests/nfcsymbianbackend/qllcpserver/tst_qllcpserver.cpp +++ b/tests/nfcsymbianbackend/qllcpserver/tst_qllcpserver.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -50,6 +50,8 @@ QString TestUri("urn:nfc:xsn:nokia:symbiantest"); +QTNFC_USE_NAMESPACE + static qint64 countBytesWritten(QSignalSpy& bytesWrittenSpy) { qint64 ret = 0; diff --git a/tests/nfcsymbianbackend/qllcpsocketlocal/tst_qllcpsocketlocal.cpp b/tests/nfcsymbianbackend/qllcpsocketlocal/tst_qllcpsocketlocal.cpp index 657f22e8..fa295fc2 100644 --- a/tests/nfcsymbianbackend/qllcpsocketlocal/tst_qllcpsocketlocal.cpp +++ b/tests/nfcsymbianbackend/qllcpsocketlocal/tst_qllcpsocketlocal.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfcsymbianbackend/qllcpsocketremote/tst_qllcpsocketremote.cpp b/tests/nfcsymbianbackend/qllcpsocketremote/tst_qllcpsocketremote.cpp index 550c5458..3fa6e5bd 100644 --- a/tests/nfcsymbianbackend/qllcpsocketremote/tst_qllcpsocketremote.cpp +++ b/tests/nfcsymbianbackend/qllcpsocketremote/tst_qllcpsocketremote.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ #include "qnfctestcommon.h" #include "qnfctestutil.h" +QTNFC_USE_NAMESPACE + Q_DECLARE_METATYPE(QNearFieldTarget*) Q_DECLARE_METATYPE(QLlcpSocket::SocketError); diff --git a/tests/nfcsymbianbackend/qllcpsockettype2/tst_qllcpsockettype2.cpp b/tests/nfcsymbianbackend/qllcpsockettype2/tst_qllcpsockettype2.cpp index cefdcd9f..20ccaf64 100644 --- a/tests/nfcsymbianbackend/qllcpsockettype2/tst_qllcpsockettype2.cpp +++ b/tests/nfcsymbianbackend/qllcpsockettype2/tst_qllcpsockettype2.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ #include "qnfctestcommon.h" #include "qnfctestutil.h" +QTNFC_USE_NAMESPACE + Q_DECLARE_METATYPE(QNearFieldTarget*) Q_DECLARE_METATYPE(QLlcpSocket::SocketState) Q_DECLARE_METATYPE(QLlcpSocket::SocketError) diff --git a/tests/nfcsymbianbackend/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/nfcsymbianbackend/qnearfieldmanager/tst_qnearfieldmanager.cpp index 6fae1f38..79bdd524 100644 --- a/tests/nfcsymbianbackend/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/nfcsymbianbackend/qnearfieldmanager/tst_qnearfieldmanager.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -53,6 +53,8 @@ #include <qndefmessage.h> #include <qndefrecord.h> +QTNFC_USE_NAMESPACE + Q_DECLARE_METATYPE(QNearFieldTarget*) Q_DECLARE_METATYPE(QNearFieldTarget::Type) Q_DECLARE_METATYPE(QNdefFilter) diff --git a/tests/nfcsymbianbackend/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/nfcsymbianbackend/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index 962adf07..f214177f 100644 --- a/tests/nfcsymbianbackend/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/nfcsymbianbackend/qnearfieldtagtype1/tst_qnearfieldtagtype1.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ #include <qnearfieldtagtype1.h> #include "qnfctestcommon.h" +QTNFC_USE_NAMESPACE + class NfcTagRawCommandOperationType1 : public NfcTagRawCommandOperationCommon { public: diff --git a/tests/nfcsymbianbackend/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/nfcsymbianbackend/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index 7f8ada31..771a5e60 100644 --- a/tests/nfcsymbianbackend/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/nfcsymbianbackend/qnearfieldtagtype2/tst_qnearfieldtagtype2.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ #include <qnearfieldtagtype2.h> #include "qnfctestcommon.h" +QTNFC_USE_NAMESPACE + class NfcTagRawCommandOperationType2: public NfcTagRawCommandOperationCommon { public: diff --git a/tests/nfcsymbianbackend/qnearfieldtagtype3/tst_qnearfieldtagtype3.cpp b/tests/nfcsymbianbackend/qnearfieldtagtype3/tst_qnearfieldtagtype3.cpp index 36417c8c..540c51ba 100644 --- a/tests/nfcsymbianbackend/qnearfieldtagtype3/tst_qnearfieldtagtype3.cpp +++ b/tests/nfcsymbianbackend/qnearfieldtagtype3/tst_qnearfieldtagtype3.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -48,6 +48,8 @@ #include <qnearfieldtagtype3.h> #include "qnfctestcommon.h" +QTNFC_USE_NAMESPACE + typedef QMap<quint16,QByteArray> checkResponseType; Q_DECLARE_METATYPE(checkResponseType) diff --git a/tests/nfcsymbianbackend/qnearfieldtagtype4/tst_qnearfieldtagtype4.cpp b/tests/nfcsymbianbackend/qnearfieldtagtype4/tst_qnearfieldtagtype4.cpp index 49f46adb..51389550 100644 --- a/tests/nfcsymbianbackend/qnearfieldtagtype4/tst_qnearfieldtagtype4.cpp +++ b/tests/nfcsymbianbackend/qnearfieldtagtype4/tst_qnearfieldtagtype4.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,6 +49,8 @@ #include "qnfctagtestcommon.h" #include "qnfctestcommon.h" +QTNFC_USE_NAMESPACE + class NfcTagRawCommandOperationType4: public NfcTagRawCommandOperationCommon { public: diff --git a/tests/nfctestserver/main.cpp b/tests/nfctestserver/main.cpp index 9e02f4f3..8aa0d0e9 100644 --- a/tests/nfctestserver/main.cpp +++ b/tests/nfctestserver/main.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfctestserver/servercontroller.cpp b/tests/nfctestserver/servercontroller.cpp index aafb82d4..ec69a5d6 100644 --- a/tests/nfctestserver/servercontroller.cpp +++ b/tests/nfctestserver/servercontroller.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfctestserver/servercontroller.h b/tests/nfctestserver/servercontroller.h index 8cb6ca12..a77bb712 100644 --- a/tests/nfctestserver/servercontroller.h +++ b/tests/nfctestserver/servercontroller.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -46,6 +46,8 @@ #include <qllcpserver.h> +QTNFC_USE_NAMESPACE + class ServerController : public QObject { Q_OBJECT diff --git a/tests/nfctestserver/servicenames.h b/tests/nfctestserver/servicenames.h index c90fa7b3..f2efdf78 100644 --- a/tests/nfctestserver/servicenames.h +++ b/tests/nfctestserver/servicenames.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfctestserver/socketcontroller.cpp b/tests/nfctestserver/socketcontroller.cpp index e16f53eb..2e9e12c9 100644 --- a/tests/nfctestserver/socketcontroller.cpp +++ b/tests/nfctestserver/socketcontroller.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/nfctestserver/socketcontroller.h b/tests/nfctestserver/socketcontroller.h index d6273233..1127d4a5 100644 --- a/tests/nfctestserver/socketcontroller.h +++ b/tests/nfctestserver/socketcontroller.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 QtNfc module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,6 +47,8 @@ #include <qnearfieldmanager.h> #include <qllcpsocket.h> +QTNFC_USE_NAMESPACE + class SocketController : public QObject { Q_OBJECT |