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>
---
 src/bluetooth/qbluetoothuuid.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/bluetooth/qbluetoothuuid.h')

diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index 23361d16..ef69e983 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -50,7 +50,7 @@
 
 #include <QtCore/QDebug>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
+QT_BEGIN_NAMESPACE
 
 struct quint128
 {
@@ -172,8 +172,8 @@ inline QDebug operator<<(QDebug debug, const QBluetoothUuid &uuid)
     return debug;
 }
 
-QT_END_NAMESPACE_BLUETOOTH
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QtBluetooth::QBluetoothUuid)
+Q_DECLARE_METATYPE(QBluetoothUuid)
 
 #endif
-- 
cgit v1.2.3