From e21b666856fe89a13c2c8c1eb7ef6fb18275f9b4 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@digia.com>
Date: Thu, 5 Sep 2013 13:32:00 +0200
Subject: 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>
---
 examples/nfc/ndefeditor/mainwindow.h            | 6 +++---
 examples/nfc/ndefeditor/mimeimagerecordeditor.h | 2 +-
 examples/nfc/ndefeditor/textrecordeditor.h      | 2 +-
 examples/nfc/ndefeditor/urirecordeditor.h       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'examples/nfc/ndefeditor')

diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h
index ea44e074..69e1e50f 100644
--- a/examples/nfc/ndefeditor/mainwindow.h
+++ b/examples/nfc/ndefeditor/mainwindow.h
@@ -47,12 +47,12 @@
 
 #include <qnearfieldtarget.h>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 class QNearFieldManager;
 class QNdefMessage;
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
index fabfe5f6..150f11cd 100644
--- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h
+++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
@@ -48,7 +48,7 @@
 
 #include <qndefrecord.h>
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/nfc/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h
index c5b51cc4..0da016ee 100644
--- a/examples/nfc/ndefeditor/textrecordeditor.h
+++ b/examples/nfc/ndefeditor/textrecordeditor.h
@@ -51,7 +51,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 class TextRecordEditor : public QWidget
 {
diff --git a/examples/nfc/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h
index 02fc910e..aaf46b9a 100644
--- a/examples/nfc/ndefeditor/urirecordeditor.h
+++ b/examples/nfc/ndefeditor/urirecordeditor.h
@@ -52,7 +52,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 class UriRecordEditor : public QWidget
 {
-- 
cgit v1.2.3