diff options
author | Michael Zanetti <michael.zanetti@nokia.com> | 2011-10-19 17:53:02 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-11 07:35:00 +0100 |
commit | f0daca9ff8108b15e0ede3ea638393541d2149e0 (patch) | |
tree | 723cab6c932fae3912bfae00a2f3c0ae68ad2e5d /src/nfc | |
parent | ae1cbc39bfdbf42a2788e8a94ca1e7f4e1058641 (diff) |
added Connectivity namespaces (QtBluetooth and QtNfc)
Change-Id: I5f3062c857e657a6d05ab29edfa2f1b48cb173f8
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/nfc')
117 files changed, 419 insertions, 121 deletions
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 |