From d8d903826daa8db49e437b76fb80693ab8feb01e Mon Sep 17 00:00:00 2001
From: Fabian Bumberger <fbumberger@rim.com>
Date: Fri, 2 Aug 2013 18:09:20 +0200
Subject: Merge QRfcommServer and QL2capServer to QBluetoothServer

Task-number: QTBUG-32722

Change-Id: Ia75ad5af2f81b737a8cca09dba919a7dc0fa0f8a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
---
 examples/bluetooth/btchat/chat.cpp           | 2 +-
 examples/bluetooth/btchat/chatserver.cpp     | 4 ++--
 examples/bluetooth/btchat/chatserver.h       | 4 ++--
 examples/bluetooth/bttennis/tennisserver.cpp | 4 ++--
 examples/bluetooth/bttennis/tennisserver.h   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'examples')

diff --git a/examples/bluetooth/btchat/chat.cpp b/examples/bluetooth/btchat/chat.cpp
index 1d4e57eb..37bfb85c 100644
--- a/examples/bluetooth/btchat/chat.cpp
+++ b/examples/bluetooth/btchat/chat.cpp
@@ -44,7 +44,7 @@
 #include "chatclient.h"
 
 #include <qbluetoothuuid.h>
-#include <qrfcommserver.h>
+#include <qbluetoothserver.h>
 #include <qbluetoothservicediscoveryagent.h>
 #include <qbluetoothdeviceinfo.h>
 #include <qbluetoothlocaldevice.h>
diff --git a/examples/bluetooth/btchat/chatserver.cpp b/examples/bluetooth/btchat/chatserver.cpp
index 7d9485ab..ca7023f1 100644
--- a/examples/bluetooth/btchat/chatserver.cpp
+++ b/examples/bluetooth/btchat/chatserver.cpp
@@ -40,7 +40,7 @@
 
 #include "chatserver.h"
 
-#include <qrfcommserver.h>
+#include <qbluetoothserver.h>
 #include <qbluetoothsocket.h>
 
 //! [Service UUID]
@@ -63,7 +63,7 @@ void ChatServer::startServer()
         return;
 
     //! [Create the server]
-    rfcommServer = new QRfcommServer(this);
+    rfcommServer = new QBluetoothServer(QBluetoothServer::RfcommServer, this);
     connect(rfcommServer, SIGNAL(newConnection()), this, SLOT(clientConnected()));
     rfcommServer->listen();
     //! [Create the server]
diff --git a/examples/bluetooth/btchat/chatserver.h b/examples/bluetooth/btchat/chatserver.h
index ed568534..f73ec605 100644
--- a/examples/bluetooth/btchat/chatserver.h
+++ b/examples/bluetooth/btchat/chatserver.h
@@ -47,7 +47,7 @@
 #include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
-class QRfcommServer;
+class QBluetoothServer;
 class QBluetoothSocket;
 QT_END_NAMESPACE_BLUETOOTH
 
@@ -79,7 +79,7 @@ private slots:
     void readSocket();
 
 private:
-    QRfcommServer *rfcommServer;
+    QBluetoothServer *rfcommServer;
     QBluetoothServiceInfo serviceInfo;
     QList<QBluetoothSocket *> clientSockets;
 };
diff --git a/examples/bluetooth/bttennis/tennisserver.cpp b/examples/bluetooth/bttennis/tennisserver.cpp
index a127e235..853b14ac 100644
--- a/examples/bluetooth/bttennis/tennisserver.cpp
+++ b/examples/bluetooth/bttennis/tennisserver.cpp
@@ -42,7 +42,7 @@
 #include "tennisserver.h"
 #include "tennis.h"
 
-#include <ql2capserver.h>
+#include <qbluetoothserver.h>
 #include <qbluetoothsocket.h>
 
 #include <QDebug>
@@ -74,7 +74,7 @@ void TennisServer::startServer()
         return;
 
     //! [Create the server]
-    l2capServer = new QL2capServer(this);
+    l2capServer = new QBluetoothServer(QBluetoothServer::L2capServer, this);
     connect(l2capServer, SIGNAL(newConnection()), this, SLOT(clientConnected()));
     l2capServer->listen();
     //! [Create the server]
diff --git a/examples/bluetooth/bttennis/tennisserver.h b/examples/bluetooth/bttennis/tennisserver.h
index 2871f646..ca9e542a 100644
--- a/examples/bluetooth/bttennis/tennisserver.h
+++ b/examples/bluetooth/bttennis/tennisserver.h
@@ -52,7 +52,7 @@
 #include <QtCore/QTimer>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
-class QL2capServer;
+class QBluetoothServer;
 class QBluetoothSocket;
 class QBluetoothServiceInfo;
 QT_END_NAMESPACE_BLUETOOTH
@@ -92,7 +92,7 @@ private slots:
     void socketError(QBluetoothSocket::SocketError err);
 
 private:
-    QL2capServer *l2capServer;
+    QBluetoothServer *l2capServer;
     QBluetoothServiceInfo serviceInfo;
     QBluetoothSocket *clientSocket;
     QDataStream *stream;
-- 
cgit v1.2.3