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

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

diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index adf8a22a..77241ce9 100644
--- a/src/bluetooth/qbluetoothsocket.h
+++ b/src/bluetooth/qbluetoothsocket.h
@@ -50,7 +50,7 @@
 #include <QIODevice>
 #include <QtNetwork/QAbstractSocket>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
+QT_BEGIN_NAMESPACE
 
 class QBluetoothSocketPrivate;
 class QBluetoothServiceInfo;
@@ -171,6 +171,6 @@ Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketError);
 Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketState);
 #endif
 
-QT_END_NAMESPACE_BLUETOOTH
+QT_END_NAMESPACE
 
 #endif
-- 
cgit v1.2.3