X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcore.h;h=6b7a0aec2cf3c36af8aad56ad078127b989e8138;hp=f9cd9f167642a760f7a91ff5af4b2adeeba7b4eb;hb=057883f768f86257c9dbefeb5ef12403b207b773;hpb=e368a1672c4f917bfa6adb52dae3b5ebfcd0db18;ds=sidebyside

diff --git a/core/core.h b/core/core.h
index f9cd9f16..6b7a0aec 100644
--- a/core/core.h
+++ b/core/core.h
@@ -27,28 +27,32 @@
 
 #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();
+    //~Core();
 
   public slots:
-    void inputLine(const QString &);   // temp
-    void connectToIrc(const QString &, quint16 port = 6667);
+    void connectToIrc(QStringList);
 
   signals:
-    void outputLine(const QString &);  // temp
-    
-  private:
-    void run();
+    void msgFromGUI(QString network, QString channel, QString message);
+    void displayMsg(QString network, QString channel, Message message);
+    void displayStatusMsg(QString, QString);
+
+    void connectToIrc(QString net);
+    void disconnectFromIrc(QString net);
 
-    Server server; // temp
+  private slots:
+    void globalDataUpdated(QString);
+    void recvStatusMsgFromServer(QString msg);
+    void recvMessageFromServer(QString buffer, Message msg);
+
+  private:
+    QHash<QString, Server *> servers;
 
 };