Some cosmetic corrections and some minor work on the nick model. Hopefully I

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

diff --git a/src/core/core.h b/src/core/core.h
index 5e73b7c..ae1c05c 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -27,6 +27,7 @@
 #include <QTcpSocket>
 
 #include "global.h"
+#include "types.h"
 
 class CoreSession;
 class Storage;
@@ -52,12 +53,14 @@ class Core : public QObject {
     void clientHasData();
     void clientDisconnected();
 
+    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.
@@ -65,7 +68,10 @@ 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 processClientInit(QTcpSocket *socket, const QVariantMap &msg);
+    void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
+    
+    QStringList availableStorageProviders();
 
     UserId guiUser;
     QHash<UserId, CoreSession *> sessions;
@@ -73,6 +79,8 @@ class Core : public QObject {
 
     QTcpServer server; // TODO: implement SSL
     QHash<QTcpSocket *, quint32> blockSizes;
+    
+    bool configured;
 };
 
 #endif