Added getNetworkId(UserId user, const QString &network) to make the transition to...

[quassel.git] / src / core / core.h

diff --git a/src/core/core.h b/src/core/core.h
index 15a2e90..5e73b7c 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -26,7 +26,7 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 
 #include <QTcpServer>
 #include <QTcpSocket>
 

-#include "coreproxy.h"
+#include "global.h"

 
 class CoreSession;
 class Storage;
 
 class CoreSession;
 class Storage;


@@ -46,13 +46,11 @@ class Core : public QObject {
     static void disconnectLocalClient();
 
   private slots:
     static void disconnectLocalClient();
 
   private slots:

-    void recvProxySignal(CoreSignal, QVariant, QVariant, QVariant);

     bool startListening(uint port = DEFAULT_PORT);
     void stopListening();
     void incomingConnection();
     void clientHasData();
     void clientDisconnected();
     bool startListening(uint port = DEFAULT_PORT);
     void stopListening();
     void incomingConnection();
     void clientHasData();
     void clientDisconnected();

-    void updateGlobalData(UserId, QString);

 
   private:
     Core();
 
   private:
     Core();


@@ -68,14 +66,12 @@ class Core : public QObject {
      */
     QVariant initSession(UserId userId);
     void processClientInit(QTcpSocket *socket, const QVariant &v);
      */
     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
 
     UserId guiUser;
     QHash<UserId, CoreSession *> sessions;
     Storage *storage;
 
     QTcpServer server; // TODO: implement SSL

-    QHash<QTcpSocket *, UserId> validClients;

     QHash<QTcpSocket *, quint32> blockSizes;
 };
 
     QHash<QTcpSocket *, quint32> blockSizes;
 };