Remove QtBluetooth and QtNfc namespace.

This is based on namespace discussions on the Qt project dev mailing list.
We continue to use the Qt namespace.

Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

71 files changed, 147 insertions, 155 deletions

diff --git a/src/nfc/doc/snippets/doc_src_qtnfc.cpp b/src/nfc/doc/snippets/doc_src_qtnfc.cpp
index 82857ca1..b7b0dfc4 100644
--- a/src/nfc/doc/snippets/doc_src_qtnfc.cpp
+++ b/src/nfc/doc/snippets/doc_src_qtnfc.cpp
@@ -43,6 +43,6 @@
 //! [include]
 
 //! [namespace]
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 //! [namespace]
 
diff --git a/src/nfc/doc/snippets/foorecord.h b/src/nfc/doc/snippets/foorecord.h
index ab5f439d..c6432361 100644
--- a/src/nfc/doc/snippets/foorecord.h
+++ b/src/nfc/doc/snippets/foorecord.h
@@ -43,7 +43,7 @@
 
 #include <qdeclarativendefrecord.h>
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 //! [Foo declaration]
 class QDeclarativeNdefFooRecord : public QDeclarativeNdefRecord
diff --git a/src/nfc/doc/snippets/nfc.cpp b/src/nfc/doc/snippets/nfc.cpp
index 2091ad08..347b7a6f 100644
--- a/src/nfc/doc/snippets/nfc.cpp
+++ b/src/nfc/doc/snippets/nfc.cpp
@@ -43,7 +43,7 @@
 
 #include <QtCore/QDebug>
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 void snippet_recordConversion()
 {
diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp
index c9a4c2d7..e9e741c5 100644
--- a/src/nfc/qdeclarativendefrecord.cpp
+++ b/src/nfc/qdeclarativendefrecord.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QRegExp>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QDeclarativeNdefRecord
@@ -288,4 +288,4 @@ void QDeclarativeNdefRecord::setRecord(const QNdefRecord &record)
     emit recordChanged();
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qdeclarativendefrecord.h b/src/nfc/qdeclarativendefrecord.h
index ae297ebe..ab7031f4 100644
--- a/src/nfc/qdeclarativendefrecord.h
+++ b/src/nfc/qdeclarativendefrecord.h
@@ -46,7 +46,7 @@
 #include <QtCore/QMetaType>
 #include <QtNfc/QNdefRecord>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeNdefRecordPrivate;
 
@@ -93,6 +93,6 @@ bool qRegisterNdefRecordType(QNdefRecord::TypeNameFormat typeNameFormat, const Q
 #define Q_DECLARE_NDEFRECORD(className, typeNameFormat, type) \
 static bool _q_##className##_registered = qRegisterNdefRecordType<className>(typeNameFormat, type);
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QDECLARATIVENDEFRECORD_P_H
diff --git a/src/nfc/qllcpserver.cpp b/src/nfc/qllcpserver.cpp
index a1041236..77215a1a 100644
--- a/src/nfc/qllcpserver.cpp
+++ b/src/nfc/qllcpserver.cpp
@@ -49,7 +49,7 @@
 #include "qllcpserver_p.h"
 #endif
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLlcpServer
@@ -198,4 +198,4 @@ QLlcpSocket::SocketError QLlcpServer::serverError() const
     return d->serverError();
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qllcpserver.h b/src/nfc/qllcpserver.h
index eec3df24..5798043e 100644
--- a/src/nfc/qllcpserver.h
+++ b/src/nfc/qllcpserver.h
@@ -46,7 +46,7 @@
 #include <QtNfc/qnfcglobal.h>
 #include <QtNfc/QLlcpSocket>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QLlcpServerPrivate;
 
@@ -80,6 +80,6 @@ private:
     QLlcpServerPrivate *d_ptr;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QLLCPSERVER_H
diff --git a/src/nfc/qllcpserver_p.cpp b/src/nfc/qllcpserver_p.cpp
index 3ec2ca51..7f2fd638 100644
--- a/src/nfc/qllcpserver_p.cpp
+++ b/src/nfc/qllcpserver_p.cpp
@@ -41,7 +41,7 @@
 
 #include "qllcpserver_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q)
 :   q_ptr(q)
@@ -93,4 +93,4 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const
     return QLlcpSocket::UnknownSocketError;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qllcpserver_p.h b/src/nfc/qllcpserver_p.h
index b39b584d..00b4c3ac 100644
--- a/src/nfc/qllcpserver_p.h
+++ b/src/nfc/qllcpserver_p.h
@@ -46,7 +46,7 @@
 
 #include "qllcpserver.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QLlcpServerPrivate 
 {
@@ -73,6 +73,6 @@ private:
     QLlcpServer *q_ptr;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QLLCPSERVER_P_H
diff --git a/src/nfc/qllcpserver_qnx_p.cpp b/src/nfc/qllcpserver_qnx_p.cpp
index 849fba7f..f0b56d15 100644
--- a/src/nfc/qllcpserver_qnx_p.cpp
+++ b/src/nfc/qllcpserver_qnx_p.cpp
@@ -42,7 +42,7 @@
 #include "qllcpserver_qnx_p.h"
 #include "qnx/qnxnfcmanager_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q)
     : q_ptr(q), m_llcpSocket(0), m_connected(false), m_conListener(0)
@@ -123,6 +123,6 @@ void QLlcpServerPrivate::connected(nfc_target_t *target)
     m_llcpSocket->bind(serverPort());
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 
diff --git a/src/nfc/qllcpserver_qnx_p.h b/src/nfc/qllcpserver_qnx_p.h
index 22ba98e6..e7764441 100644
--- a/src/nfc/qllcpserver_qnx_p.h
+++ b/src/nfc/qllcpserver_qnx_p.h
@@ -45,7 +45,7 @@
 #include "qllcpserver.h"
 #include "nfc/nfc.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QLlcpServerPrivate : public QObject
 {
@@ -78,6 +78,6 @@ private:
     nfc_target_t *m_target;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QLLCPSERVER_QNX_P_H
diff --git a/src/nfc/qllcpserver_simulator_p.cpp b/src/nfc/qllcpserver_simulator_p.cpp
index 81f28b6d..59ab0af8 100644
--- a/src/nfc/qllcpserver_simulator_p.cpp
+++ b/src/nfc/qllcpserver_simulator_p.cpp
@@ -41,7 +41,7 @@
 
 #include "qllcpserver_simulator_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q)
 :   q_ptr(q)
@@ -89,4 +89,4 @@ QLlcpSocket::SocketError QLlcpServerPrivate::serverError() const
     return QLlcpSocket::UnknownSocketError;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qllcpserver_simulator_p.h b/src/nfc/qllcpserver_simulator_p.h
index 85f84cd5..93590a60 100644
--- a/src/nfc/qllcpserver_simulator_p.h
+++ b/src/nfc/qllcpserver_simulator_p.h
@@ -46,7 +46,7 @@
 
 #include "qllcpserver.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QLlcpServerPrivate
 {
@@ -70,6 +70,6 @@ private:
     QLlcpServer *q_ptr;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QLLCPSERVER_P_H
diff --git a/src/nfc/qllcpsocket.cpp b/src/nfc/qllcpsocket.cpp
index 8626395d..f9cacd24 100644
--- a/src/nfc/qllcpsocket.cpp
+++ b/src/nfc/qllcpsocket.cpp
@@ -49,7 +49,7 @@
 #include "qllcpsocket_p.h"
 #endif
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLlcpSocket
@@ -400,4 +400,4 @@ qint64 QLlcpSocket::writeData(const char *data, qint64 len)
     return d->writeData(data, len);
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qllcpsocket.h b/src/nfc/qllcpsocket.h
index 4b148e40..e3f914d8 100644
--- a/src/nfc/qllcpsocket.h
+++ b/src/nfc/qllcpsocket.h
@@ -46,7 +46,7 @@
 #include <QtNetwork/QAbstractSocket>
 #include <QtNfc/qnfcglobal.h>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldTarget;
 class QLlcpSocketPrivate;
@@ -126,6 +126,6 @@ private:
     QLlcpSocketPrivate *d_ptr;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QLLCPSOCKET_H
diff --git a/src/nfc/qllcpsocket_p.cpp b/src/nfc/qllcpsocket_p.cpp
index 6e426505..27418d12 100644
--- a/src/nfc/qllcpsocket_p.cpp
+++ b/src/nfc/qllcpsocket_p.cpp
@@ -41,7 +41,7 @@
 
 #include "qllcpsocket_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q)
 :   q_ptr(q)
@@ -191,4 +191,4 @@ bool QLlcpSocketPrivate::waitForDisconnected(int msecs)
     return false;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h
index 1ec49b5a..7f741f14 100644
--- a/src/nfc/qllcpsocket_p.h
+++ b/src/nfc/qllcpsocket_p.h
@@ -46,7 +46,7 @@
 
 #include "qllcpsocket.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QLlcpSocketPrivate
 {
@@ -92,6 +92,6 @@ private:
     QLlcpSocket *q_ptr;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QLLCPSOCKET_P_H
diff --git a/src/nfc/qllcpsocket_qnx_p.cpp b/src/nfc/qllcpsocket_qnx_p.cpp
index beecfa17..d74e68d8 100644
--- a/src/nfc/qllcpsocket_qnx_p.cpp
+++ b/src/nfc/qllcpsocket_qnx_p.cpp
@@ -42,7 +42,7 @@
 #include "qllcpsocket_qnx_p.h"
 #include <unistd.h>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q)
     :   q_ptr(q), m_conListener(0), m_state(QLlcpSocket::UnconnectedState), m_server(false)
@@ -313,5 +313,5 @@ void QLlcpSocketPrivate::enteringIdle()
     }
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
diff --git a/src/nfc/qllcpsocket_qnx_p.h b/src/nfc/qllcpsocket_qnx_p.h
index 88e18942..fc39b07e 100644
--- a/src/nfc/qllcpsocket_qnx_p.h
+++ b/src/nfc/qllcpsocket_qnx_p.h
@@ -46,7 +46,7 @@
 
 #include "qnearfieldtarget_qnx_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QLlcpSocketPrivate : public QObject
 {
@@ -120,6 +120,6 @@ private Q_SLOTS:
     void enteringIdle();
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QLLCPSOCKET_QNX_P_H
diff --git a/src/nfc/qllcpsocket_simulator_p.cpp b/src/nfc/qllcpsocket_simulator_p.cpp
index abfa9fc6..edef7584 100644
--- a/src/nfc/qllcpsocket_simulator_p.cpp
+++ b/src/nfc/qllcpsocket_simulator_p.cpp
@@ -41,7 +41,7 @@
 
 #include "qllcpsocket_simulator_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q)
 :   q_ptr(q)
@@ -186,4 +186,4 @@ bool QLlcpSocketPrivate::waitForDisconnected(int msecs)
     return false;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qllcpsocket_simulator_p.h b/src/nfc/qllcpsocket_simulator_p.h
index e383c9fb..7d29c242 100644
--- a/src/nfc/qllcpsocket_simulator_p.h
+++ b/src/nfc/qllcpsocket_simulator_p.h
@@ -46,7 +46,7 @@
 
 #include "qllcpsocket.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QLlcpSocketPrivate
 {
@@ -90,6 +90,6 @@ private:
     QLlcpSocket *q_ptr;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QLLCPSOCKET_P_H
diff --git a/src/nfc/qndeffilter.cpp b/src/nfc/qndeffilter.cpp
index 8a7a0ac8..27d08e20 100644
--- a/src/nfc/qndeffilter.cpp
+++ b/src/nfc/qndeffilter.cpp
@@ -43,7 +43,7 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNdefFilter
@@ -201,4 +201,4 @@ int QNdefFilter::recordCount() const
     return d->filterRecords.count();
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h
index b5e891c6..5b121cc2 100644
--- a/src/nfc/qndeffilter.h
+++ b/src/nfc/qndeffilter.h
@@ -46,7 +46,7 @@
 #include <QtNfc/qnfcglobal.h>
 #include <QtNfc/QNdefRecord>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNdefFilterPrivate;
 class Q_NFC_EXPORT QNdefFilter
@@ -91,6 +91,6 @@ void QNdefFilter::appendRecord(unsigned int min, unsigned int max)
     appendRecord(record.typeNameFormat(), record.type(), min, max);
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNDEFFILTER_H
diff --git a/src/nfc/qndefmessage.cpp b/src/nfc/qndefmessage.cpp
index ae4342c9..99eb7ce2 100644
--- a/src/nfc/qndefmessage.cpp
+++ b/src/nfc/qndefmessage.cpp
@@ -42,7 +42,7 @@
 #include "qndefmessage.h"
 #include "qndefrecord_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNdefMessage
@@ -321,4 +321,4 @@ QByteArray QNdefMessage::toByteArray() const
     return m;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qndefmessage.h b/src/nfc/qndefmessage.h
index 9b402d5e..66a2f260 100644
--- a/src/nfc/qndefmessage.h
+++ b/src/nfc/qndefmessage.h
@@ -49,7 +49,7 @@
 #include <QtNfc/qnfcglobal.h>
 #include <QtNfc/QNdefRecord>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class Q_NFC_EXPORT QNdefMessage : public QList<QNdefRecord>
 {
@@ -66,8 +66,8 @@ public:
     static QNdefMessage fromByteArray(const QByteArray &message);
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QtNfc::QNdefMessage)
+Q_DECLARE_METATYPE(QNdefMessage)
 
 #endif // QNDEFMESSAGE_H
diff --git a/src/nfc/qndefnfcsmartposterrecord.cpp b/src/nfc/qndefnfcsmartposterrecord.cpp
index e17844c4..f2e9f1d5 100644
--- a/src/nfc/qndefnfcsmartposterrecord.cpp
+++ b/src/nfc/qndefnfcsmartposterrecord.cpp
@@ -47,7 +47,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QUrl>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNdefNfcSmartPosterRecord
@@ -737,4 +737,4 @@ QByteArray QNdefNfcTypeRecord::typeInfo() const
     return payload();
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qndefnfcsmartposterrecord.h b/src/nfc/qndefnfcsmartposterrecord.h
index 82f26e36..c317c92f 100644
--- a/src/nfc/qndefnfcsmartposterrecord.h
+++ b/src/nfc/qndefnfcsmartposterrecord.h
@@ -50,17 +50,17 @@
 
 QT_FORWARD_DECLARE_CLASS(QUrl)
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNdefNfcSmartPosterRecordPrivate;
 
 #define Q_DECLARE_ISRECORDTYPE_FOR_MIME_NDEF_RECORD(className) \
-    QT_BEGIN_NAMESPACE_NFC \
+    QT_BEGIN_NAMESPACE \
     template<> inline bool QNdefRecord::isRecordType<className>() const\
     { \
         return (typeNameFormat() == QNdefRecord::Mime); \
     } \
-    QT_END_NAMESPACE_NFC
+    QT_END_NAMESPACE
 
 #define Q_DECLARE_MIME_NDEF_RECORD(className, initialPayload) \
     className() : QNdefRecord(QNdefRecord::Mime, "") { setPayload(initialPayload); } \
@@ -145,7 +145,7 @@ private:
     void addIconInternal(const QNdefNfcIconRecord &icon);
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcSmartPosterRecord, QNdefRecord::NfcRtd, "Sp")
 Q_DECLARE_ISRECORDTYPE_FOR_MIME_NDEF_RECORD(QNdefNfcIconRecord)
diff --git a/src/nfc/qndefnfcsmartposterrecord_p.h b/src/nfc/qndefnfcsmartposterrecord_p.h
index abe0587b..83e727c5 100644
--- a/src/nfc/qndefnfcsmartposterrecord_p.h
+++ b/src/nfc/qndefnfcsmartposterrecord_p.h
@@ -42,7 +42,7 @@
 #ifndef QNDEFNFCSMARTPOSTERRECORD_P_H
 #define QNDEFNFCSMARTPOSTERRECORD_P_H
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNdefNfcActRecord : public QNdefRecord
 {
@@ -85,7 +85,7 @@ public:
     QNdefNfcTypeRecord *m_type;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcActRecord, QNdefRecord::NfcRtd, "act")
 Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcSizeRecord, QNdefRecord::NfcRtd, "s")
diff --git a/src/nfc/qndefnfctextrecord.cpp b/src/nfc/qndefnfctextrecord.cpp
index 212f804f..e22c35e6 100644
--- a/src/nfc/qndefnfctextrecord.cpp
+++ b/src/nfc/qndefnfctextrecord.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/QTextCodec>
 #include <QtCore/QLocale>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNdefNfcTextRecord
@@ -200,4 +200,4 @@ void QNdefNfcTextRecord::setEncoding(Encoding encoding)
     setText(string);
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h
index dffafe22..30e0eeb4 100644
--- a/src/nfc/qndefnfctextrecord.h
+++ b/src/nfc/qndefnfctextrecord.h
@@ -45,7 +45,7 @@
 #include <QtNfc/qnfcglobal.h>
 #include <QtNfc/QNdefRecord>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class Q_NFC_EXPORT QNdefNfcTextRecord : public QNdefRecord
 {
@@ -72,7 +72,7 @@ public:
     void setEncoding(Encoding encoding);
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcTextRecord, QNdefRecord::NfcRtd, "T")
 
diff --git a/src/nfc/qndefnfcurirecord.cpp b/src/nfc/qndefnfcurirecord.cpp
index 48a2699e..a38b1252 100644
--- a/src/nfc/qndefnfcurirecord.cpp
+++ b/src/nfc/qndefnfcurirecord.cpp
@@ -46,7 +46,7 @@
 
 #include <QtCore/QDebug>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNdefNfcUriRecord
@@ -154,4 +154,4 @@ void QNdefNfcUriRecord::setUri(const QUrl &uri)
     setPayload(p);
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qndefnfcurirecord.h b/src/nfc/qndefnfcurirecord.h
index 9eb5cfa2..1f96e4d8 100644
--- a/src/nfc/qndefnfcurirecord.h
+++ b/src/nfc/qndefnfcurirecord.h
@@ -47,7 +47,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QUrl)
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class Q_NFC_EXPORT QNdefNfcUriRecord : public QNdefRecord
 {
@@ -63,7 +63,7 @@ public:
     void setUri(const QUrl &uri);
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcUriRecord, QNdefRecord::NfcRtd, "U")
 
diff --git a/src/nfc/qndefrecord.cpp b/src/nfc/qndefrecord.cpp
index 4c8ae1c7..1790187c 100644
--- a/src/nfc/qndefrecord.cpp
+++ b/src/nfc/qndefrecord.cpp
@@ -45,7 +45,7 @@
 
 #include <QtCore/QHash>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNdefRecord
@@ -366,4 +366,4 @@ bool QNdefRecord::operator==(const QNdefRecord &other) const
     return true;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qndefrecord.h b/src/nfc/qndefrecord.h
index d60c2b3c..63ef04c8 100644
--- a/src/nfc/qndefrecord.h
+++ b/src/nfc/qndefrecord.h
@@ -46,7 +46,7 @@
 #include <QtCore/QByteArray>
 #include <QtNfc/qnfcglobal.h>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNdefRecordPrivate;
 
@@ -106,15 +106,15 @@ private:
     className(const QNdefRecord &other) : QNdefRecord(other, typeNameFormat, type) { }
 
 #define Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(className, typeNameFormat_, type_) \
-    QT_BEGIN_NAMESPACE_NFC \
+    QT_BEGIN_NAMESPACE \
     template<> inline bool QNdefRecord::isRecordType<className>() const\
     { \
         return (typeNameFormat() == typeNameFormat_ && type() == type_); \
     } \
-    QT_END_NAMESPACE_NFC
+    QT_END_NAMESPACE
 
 Q_NFC_EXPORT uint qHash(const QNdefRecord &key);
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNDEFRECORD_H
diff --git a/src/nfc/qndefrecord_p.h b/src/nfc/qndefrecord_p.h
index 49ec4e7b..d55c1724 100644
--- a/src/nfc/qndefrecord_p.h
+++ b/src/nfc/qndefrecord_p.h
@@ -48,7 +48,7 @@
 #include <QtCore/QSharedData>
 #include <QtCore/QByteArray>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNdefRecordPrivate : public QSharedData
 {
@@ -62,6 +62,6 @@ public:
     QByteArray payload;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNDEFRECORD_P_H
diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp
index d2c5412f..2d8b6f3c 100644
--- a/src/nfc/qnearfieldmanager.cpp
+++ b/src/nfc/qnearfieldmanager.cpp
@@ -53,7 +53,7 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QMetaMethod>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNearFieldManager
@@ -411,4 +411,4 @@ QNearFieldManager::TargetAccessModes QNearFieldManager::targetAccessModes() cons
     return d->m_requestedModes;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h
index d1c4b139..bbbaf387 100644
--- a/src/nfc/qnearfieldmanager.h
+++ b/src/nfc/qnearfieldmanager.h
@@ -48,7 +48,7 @@
 #include <QtNfc/QNdefRecord>
 #include <QtNfc/QNdefFilter>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldManagerPrivate;
 class Q_NFC_EXPORT QNearFieldManager : public QObject
@@ -110,6 +110,6 @@ int QNearFieldManager::registerNdefMessageHandler(QObject *object, const char *m
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldManager::TargetAccessModes)
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDMANAGER_H
diff --git a/src/nfc/qnearfieldmanager_emulator.cpp b/src/nfc/qnearfieldmanager_emulator.cpp
index 9d7a2677..ea699a73 100644
--- a/src/nfc/qnearfieldmanager_emulator.cpp
+++ b/src/nfc/qnearfieldmanager_emulator.cpp
@@ -47,7 +47,7 @@
 
 #include <QtCore/QDebug>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl()
 {
@@ -101,4 +101,4 @@ void QNearFieldManagerPrivateImpl::tagDeactivated(TagBase *tag)
     targetDeactivated(target);
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h
index d76bb9f1..68dd9495 100644
--- a/src/nfc/qnearfieldmanager_emulator_p.h
+++ b/src/nfc/qnearfieldmanager_emulator_p.h
@@ -49,7 +49,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QWeakPointer>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class TagBase;
 class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivateVirtualBase
@@ -75,6 +75,6 @@ private:
 
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDMANAGER_EMULATOR_H
diff --git a/src/nfc/qnearfieldmanager_p.h b/src/nfc/qnearfieldmanager_p.h
index 082cf148..4b6d7df4 100644
--- a/src/nfc/qnearfieldmanager_p.h
+++ b/src/nfc/qnearfieldmanager_p.h
@@ -50,7 +50,7 @@
 
 #include <QtCore/QObject>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNdefFilter;
 
@@ -124,6 +124,6 @@ public:
     QNearFieldManager::TargetAccessModes m_requestedModes;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDMANAGER_P_H
diff --git a/src/nfc/qnearfieldmanager_qnx.cpp b/src/nfc/qnearfieldmanager_qnx.cpp
index 8e2249c3..696d2d88 100644
--- a/src/nfc/qnearfieldmanager_qnx.cpp
+++ b/src/nfc/qnearfieldmanager_qnx.cpp
@@ -46,7 +46,7 @@
 #include "qndeffilter.h"
 #include "qndefrecord.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl() :
     m_handlerID(0)
@@ -204,4 +204,4 @@ void QNearFieldManagerPrivateImpl::updateNdefFilter()
 }
 
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanager_qnx_p.h b/src/nfc/qnearfieldmanager_qnx_p.h
index f6b06d12..37aeba95 100644
--- a/src/nfc/qnearfieldmanager_qnx_p.h
+++ b/src/nfc/qnearfieldmanager_qnx_p.h
@@ -48,7 +48,7 @@
 
 #include "qnx/qnxnfcmanager_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate
 {
@@ -87,6 +87,6 @@ private:
     QList< QPair<QPair<int, QObject *>, QPair<QNdefFilter, QMetaMethod> > > ndefFilterHandlers;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDMANAGER_QNX_P_H
diff --git a/src/nfc/qnearfieldmanager_simulator.cpp b/src/nfc/qnearfieldmanager_simulator.cpp
index 9a0d0576..2800aa51 100644
--- a/src/nfc/qnearfieldmanager_simulator.cpp
+++ b/src/nfc/qnearfieldmanager_simulator.cpp
@@ -50,7 +50,7 @@
 
 #include <QtCore/QCoreApplication>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 using namespace QtSimulatorPrivate;
 
@@ -202,6 +202,6 @@ void QNearFieldManagerPrivateImpl::targetLeavingProximity(const QByteArray &uid)
     targetDeactivated(target);
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #include "qnearfieldmanager_simulator.moc"
diff --git a/src/nfc/qnearfieldmanager_simulator_p.h b/src/nfc/qnearfieldmanager_simulator_p.h
index 8e919146..ff16080e 100644
--- a/src/nfc/qnearfieldmanager_simulator_p.h
+++ b/src/nfc/qnearfieldmanager_simulator_p.h
@@ -46,7 +46,7 @@
 
 #include <QtCore/QWeakPointer>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 namespace Simulator {
 class NfcConnection;
@@ -71,6 +71,6 @@ private:
     QMap<QByteArray, QWeakPointer<QNearFieldTarget> > m_targets;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDMANAGER_SIMULATOR_P_H
diff --git a/src/nfc/qnearfieldmanagerimpl_p.cpp b/src/nfc/qnearfieldmanagerimpl_p.cpp
index 5d20d5bd..cc1d0795 100644
--- a/src/nfc/qnearfieldmanagerimpl_p.cpp
+++ b/src/nfc/qnearfieldmanagerimpl_p.cpp
@@ -43,7 +43,7 @@
 
 #include "qnearfieldmanagerimpl_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*
     Constructs a new near field manager private implementation.
@@ -59,4 +59,4 @@ QNearFieldManagerPrivateImpl::~QNearFieldManagerPrivateImpl()
 {
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanagerimpl_p.h b/src/nfc/qnearfieldmanagerimpl_p.h
index 03a8ec1d..8f57f9eb 100644
--- a/src/nfc/qnearfieldmanagerimpl_p.h
+++ b/src/nfc/qnearfieldmanagerimpl_p.h
@@ -44,7 +44,7 @@
 
 #include "qnearfieldmanager_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate
 {
@@ -53,6 +53,6 @@ public:
   ~QNearFieldManagerPrivateImpl();
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDMANAGERIMPL_P_H
diff --git a/src/nfc/qnearfieldmanagervirtualbase.cpp b/src/nfc/qnearfieldmanagervirtualbase.cpp
index 7d5f2032..ec3e778d 100644
--- a/src/nfc/qnearfieldmanagervirtualbase.cpp
+++ b/src/nfc/qnearfieldmanagervirtualbase.cpp
@@ -43,7 +43,7 @@
 #include "qndefmessage.h"
 #include "qtlv_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 static inline bool matchesTarget(QNearFieldTarget::Type type,
                                  const QList<QNearFieldTarget::Type> &types)
@@ -214,4 +214,4 @@ void QNearFieldManagerPrivateVirtualBase::ndefReceived(const QNdefMessage &messa
     }
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanagervirtualbase_p.h b/src/nfc/qnearfieldmanagervirtualbase_p.h
index 2123aed5..93dc517d 100644
--- a/src/nfc/qnearfieldmanagervirtualbase_p.h
+++ b/src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -46,7 +46,7 @@
 
 #include <QtCore/QMetaMethod>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldManagerPrivateVirtualBase : public QNearFieldManagerPrivate
 {
@@ -85,6 +85,6 @@ private:
     QList<QNearFieldTarget::Type> m_detectTargetTypes;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDMANAGERVIRTUALBASE_P_H
diff --git a/src/nfc/qnearfieldtagtype1.cpp b/src/nfc/qnearfieldtagtype1.cpp
index 4d652b14..2509dec4 100644
--- a/src/nfc/qnearfieldtagtype1.cpp
+++ b/src/nfc/qnearfieldtagtype1.cpp
@@ -49,7 +49,7 @@
 
 #include <QtCore/QDebug>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNearFieldTagType1
@@ -734,4 +734,4 @@ bool QNearFieldTagType1::handleResponse(const QNearFieldTarget::RequestId &id,
     return handled;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtagtype1_p.h b/src/nfc/qnearfieldtagtype1_p.h
index 41225227..0ec02b57 100644
--- a/src/nfc/qnearfieldtagtype1_p.h
+++ b/src/nfc/qnearfieldtagtype1_p.h
@@ -55,7 +55,7 @@
 
 #include <QtNfc/QNearFieldTarget>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldTagType1Private;
 
@@ -104,6 +104,6 @@ private:
     QNearFieldTagType1Private *d_ptr;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDTAGTYPE1_H
diff --git a/src/nfc/qnearfieldtagtype2.cpp b/src/nfc/qnearfieldtagtype2.cpp
index dadf67f8..0f926bf5 100644
--- a/src/nfc/qnearfieldtagtype2.cpp
+++ b/src/nfc/qnearfieldtagtype2.cpp
@@ -48,7 +48,7 @@
 
 #include <QtCore/QDebug>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNearFieldTagType2
@@ -327,4 +327,4 @@ void QNearFieldTagType2::timerEvent(QTimerEvent *event)
     }
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtagtype2_p.h b/src/nfc/qnearfieldtagtype2_p.h
index 6a429722..91394441 100644
--- a/src/nfc/qnearfieldtagtype2_p.h
+++ b/src/nfc/qnearfieldtagtype2_p.h
@@ -55,7 +55,7 @@
 
 #include <QtNfc/QNearFieldTarget>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldTagType2Private;
 
@@ -91,6 +91,6 @@ private:
     QNearFieldTagType2Private *d_ptr;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDTAGTYPE2_H
diff --git a/src/nfc/qnearfieldtagtype3.cpp b/src/nfc/qnearfieldtagtype3.cpp
index e13cf5c4..b8cc89fe 100644
--- a/src/nfc/qnearfieldtagtype3.cpp
+++ b/src/nfc/qnearfieldtagtype3.cpp
@@ -41,7 +41,7 @@
 
 #include "qnearfieldtagtype3_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNearFieldTagType3
@@ -184,4 +184,4 @@ bool QNearFieldTagType3::handleResponse(const QNearFieldTarget::RequestId &id,
     return QNearFieldTarget::handleResponse(id, response);
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtagtype3_p.h b/src/nfc/qnearfieldtagtype3_p.h
index 1ee94f53..322e3d30 100644
--- a/src/nfc/qnearfieldtagtype3_p.h
+++ b/src/nfc/qnearfieldtagtype3_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/QMap>
 #include <QtNfc/QNearFieldTarget>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class Q_AUTOTEST_EXPORT QNearFieldTagType3 : public QNearFieldTarget
 {
@@ -83,6 +83,6 @@ protected:
     bool handleResponse(const QNearFieldTarget::RequestId &id, const QByteArray &response);
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDTAGTYPE3_H
diff --git a/src/nfc/qnearfieldtagtype4.cpp b/src/nfc/qnearfieldtagtype4.cpp
index 12b02e10..a6e37fde 100644
--- a/src/nfc/qnearfieldtagtype4.cpp
+++ b/src/nfc/qnearfieldtagtype4.cpp
@@ -41,7 +41,7 @@
 
 #include "qnearfieldtagtype4_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNearFieldTagType4
@@ -160,4 +160,4 @@ bool QNearFieldTagType4::handleResponse(const QNearFieldTarget::RequestId &id,
     return QNearFieldTarget::handleResponse(id, response);
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtagtype4_p.h b/src/nfc/qnearfieldtagtype4_p.h
index 66a25ef3..340d6056 100644
--- a/src/nfc/qnearfieldtagtype4_p.h
+++ b/src/nfc/qnearfieldtagtype4_p.h
@@ -55,7 +55,7 @@
 // We mean it.
 //
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class Q_AUTOTEST_EXPORT QNearFieldTagType4 : public QNearFieldTarget
 {
@@ -79,6 +79,6 @@ protected:
     bool handleResponse(const QNearFieldTarget::RequestId &id, const QByteArray &response);
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDTAGTYPE4_H
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp
index 542b66fe..c559c523 100644
--- a/src/nfc/qnearfieldtarget.cpp
+++ b/src/nfc/qnearfieldtarget.cpp
@@ -52,7 +52,7 @@
 #include <QTime>
 #include <QCoreApplication>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QNearFieldTarget
@@ -490,4 +490,4 @@ bool QNearFieldTarget::handleResponse(const QNearFieldTarget::RequestId &id,
     return true;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index 8c2dd0c1..0cf85400 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -53,7 +53,7 @@ class QString;
 class QUrl;
 QT_END_NAMESPACE
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNdefMessage;
 class QNearFieldTargetPrivate;
@@ -165,9 +165,9 @@ Q_NFC_EXPORT quint16 qNfcChecksum(const char * data, uint len);
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldTarget::AccessMethods)
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::RequestId)
-Q_DECLARE_METATYPE(QtNfc::QNearFieldTarget::Error)
+Q_DECLARE_METATYPE(QNearFieldTarget::RequestId)
+Q_DECLARE_METATYPE(QNearFieldTarget::Error)
 
 #endif // QNEARFIELDTARGET_H
diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp
index 4242568a..80953ce6 100644
--- a/src/nfc/qnearfieldtarget_emulator.cpp
+++ b/src/nfc/qnearfieldtarget_emulator.cpp
@@ -48,7 +48,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDateTime>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 static QMutex tagMutex;
 static QMap<TagBase *, bool> tagMap;
@@ -300,4 +300,4 @@ void TagActivator::timerEvent(QTimerEvent *e)
     tagMutex.unlock();
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h
index 6ed86260..3fb15489 100644
--- a/src/nfc/qnearfieldtarget_emulator_p.h
+++ b/src/nfc/qnearfieldtarget_emulator_p.h
@@ -48,7 +48,7 @@
 
 #include <QtCore/QMap>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class TagType1 : public QNearFieldTagType1
 {
@@ -113,6 +113,6 @@ private:
     int timerId;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDTARGET_EMULATOR_P_H
diff --git a/src/nfc/qnearfieldtarget_p.h b/src/nfc/qnearfieldtarget_p.h
index af24123c..321cb0e9 100644
--- a/src/nfc/qnearfieldtarget_p.h
+++ b/src/nfc/qnearfieldtarget_p.h
@@ -49,7 +49,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QSharedData>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldTarget::RequestIdPrivate : public QSharedData
 {
@@ -61,6 +61,6 @@ public:
     QMap<QNearFieldTarget::RequestId, QVariant> m_decodedResponses;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDTARGET_P_H
diff --git a/src/nfc/qnearfieldtarget_qnx_p.h b/src/nfc/qnearfieldtarget_qnx_p.h
index 340b108c..789d8de5 100644
--- a/src/nfc/qnearfieldtarget_qnx_p.h
+++ b/src/nfc/qnearfieldtarget_qnx_p.h
@@ -51,7 +51,7 @@
 
 #include "qnx/qnxnfcmanager_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 #define TAG_NAME_BUFFER 64
 
@@ -219,6 +219,6 @@ protected:
     QList<QNdefMessage> m_ndefMessages;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNEARFIELDTARGET_QNX_H
diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h
index bd1f0674..de659590 100644
--- a/src/nfc/qnfcglobal.h
+++ b/src/nfc/qnfcglobal.h
@@ -44,17 +44,7 @@
 
 #include <QtCore/qglobal.h>
 
-#if defined(QT_NAMESPACE)
-#  define QT_PREPEND_NAMESPACE_NFC(name) ::QT_NAMESPACE::QtNfc::name
-#  define QT_BEGIN_NAMESPACE_NFC namespace QT_NAMESPACE { namespace QtNfc {
-#  define QT_END_NAMESPACE_NFC } }
-#  define QT_USE_NAMESPACE_NFC using namespace QT_NAMESPACE; using namespace QtNfc;
-#else
-#  define QT_PREPEND_NAMESPACE_NFC(name) ::QtNfc::name
-#  define QT_BEGIN_NAMESPACE_NFC namespace QtNfc {
-#  define QT_END_NAMESPACE_NFC }
-#  define QT_USE_NAMESPACE_NFC using namespace QtNfc;
-#endif
+QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
 #    if defined(QT_BUILD_NFC_LIB)
@@ -66,4 +56,6 @@
 #    define Q_NFC_EXPORT
 #endif
 
+QT_END_NAMESPACE
+
 #endif // QTNFC_H
diff --git a/src/nfc/qnx/qnxnfceventfilter.cpp b/src/nfc/qnx/qnxnfceventfilter.cpp
index f4b53f64..eed1a280 100644
--- a/src/nfc/qnx/qnxnfceventfilter.cpp
+++ b/src/nfc/qnx/qnxnfceventfilter.cpp
@@ -44,7 +44,7 @@
 #include "nfc/nfc.h"
 #include "qnxnfcmanager_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QNXNFCEventFilter::QNXNFCEventFilter()
 {
@@ -100,4 +100,4 @@ bool QNXNFCEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes
     return false;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnx/qnxnfceventfilter_p.h b/src/nfc/qnx/qnxnfceventfilter_p.h
index 51fc5e95..9b10ed57 100644
--- a/src/nfc/qnx/qnxnfceventfilter_p.h
+++ b/src/nfc/qnx/qnxnfceventfilter_p.h
@@ -51,7 +51,7 @@
 #include "../qnfcglobal.h"
 #include "../qndefmessage.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNXNFCEventFilter : public QObject, public QAbstractNativeEventFilter
 {
@@ -70,6 +70,6 @@ Q_SIGNALS:
     void ndefEvent(const QNdefMessage &msg);
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QNXNFCEVENTFILTER_H
diff --git a/src/nfc/qnx/qnxnfcmanager.cpp b/src/nfc/qnx/qnxnfcmanager.cpp
index dd387bef..3ecdcfae 100644
--- a/src/nfc/qnx/qnxnfcmanager.cpp
+++ b/src/nfc/qnx/qnxnfcmanager.cpp
@@ -44,7 +44,7 @@
 #include <QMetaObject>
 #include "../qllcpsocket_qnx_p.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QNXNFCManager *QNXNFCManager::m_instance = 0;
 
@@ -484,4 +484,4 @@ QNdefMessage QNXNFCManager::decodeMessage(nfc_ndef_message_t *nextMessage)
     return newNdefMessage;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qnx/qnxnfcmanager_p.h b/src/nfc/qnx/qnxnfcmanager_p.h
index d3d0ec22..44a652db 100644
--- a/src/nfc/qnx/qnxnfcmanager_p.h
+++ b/src/nfc/qnx/qnxnfcmanager_p.h
@@ -59,7 +59,7 @@
 #define qQNXNFCDebug QT_NO_QDEBUG_MACRO
 #endif
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QLlcpSocketPrivate;
 
@@ -134,7 +134,7 @@ Q_SIGNALS:
     void llcpDisconnected();
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/nfc/qtlv.cpp b/src/nfc/qtlv.cpp
index efc11152..3ad23c8f 100644
--- a/src/nfc/qtlv.cpp
+++ b/src/nfc/qtlv.cpp
@@ -47,7 +47,7 @@
 
 #include <QtCore/QDebug>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 QPair<int, int> qParseReservedMemoryControlTlv(const QByteArray &tlvData)
 {
@@ -529,4 +529,4 @@ int QTlvWriter::moveToNextAvailable()
     return length;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/qtlv_p.h b/src/nfc/qtlv_p.h
index 7d636631..f15ec55f 100644
--- a/src/nfc/qtlv_p.h
+++ b/src/nfc/qtlv_p.h
@@ -50,7 +50,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QPair>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class QNearFieldTarget;
 class Q_AUTOTEST_EXPORT QTlvReader
@@ -119,6 +119,6 @@ private:
 QPair<int, int> qParseReservedMemoryControlTlv(const QByteArray &tlvData);
 QPair<int, int> qParseLockControlTlv(const QByteArray &tlvData);
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // QTLV_P_H
diff --git a/src/nfc/targetemulator.cpp b/src/nfc/targetemulator.cpp
index b607b760..e1d21e87 100644
--- a/src/nfc/targetemulator.cpp
+++ b/src/nfc/targetemulator.cpp
@@ -49,7 +49,7 @@
 // Implementation of qNfcChecksum
 #include "qnearfieldtarget.h"
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 TagBase::TagBase()
 :   lastAccess(0)
@@ -391,4 +391,4 @@ QByteArray NfcTagType2::processCommand(const QByteArray &command)
     return response;
 }
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
diff --git a/src/nfc/targetemulator_p.h b/src/nfc/targetemulator_p.h
index b8d44ac8..06bf5ae6 100644
--- a/src/nfc/targetemulator_p.h
+++ b/src/nfc/targetemulator_p.h
@@ -48,7 +48,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QSettings)
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 
 class TagBase
 {
@@ -107,6 +107,6 @@ private:
     bool expectPacket2;
 };
 
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
 #endif // TARGETEMULATOR_P_H