--- a/smf/smfservermodule/smfserver/server/smfserverqt_p.h	Fri May 21 16:50:44 2010 +0100
+++ b/smf/smfservermodule/smfserver/server/smfserverqt_p.h	Mon Jun 07 11:43:45 2010 +0100
@@ -23,6 +23,7 @@
 #include "smfglobal.h"
 
 #include <QObject>
+class SmfServer;
 class QLocalServer;
 class QLocalSocket;
 
@@ -31,9 +32,11 @@
     Q_OBJECT
 
 public:
-    SmfServerQt();
+    SmfServerQt(SmfServer* wrapper);
     ~SmfServerQt();
 
+    inline SmfServer *wrapper() const;
+
     bool start();
     int sessionListCount() const;
     void writeLog(QString log) const;
@@ -45,27 +48,15 @@
     void removeFromList();
 
 private:
+    SmfServer *m_generic;
     QLocalServer *m_server;
-    QLocalSocket *m_client;
+    QList<SmfServerQtSession*> m_sessions;
 };
 
-class SmfServerQtSession : public QObject
+inline SmfServer *SmfServerQt::wrapper() const
 {
-    Q_OBJECT
-
-public:
-    SmfServerQtSession(QLocalSocket *clientConnection, SmfServerQt *server);
-    ~SmfServerQtSession();
+    return m_generic;
+}
 
-    void clientAuthorizationFinished(bool success);
-
-public slots:
-    void readDataFromClient();
-    
-private:
-    SmfServerQt *m_server;
-    QLocalSocket *m_clientConnection;
-
-};
 
 #endif // SMFSERVERQT_P_H