X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=5e73b7c8c1c48d3560b4f8acf94dadacb11f709c;hp=374d821021f18ca5226e786222122021633e80d9;hb=c7ad7451b1e899ba0de2ded9ac08359dff5cca61;hpb=0ac9ce4d7cf768d13993d6aa1d6b791c4149a843

diff --git a/src/core/core.h b/src/core/core.h
index 374d8210..5e73b7c8 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -26,7 +26,7 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 
-#include "coreproxy.h"
+#include "global.h"
 
 class CoreSession;
 class Storage;
@@ -43,16 +43,14 @@ class Core : public QObject {
     static CoreSession * createSession(UserId);
 
     static QVariant connectLocalClient(QString user, QString passwd);
-    static QVariant disconnectLocalClient();
+    static void disconnectLocalClient();
 
   private slots:
-    void recvProxySignal(CoreSignal, QVariant, QVariant, QVariant);
-    bool startListening(uint port = 4242);
+    bool startListening(uint port = DEFAULT_PORT);
     void stopListening();
     void incomingConnection();
     void clientHasData();
     void clientDisconnected();
-    void updateGlobalData(UserId, QString);
 
   private:
     Core();
@@ -68,14 +66,12 @@ class Core : public QObject {
      */
     QVariant initSession(UserId userId);
     void processClientInit(QTcpSocket *socket, const QVariant &v);
-    void processClientUpdate(QTcpSocket *socket, QString key, const QVariant &data);
 
     UserId guiUser;
     QHash<UserId, CoreSession *> sessions;
     Storage *storage;
 
     QTcpServer server; // TODO: implement SSL
-    QHash<QTcpSocket *, UserId> validClients;
     QHash<QTcpSocket *, quint32> blockSizes;
 };