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

diff --git a/src/core/core.h b/src/core/core.h
index 374d8210..602f7bf4 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,23 +43,23 @@ 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);
+
+    bool initStorageSqlite(QVariantMap dbSettings, bool setup);
 
   private:
     Core();
     ~Core();
     void init();
     static Core *instanceptr;
-
+    
     //! Initiate a session for the user with the given credentials if one does not already exist.
     /** This function is called during the init process for a new client. If there is no session for the
      *  given user, one is created.
@@ -67,16 +67,19 @@ class Core : public QObject {
      * \return A QVariant containing the session data, e.g. global data and buffers
      */
     QVariant initSession(UserId userId);
-    void processClientInit(QTcpSocket *socket, const QVariant &v);
-    void processClientUpdate(QTcpSocket *socket, QString key, const QVariant &data);
+    void processClientInit(QTcpSocket *socket, const QVariantMap &msg);
+    void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
+    
+    QStringList availableStorageProviders();
 
     UserId guiUser;
     QHash<UserId, CoreSession *> sessions;
     Storage *storage;
 
     QTcpServer server; // TODO: implement SSL
-    QHash<QTcpSocket *, UserId> validClients;
     QHash<QTcpSocket *, quint32> blockSizes;
+    
+    bool configured;
 };
 
 #endif