Make QBluetoothSocket's _q_writeNotify & _q_readNotify private

These two functions are really only needed by Linux style socket code.
There is no need for other platforms to implement them as dummy too.
It simplifies the code somewhat.

Change-Id: I3e0aced8d9f7b590d1c6aaa60f97bd060ee8f4b4
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

1 files changed, 7 insertions, 12 deletions

diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h
index 70289e79..8214d2b5 100644
--- a/src/bluetooth/qbluetoothsocket_p.h
+++ b/src/bluetooth/qbluetoothsocket_p.h
@@ -70,14 +70,9 @@ public:
 class QBluetoothSocket;
 class QBluetoothServiceDiscoveryAgent;
 
-class QBluetoothSocketPrivate
-#if defined(QT_QNX_BLUETOOTH) || defined(QT_ANDROID_BLUETOOTH)
-: public QObject
+class QBluetoothSocketPrivate : public QObject
 {
     Q_OBJECT
-#else
-{
-#endif
     Q_DECLARE_PUBLIC(QBluetoothSocket)
     friend class QBluetoothServerPrivate;
 
@@ -147,12 +142,6 @@ public:
 //    qint64 rxOffset;
     QString errorString;
 
-    // private slots
-    void _q_readNotify();
-    void _q_writeNotify();
-    void _q_serviceDiscovered(const QBluetoothServiceInfo &service);
-    void _q_discoveryFinished();
-
 #ifdef QT_ANDROID_BLUETOOTH
     QAndroidJniObject adapter;
     QAndroidJniObject socketObject;
@@ -166,6 +155,12 @@ private slots:
 
 #endif
 
+#if defined(QT_QNX_BLUETOOTH) || defined(QT_BLUEZ_BLUETOOTH)
+private slots:
+    void _q_readNotify();
+    void _q_writeNotify();
+#endif
+
 protected:
     QBluetoothSocket *q_ptr;