Merge QRfcommServer and QL2capServer to QBluetoothServer

Task-number: QTBUG-32722

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

2 files changed, 12 insertions, 12 deletions

diff --git a/tests/auto/ql2capserver/tst_ql2capserver.cpp b/tests/auto/ql2capserver/tst_ql2capserver.cpp
index 6295b140..9ba7ba8a 100644
--- a/tests/auto/ql2capserver/tst_ql2capserver.cpp
+++ b/tests/auto/ql2capserver/tst_ql2capserver.cpp
@@ -43,7 +43,7 @@
 
 #include <QDebug>
 
-#include <ql2capserver.h>
+#include <qbluetoothserver.h>
 #include <qbluetoothsocket.h>
 
 QT_USE_NAMESPACE_BLUETOOTH
@@ -94,7 +94,7 @@ void tst_QL2capServer::initTestCase()
 void tst_QL2capServer::tst_construction()
 {
     {
-        QL2capServer server;
+        QBluetoothServer server(QBluetoothServer::L2capServer);
 
         QVERIFY(!server.isListening());
         QCOMPARE(server.maxPendingConnections(), 1);
@@ -122,7 +122,7 @@ void tst_QL2capServer::tst_listen()
     QFETCH(quint16, port);
 
     {
-        QL2capServer server;
+        QBluetoothServer server(QBluetoothServer::L2capServer);
 
         bool result = server.listen(address, port);
 
@@ -169,7 +169,7 @@ void tst_QL2capServer::tst_pendingConnections()
     QFETCH(int, maxConnections);
 
     {
-        QL2capServer server;
+        QBluetoothServer server(QBluetoothServer::L2capServer);
 
         server.setMaxPendingConnections(maxConnections);
 
@@ -235,7 +235,7 @@ void tst_QL2capServer::tst_receive()
 {
     QFETCH(QByteArray, expected);
 
-    QL2capServer server;
+    QBluetoothServer server(QBluetoothServer::L2capServer);
 
     bool result = server.listen();
 
@@ -273,7 +273,7 @@ void tst_QL2capServer::tst_receive()
 
 void tst_QL2capServer::tst_secureFlags()
 {
-    QL2capServer server;
+    QBluetoothServer server(QBluetoothServer::L2capServer);
     QCOMPARE(server.securityFlags(), QBluetooth::NoSecurity);
 
     server.setSecurityFlags(QBluetooth::Encryption);
diff --git a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp b/tests/auto/qrfcommserver/tst_qrfcommserver.cpp
index 4c70bd61..57cee4d3 100644
--- a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp
+++ b/tests/auto/qrfcommserver/tst_qrfcommserver.cpp
@@ -43,7 +43,7 @@
 
 #include <QDebug>
 
-#include <qrfcommserver.h>
+#include <qbluetoothserver.h>
 #include <qbluetoothsocket.h>
 #include <qbluetoothlocaldevice.h>
 
@@ -118,7 +118,7 @@ void tst_QRfcommServer::initTestCase()
 void tst_QRfcommServer::tst_construction()
 {
     {
-        QRfcommServer server;
+        QBluetoothServer server(QBluetoothServer::RfcommServer);
 
         QVERIFY(!server.isListening());
         QCOMPARE(server.maxPendingConnections(), 1);
@@ -146,7 +146,7 @@ void tst_QRfcommServer::tst_listen()
     QFETCH(quint16, port);
 
     {
-        QRfcommServer server;
+        QBluetoothServer server(QBluetoothServer::RfcommServer);
         qDebug() << "tst_listen() address=" << address.toString() << "port=" << port;
         bool result = server.listen(address, port);
         QTest::qWait(1000);
@@ -193,7 +193,7 @@ void tst_QRfcommServer::tst_pendingConnections()
 {
     QFETCH(int, maxConnections);
 
-    QRfcommServer server;
+    QBluetoothServer server(QBluetoothServer::RfcommServer);
     QBluetoothLocalDevice localDev;
 
     QBluetoothAddress address = localDev.address();
@@ -258,7 +258,7 @@ void tst_QRfcommServer::tst_receive()
 {
     QFETCH(QByteArray, expected);
 
-    QRfcommServer server;
+    QBluetoothServer server(QBluetoothServer::RfcommServer);
     QBluetoothLocalDevice localDev;
 
     QBluetoothAddress address = localDev.address();
@@ -302,7 +302,7 @@ void tst_QRfcommServer::tst_receive()
 
 void tst_QRfcommServer::tst_secureFlags()
 {
-    QRfcommServer server;
+    QBluetoothServer server(QBluetoothServer::RfcommServer);
 
     server.setSecurityFlags(QBluetooth::NoSecurity);
     QCOMPARE(server.securityFlags(), QBluetooth::NoSecurity);