QBluetoothServer - cleanup and de-duplicate code

Some code can be re-used from the shared public implementation.
*_osx_p.h is not needed either.

Task-number: QTBUG-75348
Change-Id: If373b74edebe9a9db90e820016cf779a1726baed
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

2 files changed, 10 insertions, 28 deletions

diff --git a/src/bluetooth/osx/osxbtsocketlistener.mm b/src/bluetooth/osx/osxbtsocketlistener.mm
index 517b7f2d..10526b0f 100644
--- a/src/bluetooth/osx/osxbtsocketlistener.mm
+++ b/src/bluetooth/osx/osxbtsocketlistener.mm
@@ -39,31 +39,20 @@
 
 #include "osxbtsocketlistener_p.h"
 #include "osxbtutility_p.h"
+#include "btdelegates_p.h"
 
 #include <QtCore/qdebug.h>
 
-QT_BEGIN_NAMESPACE
-
-namespace OSXBluetooth {
-
-SocketListener::~SocketListener()
-{
-}
-
-}
-
-QT_END_NAMESPACE
-
 QT_USE_NAMESPACE
 
 @implementation QT_MANGLE_NAMESPACE(OSXBTSocketListener)
 {
     IOBluetoothUserNotification *connectionNotification;
-    QT_PREPEND_NAMESPACE(OSXBluetooth::SocketListener) *delegate;
+    QT_PREPEND_NAMESPACE(DarwinBluetooth::SocketListener) *delegate;
     quint16 port;
 }
 
-- (id)initWithListener:(OSXBluetooth::SocketListener *)aDelegate
+- (id)initWithListener:(DarwinBluetooth::SocketListener *)aDelegate
 {
     Q_ASSERT_X(aDelegate, Q_FUNC_INFO, "invalid delegate (null)");
     if (self = [super init]) {
@@ -119,7 +108,7 @@ QT_USE_NAMESPACE
     Q_UNUSED(notification)
 
     Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid delegate (null)");
-    delegate->openNotify(newChannel);
+    delegate->openNotifyRFCOMM(newChannel);
 }
 
 - (void)l2capOpenNotification:(IOBluetoothUserNotification *)notification
@@ -128,7 +117,7 @@ QT_USE_NAMESPACE
     Q_UNUSED(notification)
 
     Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid delegate (null)");
-    delegate->openNotify(newChannel);
+    delegate->openNotifyL2CAP(newChannel);
 }
 
 - (quint16)port
diff --git a/src/bluetooth/osx/osxbtsocketlistener_p.h b/src/bluetooth/osx/osxbtsocketlistener_p.h
index cac0b7c4..3bbce24e 100644
--- a/src/bluetooth/osx/osxbtsocketlistener_p.h
+++ b/src/bluetooth/osx/osxbtsocketlistener_p.h
@@ -57,22 +57,15 @@
 
 #include <Foundation/Foundation.h>
 
+// TODO: use the special macros we have to create an
+// alias for a mangled name.
 @class QT_MANGLE_NAMESPACE(OSXBTSocketListener);
 
 QT_BEGIN_NAMESPACE
 
-namespace OSXBluetooth {
+namespace DarwinBluetooth {
 
-class SocketListener
-{
-public:
-    typedef QT_MANGLE_NAMESPACE(OSXBTSocketListener) ObjCListener;
-
-    virtual ~SocketListener();
-
-    virtual void openNotify(IOBluetoothRFCOMMChannel *channel) = 0;
-    virtual void openNotify(IOBluetoothL2CAPChannel *channel) = 0;
-};
+class SocketListener;
 
 }
 
@@ -83,7 +76,7 @@ QT_END_NAMESPACE
 
 @interface QT_MANGLE_NAMESPACE(OSXBTSocketListener) : NSObject
 
-- (id)initWithListener:(QT_PREPEND_NAMESPACE(OSXBluetooth::SocketListener) *)aDelegate;
+- (id)initWithListener:(QT_PREPEND_NAMESPACE(DarwinBluetooth::SocketListener) *)aDelegate;
 - (void)dealloc;
 
 - (bool)listenRFCOMMConnectionsWithChannelID:(BluetoothRFCOMMChannelID)channelID;