Big, big, major commit this time:

[quassel.git] / core / core.h

diff --git a/core/core.h b/core/core.h
index f9cd9f1..46258ae 100644 (file)
--- a/core/core.h
+++ b/core/core.h
@@ -27,26 +27,30 @@
 
 #include "server.h"
 
-class Core : public QThread {
+class Core : public QObject {
   Q_OBJECT
 
   public:
 
-    static Core * 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(const QString &);   // temp
+    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();
+    //void run();
 
     Server server; // temp