Big, big, major commit this time:

[quassel.git] / core / core.h

diff --git a/core/core.h b/core/core.h
index 4220056..46258ae 100644 (file)
--- a/core/core.h
+++ b/core/core.h
@@ -25,17 +25,37 @@
 #include <QString>
 #include <QVariant>
 
-typedef QMap<QString, QVariant> VarMap;
+#include "server.h"
 
-class Core {
+class Core : public QObject {
+  Q_OBJECT
 
   public:
-    static void init();
-    static VarMap loadNetworks();
-    static void storeNetworks(VarMap);
-    static VarMap loadIdentities();
-    static void storeIdentities(VarMap);
+
+    Core();
+    void init();
+    VarMap loadNetworks();
+    void storeNetworks(VarMap);
+    VarMap loadIdentities();
+    void storeIdentities(VarMap);
+
+  public slots:
+    void inputLine(QString);   // temp
+    void connectToIrc(const QString &, quint16 port = 6667);
+
+  signals:
+    void outputLine(const QString &);  // temp
+
+  private slots:
+    void globalDataUpdated(QString);
+
+  private:
+    //void run();
+
+    Server server; // temp
 
 };
 
+extern Core *core;
+
 #endif