QDeclarativeDebug: Move networking code out of QDeclarativeDebugServer

Move socket handling code out of QDeclarativeDebugServer into a
QDeclarativeDebugServer(Tcp)Connection class.

Reviewed-by: Christiaan Janssen

1 files changed, 6 insertions, 7 deletions

diff --git a/src/declarative/debugger/qdeclarativedebugserver_p.h b/src/declarative/debugger/qdeclarativedebugserver_p.h
index 6840d63..93ab10b 100644
--- a/src/declarative/debugger/qdeclarativedebugserver_p.h
+++ b/src/declarative/debugger/qdeclarativedebugserver_p.h
@@ -43,6 +43,7 @@
 #define QDECLARATIVEDEBUGSERVER_H
 
 #include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativedebugserverconnection_p.h>
 
 QT_BEGIN_HEADER
 
@@ -60,8 +61,9 @@ class QDeclarativeDebugServer : public QObject
     Q_DISABLE_COPY(QDeclarativeDebugServer)
 public:
     static QDeclarativeDebugServer *instance();
-    void listen();
-    void waitForConnection();
+
+    void setConnection(QDeclarativeDebugServerConnection *connection);
+
     bool hasDebuggingClient() const;
 
     QList<QDeclarativeDebugService*> services() const;
@@ -71,15 +73,12 @@ public:
     bool removeService(QDeclarativeDebugService *service);
 
     void sendMessage(QDeclarativeDebugService *service, const QByteArray &message);
-
-private Q_SLOTS:
-    void readyRead();
-    void newConnection();
+    void receiveMessage(const QByteArray &message);
 
 private:
     friend class QDeclarativeDebugService;
     friend class QDeclarativeDebugServicePrivate;
-    QDeclarativeDebugServer(int);
+    QDeclarativeDebugServer();
 };
 
 QT_END_NAMESPACE