Lots of additions again. Working on implementing commands and prettifying the output.

[quassel.git] / core / core.h

diff --git a/core/core.h b/core/core.h
index f9cd9f1..6b7a0ae 100644 (file)
--- a/core/core.h
+++ b/core/core.h
@@ -27,28 +27,32 @@
 
 #include "server.h"
 
 
 #include "server.h"
 

-class Core : public QThread {
+class Core : public QObject {

   Q_OBJECT
 
   public:
 
   Q_OBJECT
 
   public:
 

-    static Core * init();
-    static VarMap loadNetworks();
-    static void storeNetworks(VarMap);
-    static VarMap loadIdentities();
-    static void storeIdentities(VarMap);
+    Core();
+    //~Core();

 
   public slots:
 
   public slots:

-    void inputLine(const QString &);   // temp
-    void connectToIrc(const QString &, quint16 port = 6667);
+    void connectToIrc(QStringList);

 
   signals:
 
   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;

 
 };
 
 
 };