Unify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enum

Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

13 files changed, 80 insertions, 108 deletions

diff --git a/src/bluetooth/qbluetoothserver.cpp b/src/bluetooth/qbluetoothserver.cpp
index 9cbec283..3cf99bc9 100644
--- a/src/bluetooth/qbluetoothserver.cpp
+++ b/src/bluetooth/qbluetoothserver.cpp
@@ -63,21 +63,12 @@ QT_BEGIN_NAMESPACE
     applicable attributes for your service and register it using QBluetoothServiceInfo::registerService().
     Call serverPort() to get the channel number that is being used.
 
-    If the \l QBluetoothServer::ServerType is not supported by a platform, \l listen() will return \c false.
+    If the \l QBluetoothServiceInfo::Protocol is not supported by a platform, \l listen() will return \c false.
 
     \sa QBluetoothServiceInfo, QBluetoothSocket
 */
 
 /*!
-    \enum QBluetoothServer::ServerType
-
-    This enum describes the Bluetooth server type.
-
-    \value L2capServer          L2CAP server (Not supported on BlackBerry).
-    \value RfcommServer         RFCOMM server.
-*/
-
-/*!
     \fn void QBluetoothServer::newConnection()
 
     This signal is emitted when a new connection is available.
@@ -140,7 +131,7 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a bluetooth server with \a parent and \a serverType.
 */
-QBluetoothServer::QBluetoothServer(ServerType serverType, QObject *parent)
+QBluetoothServer::QBluetoothServer(QBluetoothServiceInfo::Protocol serverType, QObject *parent)
     : QObject(parent), d_ptr(new QBluetoothServerPrivate(serverType))
 {
     d_ptr->q_ptr = this;
@@ -197,7 +188,7 @@ QBluetoothServiceInfo QBluetoothServer::listen(const QBluetoothUuid &uuid, const
     protocolDescriptorList.append(QVariant::fromValue(protocol));
     protocol.clear();
 //! [listen]
-    if (d->serverType == RfcommServer) {
+    if (d->serverType == QBluetoothServiceInfo::RfcommProtocol) {
 //! [listen2]
     protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::Rfcomm))
              << QVariant::fromValue(quint8(serverPort()));
@@ -253,10 +244,10 @@ int QBluetoothServer::maxPendingConnections() const
 */
 
 /*!
-    \fn QBluetooth::ServerType QBluetoothServer::serverType() const
-    Returns the server type of the QBluetoothServer.
+    \fn QBluetoothSocket::ServerType QBluetoothServer::serverType() const
+    Returns the type of the QBluetoothServer.
 */
-QBluetoothServer::ServerType QBluetoothServer::serverType() const
+QBluetoothServiceInfo::Protocol QBluetoothServer::serverType() const
 {
     Q_D(const QBluetoothServer);
     return d->serverType;
diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h
index 77634649..ad651667 100644
--- a/src/bluetooth/qbluetoothserver.h
+++ b/src/bluetooth/qbluetoothserver.h
@@ -62,11 +62,7 @@ class Q_BLUETOOTH_EXPORT QBluetoothServer : public QObject
     Q_OBJECT
 
 public:
-    enum ServerType {
-        L2capServer = 0,
-        RfcommServer
-    };
-    QBluetoothServer(ServerType serverType, QObject *parent = 0);
+    QBluetoothServer(QBluetoothServiceInfo::Protocol serverType, QObject *parent = 0);
     ~QBluetoothServer();
 
     void close();
@@ -87,7 +83,7 @@ public:
     void setSecurityFlags(QBluetooth::SecurityFlags security);
     QBluetooth::SecurityFlags securityFlags() const;
 
-    ServerType serverType() const;
+    QBluetoothServiceInfo::Protocol serverType() const;
 
 Q_SIGNALS:
     void newConnection();
diff --git a/src/bluetooth/qbluetoothserver_bluez.cpp b/src/bluetooth/qbluetoothserver_bluez.cpp
index cd802648..5e1fc701 100644
--- a/src/bluetooth/qbluetoothserver_bluez.cpp
+++ b/src/bluetooth/qbluetoothserver_bluez.cpp
@@ -65,13 +65,13 @@ static inline void convertAddress(quint64 from, quint8 (&to)[6])
     to[5] = (from >> 40) & 0xff;
 }
 
-QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServer::ServerType sType)
+QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol sType)
     :   maxPendingConnections(1), serverType(sType), socketNotifier(0)
 {
-    if (sType == QBluetoothServer::RfcommServer)
-        socket = new QBluetoothSocket(QBluetoothSocket::RfcommSocket);
+    if (sType == QBluetoothServiceInfo::RfcommProtocol)
+        socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol);
     else
-       socket = new QBluetoothSocket(QBluetoothSocket::L2capSocket);
+       socket = new QBluetoothSocket(QBluetoothServiceInfo::L2capProtocol);
 }
 
 QBluetoothServerPrivate::~QBluetoothServerPrivate()
@@ -107,7 +107,7 @@ bool QBluetoothServer::listen(const QBluetoothAddress &address, quint16 port)
     if (sock < 0)
         return false;
 
-    if (d->serverType == RfcommServer) {
+    if (d->serverType == QBluetoothServiceInfo::RfcommProtocol) {
         sockaddr_rc addr;
 
         addr.rc_family = AF_BLUETOOTH;
@@ -178,7 +178,7 @@ QBluetoothSocket *QBluetoothServer::nextPendingConnection()
         return 0;
 
     int pending;
-    if (d->serverType == RfcommServer) {
+    if (d->serverType == QBluetoothServiceInfo::RfcommProtocol) {
         sockaddr_rc addr;
         socklen_t length = sizeof(sockaddr_rc);
         pending = ::accept(d->socket->socketDescriptor(),
@@ -192,10 +192,10 @@ QBluetoothSocket *QBluetoothServer::nextPendingConnection()
 
     if (pending >= 0) {
         QBluetoothSocket *newSocket = new QBluetoothSocket;
-        if (d->serverType == RfcommServer)
-            newSocket->setSocketDescriptor(pending, QBluetoothSocket::RfcommSocket);
+        if (d->serverType == QBluetoothServiceInfo::RfcommProtocol)
+            newSocket->setSocketDescriptor(pending, QBluetoothServiceInfo::RfcommProtocol);
         else
-            newSocket->setSocketDescriptor(pending, QBluetoothSocket::L2capSocket);
+            newSocket->setSocketDescriptor(pending, QBluetoothServiceInfo::L2capProtocol);
 
         d->socketNotifier->setEnabled(true);
 
@@ -229,7 +229,7 @@ void QBluetoothServer::setSecurityFlags(QBluetooth::SecurityFlags security)
     if (security == QBluetooth::NoSecurity)
         lm = 0;
 
-    if (d->serverType == RfcommServer) {
+    if (d->serverType == QBluetoothServiceInfo::RfcommProtocol) {
         if (security.testFlag(QBluetooth::Authorization))
             lm |= RFCOMM_LM_AUTH;
         if (security.testFlag(QBluetooth::Authentication))
@@ -273,7 +273,7 @@ QBluetooth::SecurityFlags QBluetoothServer::securityFlags() const
     int len = sizeof(lm);
     int security = QBluetooth::NoSecurity;
 
-    if (d->serverType == RfcommServer) {
+    if (d->serverType == QBluetoothServiceInfo::RfcommProtocol) {
         if (getsockopt(d->socket->socketDescriptor(), SOL_RFCOMM, RFCOMM_LM, &lm, (socklen_t *)&len) < 0) {
             qWarning() << "Failed to get security flags" << strerror(errno);
             return QBluetooth::NoSecurity;
diff --git a/src/bluetooth/qbluetoothserver_p.cpp b/src/bluetooth/qbluetoothserver_p.cpp
index 9c1dfeaf..1a123c4d 100644
--- a/src/bluetooth/qbluetoothserver_p.cpp
+++ b/src/bluetooth/qbluetoothserver_p.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServer::ServerType sType)
+QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol sType)
     : serverType(sType)
 {
 }
diff --git a/src/bluetooth/qbluetoothserver_p.h b/src/bluetooth/qbluetoothserver_p.h
index e2ff60a8..b9847aaf 100644
--- a/src/bluetooth/qbluetoothserver_p.h
+++ b/src/bluetooth/qbluetoothserver_p.h
@@ -74,7 +74,7 @@ class QBluetoothServerPrivate
     Q_DECLARE_PUBLIC(QBluetoothServer)
 
 public:
-    QBluetoothServerPrivate(QBluetoothServer::ServerType serverType);
+    QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol serverType);
     ~QBluetoothServerPrivate();
 
 #ifdef QT_BLUEZ_BLUETOOTH
@@ -86,7 +86,7 @@ public:
 
     int maxPendingConnections;
     QBluetooth::SecurityFlags securityFlags;
-    QBluetoothServer::ServerType serverType;
+    QBluetoothServiceInfo::Protocol serverType;
 
 #ifdef QT_QNX_BLUETOOTH
     QList<QBluetoothSocket *> activeSockets;
diff --git a/src/bluetooth/qbluetoothserver_qnx.cpp b/src/bluetooth/qbluetoothserver_qnx.cpp
index 7a222959..bc222b85 100644
--- a/src/bluetooth/qbluetoothserver_qnx.cpp
+++ b/src/bluetooth/qbluetoothserver_qnx.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 extern QHash<QBluetoothServerPrivate*, int> __fakeServerPorts;
 
-QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServer::ServerType sType)
+QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol sType)
     : socket(0),maxPendingConnections(1),securityFlags(QBluetooth::NoSecurity), serverType(sType)
 {
     ppsRegisterControl();
@@ -84,11 +84,11 @@ void QBluetoothServerPrivate::controlReply(ppsResult result)
             if (!socket)
                 return;
 
-            socket->setSocketDescriptor(socketFD, QBluetoothSocket::RfcommSocket,
+            socket->setSocketDescriptor(socketFD, QBluetoothServiceInfo::RfcommProtocol,
                                            QBluetoothSocket::ConnectedState);
             socket->connectToService(QBluetoothAddress(nextClientAddress), m_uuid);
             activeSockets.append(socket);
-            socket = new QBluetoothSocket(QBluetoothSocket::RfcommSocket, this);
+            socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol, this);
             socket->setSocketState(QBluetoothSocket::ListeningState);
             emit q->newConnection();
         }
@@ -137,7 +137,7 @@ void QBluetoothServer::close()
 bool QBluetoothServer::listen(const QBluetoothAddress &address, quint16 port)
 {
     Q_UNUSED(address)
-    if (serverType() == L2capServer)
+    if (serverType() != QBluetoothServiceInfo::RfcommProtocol)
         return false;
 
     Q_D(QBluetoothServer);
@@ -145,7 +145,7 @@ bool QBluetoothServer::listen(const QBluetoothAddress &address, quint16 port)
     if (d->socket && d->socket->state() == QBluetoothSocket::ListeningState)
         return true;
 
-    d->socket = new QBluetoothSocket(QBluetoothSocket::RfcommSocket);
+    d->socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol);
 
     //We can not register an actual Rfcomm port, because the platform does not allow it
     //but we need a way to associate a server with a service
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index 0f2471f9..f492d35e 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -59,35 +59,24 @@ QT_BEGIN_NAMESPACE
     \brief The QBluetoothSocket class enables connection to a Bluetooth device
     running a bluetooth server.
 
-    QBluetoothSocket supports two socket types, \l {QBluetoothSocket::L2capSocket}{L2CAP} and
-    \l {QBluetoothSocket::RfcommSocket}{RFCOMM}.
+    QBluetoothSocket supports two socket types, \l {QBluetoothServiceInfo::L2capProtocol}{L2CAP} and
+    \l {QBluetoothServiceInfo::RfcommProtocol}{RFCOMM}.
 
-    \l {QBluetoothSocket::L2capSocket}{L2CAP} is a low level datagram-oriented Bluetooth socket
-            (Not supported on BlackBerry).
+    \l {QBluetoothServiceInfo::L2capProtocol}{L2CAP} is a low level datagram-oriented Bluetooth socket.
 
-    \l {QBluetoothSocket::RfcommSocket}{RFCOMM} is a reliable, stream-oriented socket.  RFCOMM
+    \l {QBluetoothServiceInfo::RfcommProtocol}{RFCOMM} is a reliable, stream-oriented socket. RFCOMM
     sockets emulate an RS-232 serial port.
 
     To create a connection to a Bluetooth service, create a socket of the appropriate type and call
     connectToService() passing the Bluetooth address and port number. QBluetoothSocket will emit
     the connected() signal when the connection is established.
 
-    If the \l {QBluetoothSocket::SocketType}{SocketType} is not supported on a platform, calling
-    \l connectToService() will emit a \l {QBluetoothSocket::UnsupportedSocketTypeError}{UnsupportedSocketTypeError} error.
+    If the \l {QBluetoothServiceInfo::Protocol}{Protocol} is not supported on a platform, calling
+    \l connectToService() will emit a \l {QBluetoothSocket::UnsupportedProtocolError}{UnsupportedProtocolError} error.
 
 */
 
 /*!
-    \enum QBluetoothSocket::SocketType
-
-    This enum describes the Bluetooth socket type.
-
-    \value UnknownSocketType    Unknown socket type.
-    \value L2capSocket          L2CAP socket. (Not supported on BlackBerry).
-    \value RfcommSocket         RFCOMM socket.
-*/
-
-/*!
     \enum QBluetoothSocket::SocketState
 
     This enum describes the state of the Bluetooth socket.
@@ -114,7 +103,7 @@ QT_BEGIN_NAMESPACE
     \value HostNotFoundError        Could not find the remote host.
     \value ServiceNotFoundError     Could not find the service UUID on remote host.
     \value NetworkError             Attempt to read or write from socket returned an error
-    \value UnsupportedSocketTypeError The \l {QBluetoothSocket::SocketType}{SocketType} is not
+    \value UnsupportedProtocolError The \l {QBluetoothServiceInfo::Protocol}{Protocol} is not
                                     supported on this platform.
 */
 
@@ -228,7 +217,7 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a Bluetooth socket of \a socketType type, with \a parent.
 */
-QBluetoothSocket::QBluetoothSocket(QBluetoothSocket::SocketType socketType, QObject *parent)
+QBluetoothSocket::QBluetoothSocket(QBluetoothServiceInfo::Protocol socketType, QObject *parent)
 : QIODevice(parent), d_ptr(new QBluetoothSocketPrivate)
 {
     d_ptr->q_ptr = this;
@@ -308,8 +297,8 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op
     setOpenMode(openMode);
 
 #ifdef QT_QNX_BLUETOOTH
-    if (socketType() == L2capSocket) {
-        d->socketError = QBluetoothSocket::UnsupportedSocketTypeError;
+    if (socketType() != QBluetoothServiceInfo::RfcommProtocol) {
+        d->socketError = QBluetoothSocket::UnsupportedProtocolError;
         d->errorString = tr("Socket type not supported");
         Q_EMIT error(d->socketError);
         return;
@@ -317,13 +306,13 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op
     d->connectToService(service.device().address(), service.serviceUuid(), openMode);
 #else
     if (service.protocolServiceMultiplexer() > 0) {
-        if (!d->ensureNativeSocket(L2capSocket)) {
+        if (!d->ensureNativeSocket(QBluetoothServiceInfo::L2capProtocol)) {
             emit error(UnknownSocketError);
             return;
         }
         d->connectToService(service.device().address(), service.protocolServiceMultiplexer(), openMode);
     } else if (service.serverChannel() > 0) {
-        if (!d->ensureNativeSocket(RfcommSocket)) {
+        if (!d->ensureNativeSocket(QBluetoothServiceInfo::RfcommProtocol)) {
             emit error(UnknownSocketError);
             return;
         }
@@ -361,10 +350,10 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const
 {
 #ifdef QT_QNX_BLUETOOTH
     Q_D(QBluetoothSocket);
-    if (socketType() == L2capSocket) {
-        d->socketError = QBluetoothSocket::UnsupportedSocketTypeError;
+    if (socketType() != Rfcomm) {
+        d->socketError = QBluetoothSocket::UnsupportedProtocolError;
         d->errorString = tr("Socket type not supported");
-        Q_EMIT error(d->socketError)
+        Q_EMIT error(d->socketError);
         return;
     }
     d->connectToService(address, uuid, openMode);
@@ -394,16 +383,16 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const
 */
 void QBluetoothSocket::connectToService(const QBluetoothAddress &address, quint16 port, OpenMode openMode)
 {
+    Q_D(QBluetoothSocket);
 #ifdef QT_QNX_BLUETOOTH
     Q_UNUSED(port);
     Q_UNUSED(openMode);
     Q_UNUSED(address);
     d->socketError = QBluetoothSocket::ServiceNotFoundError;
     d->errorString = tr("Connecting to port is not supported on QNX");
-    Q_EMIT error(d->socketError)
+    Q_EMIT error(d->socketError);
     qWarning("Connecting to port is not supported");
 #else
-    Q_D(QBluetoothSocket);
     setOpenMode(openMode);
     d->connectToService(address, port, openMode);
 #endif
@@ -412,7 +401,7 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, quint1
 /*!
     Returns the socket type.
 */
-QBluetoothSocket::SocketType QBluetoothSocket::socketType() const
+QBluetoothServiceInfo::Protocol QBluetoothSocket::socketType() const
 {
     Q_D(const QBluetoothSocket);
     return d->socketType;
@@ -626,7 +615,7 @@ void QBluetoothSocket::close()
 */
 
 
-bool QBluetoothSocket::setSocketDescriptor(int socketDescriptor, SocketType socketType,
+bool QBluetoothSocket::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
                                            SocketState socketState, OpenMode openMode)
 {
     Q_D(QBluetoothSocket);
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index c8ecbb58..055508a2 100644
--- a/src/bluetooth/qbluetoothsocket.h
+++ b/src/bluetooth/qbluetoothsocket.h
@@ -46,6 +46,7 @@
 
 #include <QtBluetooth/QBluetoothAddress>
 #include <QtBluetooth/QBluetoothUuid>
+#include <QtBluetooth/QBluetoothServiceInfo>
 
 #include <QIODevice>
 #include <QtNetwork/QAbstractSocket>
@@ -64,11 +65,6 @@ class Q_BLUETOOTH_EXPORT QBluetoothSocket : public QIODevice
     friend class QBluetoothServerPrivate;
 
 public:
-    enum SocketType {
-        UnknownSocketType = -1,
-        L2capSocket,
-        RfcommSocket
-    };
 
     enum SocketState {
         UnconnectedState = QAbstractSocket::UnconnectedState,
@@ -88,10 +84,10 @@ public:
         HostNotFoundError = QAbstractSocket::HostNotFoundError,
         ServiceNotFoundError = QAbstractSocket::SocketAddressNotAvailableError,
         NetworkError = QAbstractSocket::NetworkError,
-        UnsupportedSocketTypeError
+        UnsupportedProtocolError
     };
 
-    explicit QBluetoothSocket(SocketType socketType, QObject *parent = 0);   // create socket of type socketType
+    explicit QBluetoothSocket(QBluetoothServiceInfo::Protocol socketType, QObject *parent = 0);   // create socket of type socketType
     QBluetoothSocket(QObject *parent = 0);  // create a blank socket
     virtual ~QBluetoothSocket();
 
@@ -125,12 +121,12 @@ public:
     //qint64 readBufferSize() const;
     //void setReadBufferSize(qint64 size);
 
-    bool setSocketDescriptor(int socketDescriptor, SocketType socketType,
+    bool setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
                              SocketState socketState = ConnectedState,
                              OpenMode openMode = ReadWrite);
     int socketDescriptor() const;
 
-    SocketType socketType() const;
+    QBluetoothServiceInfo::Protocol socketType() const;
     SocketState state() const;
     SocketError error() const;
     QString errorString() const;
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp
index 3bf52a7e..bc7dc972 100644
--- a/src/bluetooth/qbluetoothsocket_bluez.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluez.cpp
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 QBluetoothSocketPrivate::QBluetoothSocketPrivate()
     : socket(-1),
-      socketType(QBluetoothSocket::UnknownSocketType),
+      socketType(QBluetoothServiceInfo::UnknownProtocol),
       state(QBluetoothSocket::UnconnectedState),
       readNotifier(0),
       connectWriteNotifier(0),
@@ -79,7 +79,7 @@ QBluetoothSocketPrivate::~QBluetoothSocketPrivate()
     connectWriteNotifier = 0;
 }
 
-bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothSocket::SocketType type)
+bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothServiceInfo::Protocol type)
 {
     if (socket != -1) {
         if (socketType == type)
@@ -95,10 +95,10 @@ bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothSocket::SocketType ty
     socketType = type;
 
     switch (type) {
-    case QBluetoothSocket::L2capSocket:
+    case QBluetoothServiceInfo::L2capProtocol:
         socket = ::socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
         break;
-    case QBluetoothSocket::RfcommSocket:
+    case QBluetoothServiceInfo::RfcommProtocol:
         socket = ::socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
         break;
     default:
@@ -130,7 +130,7 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address,
     Q_UNUSED(openMode);
     int result = -1;
 
-    if (socketType == QBluetoothSocket::RfcommSocket) {
+    if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
         sockaddr_rc addr;
 
         memset(&addr, 0, sizeof(addr));
@@ -143,7 +143,7 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address,
         readNotifier->setEnabled(true);QString();
 
         result = ::connect(socket, (sockaddr *)&addr, sizeof(addr));
-    } else if (socketType == QBluetoothSocket::L2capSocket) {
+    } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
         sockaddr_l2 addr;
 
         memset(&addr, 0, sizeof(addr));
@@ -292,7 +292,7 @@ QString QBluetoothSocketPrivate::localName() const
 
 QBluetoothAddress QBluetoothSocketPrivate::localAddress() const
 {
-    if (socketType == QBluetoothSocket::RfcommSocket) {
+    if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
         sockaddr_rc addr;
         socklen_t addrLength = sizeof(addr);
 
@@ -301,7 +301,7 @@ QBluetoothAddress QBluetoothSocketPrivate::localAddress() const
             convertAddress(addr.rc_bdaddr.b, bdaddr);
             return QBluetoothAddress(bdaddr);
         }
-    } else if (socketType == QBluetoothSocket::L2capSocket) {
+    } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
         sockaddr_l2 addr;
         socklen_t addrLength = sizeof(addr);
 
@@ -317,13 +317,13 @@ QBluetoothAddress QBluetoothSocketPrivate::localAddress() const
 
 quint16 QBluetoothSocketPrivate::localPort() const
 {
-    if (socketType == QBluetoothSocket::RfcommSocket) {
+    if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
         sockaddr_rc addr;
         socklen_t addrLength = sizeof(addr);
 
         if (::getsockname(socket, reinterpret_cast<sockaddr *>(&addr), &addrLength) == 0)
             return addr.rc_channel;
-    } else if (socketType == QBluetoothSocket::L2capSocket) {
+    } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
         sockaddr_l2 addr;
         socklen_t addrLength = sizeof(addr);
 
@@ -341,7 +341,7 @@ QString QBluetoothSocketPrivate::peerName() const
 
     quint64 bdaddr;
 
-    if (socketType == QBluetoothSocket::RfcommSocket) {
+    if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
         sockaddr_rc addr;
         socklen_t addrLength = sizeof(addr);
 
@@ -349,7 +349,7 @@ QString QBluetoothSocketPrivate::peerName() const
             return QString();
 
         convertAddress(addr.rc_bdaddr.b, bdaddr);
-    } else if (socketType == QBluetoothSocket::L2capSocket) {
+    } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
         sockaddr_l2 addr;
         socklen_t addrLength = sizeof(addr);
 
@@ -402,7 +402,7 @@ QString QBluetoothSocketPrivate::peerName() const
 
 QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
 {
-    if (socketType == QBluetoothSocket::RfcommSocket) {
+    if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
         sockaddr_rc addr;
         socklen_t addrLength = sizeof(addr);
 
@@ -411,7 +411,7 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
             convertAddress(addr.rc_bdaddr.b, bdaddr);
             return QBluetoothAddress(bdaddr);
         }
-    } else if (socketType == QBluetoothSocket::L2capSocket) {
+    } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
         sockaddr_l2 addr;
         socklen_t addrLength = sizeof(addr);
 
@@ -427,13 +427,13 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
 
 quint16 QBluetoothSocketPrivate::peerPort() const
 {
-    if (socketType == QBluetoothSocket::RfcommSocket) {
+    if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
         sockaddr_rc addr;
         socklen_t addrLength = sizeof(addr);
 
         if (::getpeername(socket, reinterpret_cast<sockaddr *>(&addr), &addrLength) == 0)
             return addr.rc_channel;
-    } else if (socketType == QBluetoothSocket::L2capSocket) {
+    } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
         sockaddr_l2 addr;
         socklen_t addrLength = sizeof(addr);
 
@@ -511,7 +511,7 @@ void QBluetoothSocketPrivate::close()
 
 }
 
-bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothSocket::SocketType socketType_,
+bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType_,
                                            QBluetoothSocket::SocketState socketState, QBluetoothSocket::OpenMode openMode)
 {
     Q_Q(QBluetoothSocket);
diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp
index 91fbfb40..018ccea6 100644
--- a/src/bluetooth/qbluetoothsocket_p.cpp
+++ b/src/bluetooth/qbluetoothsocket_p.cpp
@@ -52,7 +52,7 @@ QBluetoothSocketPrivate::~QBluetoothSocketPrivate()
 {
 }
 
-bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothSocket::SocketType type)
+bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothServiceInfo::Protocol type)
 {
     Q_UNUSED(type);
     return false;
@@ -125,7 +125,7 @@ void QBluetoothSocketPrivate::close()
 {
 }
 
-bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothSocket::SocketType socketType,
+bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
                                            QBluetoothSocket::SocketState socketState, QBluetoothSocket::OpenMode openMode)
 {
     Q_UNUSED(socketDescriptor);
diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h
index a3373c95..92712911 100644
--- a/src/bluetooth/qbluetoothsocket_p.h
+++ b/src/bluetooth/qbluetoothsocket_p.h
@@ -94,7 +94,7 @@ public:
     void connectToService(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode);
 #endif
 
-    bool ensureNativeSocket(QBluetoothSocket::SocketType type);
+    bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type);
 
     QString localName() const;
     QBluetoothAddress localAddress() const;
@@ -114,7 +114,7 @@ public:
     qint64 writeData(const char *data, qint64 maxSize);
     qint64 readData(char *data, qint64 maxSize);
 
-    bool setSocketDescriptor(int socketDescriptor, QBluetoothSocket::SocketType socketType,
+    bool setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
                              QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState,
                              QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite);
     int socketDescriptor() const;
@@ -125,7 +125,7 @@ public:
     QPrivateLinearBuffer buffer;
     QPrivateLinearBuffer txBuffer;
     int socket;
-    QBluetoothSocket::SocketType socketType;
+    QBluetoothServiceInfo::Protocol socketType;
     QBluetoothSocket::SocketState state;
     QBluetoothSocket::SocketError socketError;
     QSocketNotifier *readNotifier;
diff --git a/src/bluetooth/qbluetoothsocket_qnx.cpp b/src/bluetooth/qbluetoothsocket_qnx.cpp
index dfb9f66e..76832524 100644
--- a/src/bluetooth/qbluetoothsocket_qnx.cpp
+++ b/src/bluetooth/qbluetoothsocket_qnx.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 QBluetoothSocketPrivate::QBluetoothSocketPrivate()
     : socket(-1),
-      socketType(QBluetoothSocket::UnknownSocketType),
+      socketType(QBluetoothSServiceInfo::UnknownProtocol),
       state(QBluetoothSocket::UnconnectedState),
       readNotifier(0),
       connectWriteNotifier(0),
@@ -65,7 +65,7 @@ QBluetoothSocketPrivate::~QBluetoothSocketPrivate()
     close();
 }
 
-bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothSocket::SocketType type)
+bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothServiceInfo::Protocol type)
 {
     Q_UNUSED(type);
     return false;
@@ -93,7 +93,7 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address,
     ppsSendControlMessage("connect_service", 0x1101, uuid, address.toString(), QString(), this, BT_SPP_CLIENT_SUBTYPE);
     ppsRegisterForEvent(QStringLiteral("service_connected"),this);
     ppsRegisterForEvent(QStringLiteral("get_mount_point_path"),this);
-    socketType = QBluetoothSocket::RfcommSocket;
+    socketType = QBluetoothServiceInfo::RfcommProtocol;
 }
 
 void QBluetoothSocketPrivate::_q_writeNotify()
@@ -250,7 +250,7 @@ void QBluetoothSocketPrivate::close()
     abort();
 }
 
-bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothSocket::SocketType socketType,
+bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
                                                   QBluetoothSocket::SocketState socketState, QBluetoothSocket::OpenMode openMode)
 {
     Q_Q(QBluetoothSocket);
diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
index 0d5d0e68..7180be7b 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
@@ -350,12 +350,12 @@ int QDeclarativeBluetoothServicePrivate::listen() {
         qWarning() << "Unknown protocol, can't make service" << m_protocol;
         return -1;
     }
-    QBluetoothServer::ServerType serverType;
+    QBluetoothServiceInfo::Protocol serverType;
     if (m_protocol == "l2cap") {
-        serverType = QBluetoothServer::L2capServer;
+        serverType = QBluetoothServiceInfo::L2capProtocol;
     }
     else if (m_protocol == "rfcomm") {
-        serverType = QBluetoothServer::RfcommServer;
+        serverType = QBluetoothServiceInfo::RfcommProtocol;
     }
 
     QBluetoothServer *server = new QBluetoothServer(serverType);