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.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index fb38f0a3..5426e943 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -51,7 +51,7 @@
 //#include <netinet/in.h>
 #include <string.h>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
+QT_BEGIN_NAMESPACE
 
 // Bluetooth base UUID 00000000-0000-1000-8000-00805F9B34FB
 // TODO: make more efficient
@@ -358,4 +358,4 @@ bool QBluetoothUuid::operator==(const QBluetoothUuid &other) const
     return QUuid::operator==(other);
 }
 
-QT_END_NAMESPACE_BLUETOOTH
+QT_END_NAMESPACE
-- 
cgit v1.2.3