1 files changed, 8 insertions, 15 deletions
diff --git a/src/connectivity/bluetooth/ql2capserver_p.h b/src/connectivity/bluetooth/ql2capserver_p.h
index c073af649e..b5e76d95f2 100644
--- a/src/connectivity/bluetooth/ql2capserver_p.h
+++ b/src/connectivity/bluetooth/ql2capserver_p.h
@@ -43,6 +43,7 @@
 #define QL2CAPSERVER_P_H
 
 #include <qmobilityglobal.h>
+#include <qbluetoothsocket.h>
 
 #ifdef QTM_SYMBIAN_BLUETOOTH
 #include <es_sock.h>
@@ -67,10 +68,6 @@ class QBluetoothSocketPrivate;
 class QL2capServer;
 
 class QL2capServerPrivate
-#ifdef QTM_SYMBIAN_BLUETOOTH
-: public MBluetoothSocketNotifier
-#endif //QTM_SYMBIAN_BLUETOOTH
-
 {
     Q_DECLARE_PUBLIC(QL2capServer)
 
@@ -78,20 +75,17 @@ public:
     QL2capServerPrivate();
     ~QL2capServerPrivate();
 
+#ifdef QTM_SYMBIAN_BLUETOOTH
+    // private slots
+    void _q_connected();
+    void _q_socketError(QBluetoothSocket::SocketError err);
+    void _q_disconnected();
+#endif //QTM_SYMBIAN_BLUETOOTH
+    
 #ifndef QT_NO_DBUS
     void _q_newConnection();
 #endif
 
-#ifdef QTM_SYMBIAN_BLUETOOTH
-    /* MBluetoothSocketNotifier virtual functions */
-    void HandleAcceptCompleteL(TInt aErr);
-    void HandleActivateBasebandEventNotifierCompleteL(TInt aErr, TBTBasebandEventNotification &aEventNotification);
-    void HandleConnectCompleteL(TInt aErr);
-    void HandleIoctlCompleteL(TInt aErr);
-    void HandleReceiveCompleteL(TInt aErr);
-    void HandleSendCompleteL(TInt aErr);
-    void HandleShutdownCompleteL(TInt aErr);
-#endif //QTM_SYMBIAN_BLUETOOTH
 
 public:
     QBluetoothSocket *socket;
@@ -101,7 +95,6 @@ public:
     QBluetooth::SecurityFlags securityFlags;
 
 #ifdef QTM_SYMBIAN_BLUETOOTH
-    QBluetoothSocket *pendingSocket;
     mutable QList<QBluetoothSocket *> activeSockets;
     QBluetoothSocketPrivate *ds;
 #endif //QTM_SYMBIAN_BLUETOOTH