summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/bluetooth/bttennis/handover.h8
-rw-r--r--src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp2
-rw-r--r--src/nfc/doc/snippets/doc_src_qtnfc.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/bluetooth/bttennis/handover.h b/examples/bluetooth/bttennis/handover.h
index 0e932267..aea4dab8 100644
--- a/examples/bluetooth/bttennis/handover.h
+++ b/examples/bluetooth/bttennis/handover.h
@@ -48,15 +48,15 @@
#include <qbluetoothuuid.h>
#include <qnfcglobal.h>
-QTNFC_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_NFC
class QNearFieldManager;
class QNearFieldTarget;
class QLlcpServer;
class QLlcpSocket;
-QTNFC_END_NAMESPACE
+QT_END_NAMESPACE_NFC
-QTNFC_USE_NAMESPACE
-QTBLUETOOTH_USE_NAMESPACE
+QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE_BLUETOOTH
class Handover : public QObject
{
diff --git a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
index c06bc4b4..2bb145cb 100644
--- a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
+++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
@@ -43,7 +43,7 @@
//! [include]
//! [namespace]
-QTBLUETOOTH_USE_NAMESPACE
+QT_USE_NAMESPACE_BLUETOOTH
//! [namespace]
//! [turningon]
diff --git a/src/nfc/doc/snippets/doc_src_qtnfc.cpp b/src/nfc/doc/snippets/doc_src_qtnfc.cpp
index 8597297c..82857ca1 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]
-QTNFC_USE_NAMESPACE
+QT_USE_NAMESPACE_NFC
//! [namespace]