Rename QBluetoothSocketBasePrivate::connectToService()

The goal is to move the various QBluetoothSocket::connectoService()
implementations into the private classes. Common parts can be split into
QBluetoothSocketBasePrivate and the platform specific code. The code
becomes cleaner and has less ifdefs.

However this creates a symbol clash with the currently existing private
implementation as it has a function with the same signature but different
purpose. This rename provides the foundation for future changes.

Task-number: QTBUG-68550
Change-Id: I121f08d93e00790c1619c0449629f47bca8a964d
Reviewed-by: Lubomir I. Ivanov <neolit123@gmail.com>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

12 files changed, 23 insertions, 23 deletions

diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index 9516a0c4..1849844e 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -367,7 +367,7 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op
         setSocketError(QBluetoothSocket::UnsupportedProtocolError);
         return;
     }
-    d->connectToService(service.device().address(), service.serviceUuid(), openMode);
+    d->connectToServiceHelper(service.device().address(), service.serviceUuid(), openMode);
 #else
 #if defined(QT_WINRT_BLUETOOTH)
     // Report these problems early:
@@ -391,14 +391,14 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op
             setSocketError(UnknownSocketError);
             return;
         }
-        d->connectToService(service.device().address(), service.protocolServiceMultiplexer(), openMode);
+        d->connectToServiceHelper(service.device().address(), service.protocolServiceMultiplexer(), openMode);
     } else if (service.serverChannel() > 0) {
         if (!d->ensureNativeSocket(QBluetoothServiceInfo::RfcommProtocol)) {
             d->errorString = tr("Unknown socket error");
             setSocketError(UnknownSocketError);
             return;
         }
-        d->connectToService(service.device().address(), service.serverChannel(), openMode);
+        d->connectToServiceHelper(service.device().address(), service.serverChannel(), openMode);
     } else {
         // try doing service discovery to see if we can find the socket
         if (service.serviceUuid().isNull()
@@ -460,7 +460,7 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const
         setSocketError(QBluetoothSocket::UnsupportedProtocolError);
         return;
     }
-    d->connectToService(address, uuid, openMode);
+    d->connectToServiceHelper(address, uuid, openMode);
 #else
 #if defined(QT_WINRT_BLUETOOTH)
     // Report these problems early, prevent device discovery:
@@ -539,7 +539,7 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, quint1
     }
 
     setOpenMode(openMode);
-    d->connectToService(address, port, openMode);
+    d->connectToServiceHelper(address, port, openMode);
 #endif
 }
 
diff --git a/src/bluetooth/qbluetoothsocket_android.cpp b/src/bluetooth/qbluetoothsocket_android.cpp
index 42fe4ff4..109d3141 100644
--- a/src/bluetooth/qbluetoothsocket_android.cpp
+++ b/src/bluetooth/qbluetoothsocket_android.cpp
@@ -403,31 +403,31 @@ bool QBluetoothSocketPrivateAndroid::fallBackReversedConnect(const QBluetoothUui
 }
 
 /*
- * The call order during a connectToService() is as follows:
+ * The call order during a connectToServiceHelper() is as follows:
  *
- * 1. call connectToService()
+ * 1. call connectToServiceHelper()
  * 2. wait for execution of SocketConnectThread::run()
  * 3. if threaded connect succeeds call socketConnectSuccess() via signals
  *      -> done
  * 4. if threaded connect fails call defaultSocketConnectFailed() via signals
  * 5. call fallBackConnect() if Android version 22 or below
- *     -> Android 23+ complete failure of entire connectToService()
+ *     -> Android 23+ complete failure of entire connectToServiceHelper()
  * 6. call fallBackReversedConnect() if Android version 23 or above
- *     -> if failure entire connectToService() fails
+ *     -> if failure entire connectToServiceHelper() fails
  * 7. if threaded connect on one of above fallbacks succeeds call socketConnectSuccess()
  *    via signals
  *      -> done
  * 8. if threaded connect on fallback channel fails call fallbackSocketConnectFailed()
- *      -> complete failure of entire connectToService()
+ *      -> complete failure of entire connectToServiceHelper()
  * */
-void QBluetoothSocketPrivateAndroid::connectToService(const QBluetoothAddress &address,
+void QBluetoothSocketPrivateAndroid::connectToServiceHelper(const QBluetoothAddress &address,
                                                const QBluetoothUuid &uuid,
                                                QIODevice::OpenMode openMode)
 {
     Q_Q(QBluetoothSocket);
     Q_UNUSED(openMode);
 
-    qCDebug(QT_BT_ANDROID) << "connectToService()" << address.toString() << uuid.toString();
+    qCDebug(QT_BT_ANDROID) << "connectToServiceHelper()" << address.toString() << uuid.toString();
 
     q->setSocketState(QBluetoothSocket::ConnectingState);
 
diff --git a/src/bluetooth/qbluetoothsocket_android_p.h b/src/bluetooth/qbluetoothsocket_android_p.h
index 34fd260a..893b5fe3 100644
--- a/src/bluetooth/qbluetoothsocket_android_p.h
+++ b/src/bluetooth/qbluetoothsocket_android_p.h
@@ -71,7 +71,7 @@ public:
     ~QBluetoothSocketPrivateAndroid();
 
     //On Android we connect using the uuid not the port
-    void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
+    void connectToServiceHelper(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
                           QIODevice::OpenMode openMode);
 
     bool fallBackConnect(QAndroidJniObject uuid, int channel);
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp
index 10c31e71..0e5181f2 100644
--- a/src/bluetooth/qbluetoothsocket_bluez.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluez.cpp
@@ -121,7 +121,7 @@ bool QBluetoothSocketPrivateBluez::ensureNativeSocket(QBluetoothServiceInfo::Pro
     return true;
 }
 
-void QBluetoothSocketPrivateBluez::connectToService(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
+void QBluetoothSocketPrivateBluez::connectToServiceHelper(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
 {
     Q_Q(QBluetoothSocket);
     int result = -1;
diff --git a/src/bluetooth/qbluetoothsocket_bluez_p.h b/src/bluetooth/qbluetoothsocket_bluez_p.h
index b356ac7b..3d178f85 100644
--- a/src/bluetooth/qbluetoothsocket_bluez_p.h
+++ b/src/bluetooth/qbluetoothsocket_bluez_p.h
@@ -63,7 +63,7 @@ public:
     QBluetoothSocketPrivateBluez();
     ~QBluetoothSocketPrivateBluez();
 
-    void connectToService(const QBluetoothAddress &address,
+    void connectToServiceHelper(const QBluetoothAddress &address,
                           quint16 port,
                           QIODevice::OpenMode openMode);
 
diff --git a/src/bluetooth/qbluetoothsocket_bluezdbus.cpp b/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
index 2dbbd425..17408a9f 100644
--- a/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
@@ -56,7 +56,7 @@ bool QBluetoothSocketPrivateBluezDBus::ensureNativeSocket(QBluetoothServiceInfo:
     return false;
 }
 
-void QBluetoothSocketPrivateBluezDBus::connectToService(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
+void QBluetoothSocketPrivateBluezDBus::connectToServiceHelper(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
 {
     Q_UNUSED(openMode);
     Q_UNUSED(address);
diff --git a/src/bluetooth/qbluetoothsocket_bluezdbus_p.h b/src/bluetooth/qbluetoothsocket_bluezdbus_p.h
index 74af8bbe..6a91d25b 100644
--- a/src/bluetooth/qbluetoothsocket_bluezdbus_p.h
+++ b/src/bluetooth/qbluetoothsocket_bluezdbus_p.h
@@ -63,7 +63,7 @@ public:
     QBluetoothSocketPrivateBluezDBus();
     ~QBluetoothSocketPrivateBluezDBus();
 
-    void connectToService(const QBluetoothAddress &address,
+    void connectToServiceHelper(const QBluetoothAddress &address,
                           quint16 port,
                           QIODevice::OpenMode openMode);
 
diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp
index 82359ac9..6781b793 100644
--- a/src/bluetooth/qbluetoothsocket_p.cpp
+++ b/src/bluetooth/qbluetoothsocket_p.cpp
@@ -63,7 +63,7 @@ bool QBluetoothSocketPrivateDummy::ensureNativeSocket(QBluetoothServiceInfo::Pro
     return false;
 }
 
-void QBluetoothSocketPrivateDummy::connectToService(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
+void QBluetoothSocketPrivateDummy::connectToServiceHelper(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
 {
     Q_UNUSED(openMode);
     Q_UNUSED(address);
diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h
index f01467a8..81e540b7 100644
--- a/src/bluetooth/qbluetoothsocket_p.h
+++ b/src/bluetooth/qbluetoothsocket_p.h
@@ -66,7 +66,7 @@ public:
     QBluetoothSocketPrivateDummy();
     ~QBluetoothSocketPrivateDummy();
 
-    void connectToService(const QBluetoothAddress &address,
+    void connectToServiceHelper(const QBluetoothAddress &address,
                           quint16 port,
                           QIODevice::OpenMode openMode);
     bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type);
diff --git a/src/bluetooth/qbluetoothsocket_winrt.cpp b/src/bluetooth/qbluetoothsocket_winrt.cpp
index 46b46c4e..23d6d509 100644
--- a/src/bluetooth/qbluetoothsocket_winrt.cpp
+++ b/src/bluetooth/qbluetoothsocket_winrt.cpp
@@ -357,7 +357,7 @@ bool QBluetoothSocketPrivateWinRT::ensureNativeSocket(QBluetoothServiceInfo::Pro
     return true;
 }
 
-void QBluetoothSocketPrivateWinRT::connectToService(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
+void QBluetoothSocketPrivateWinRT::connectToServiceHelper(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
 {
     Q_Q(QBluetoothSocket);
     Q_UNUSED(openMode);
diff --git a/src/bluetooth/qbluetoothsocket_winrt_p.h b/src/bluetooth/qbluetoothsocket_winrt_p.h
index a6597009..76c2ded9 100644
--- a/src/bluetooth/qbluetoothsocket_winrt_p.h
+++ b/src/bluetooth/qbluetoothsocket_winrt_p.h
@@ -68,7 +68,7 @@ public:
     QBluetoothSocketPrivateWinRT();
     ~QBluetoothSocketPrivateWinRT();
 
-    void connectToService(const QBluetoothAddress &address,
+    void connectToServiceHelper(const QBluetoothAddress &address,
                           quint16 port,
                           QIODevice::OpenMode openMode);
     bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type);
diff --git a/src/bluetooth/qbluetoothsocketbase_p.h b/src/bluetooth/qbluetoothsocketbase_p.h
index c393c940..c223350d 100644
--- a/src/bluetooth/qbluetoothsocketbase_p.h
+++ b/src/bluetooth/qbluetoothsocketbase_p.h
@@ -123,10 +123,10 @@ public:
                              QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) = 0;
 
 #if defined(QT_ANDROID_BLUETOOTH)
-    virtual void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
+    virtual void connectToServiceHelper(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
                           QIODevice::OpenMode openMode) = 0;
 #else
-    virtual void connectToService(const QBluetoothAddress &address, quint16 port,
+    virtual void connectToServiceHelper(const QBluetoothAddress &address, quint16 port,
                                   QIODevice::OpenMode openMode) = 0;
 #endif