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 23ba3c6..6b7a0ae 100644 (file)
--- a/core/core.h
+++ b/core/core.h
@@ -36,14 +36,12 @@ class Core : public QObject {
     //~Core();
 
   public slots:
-    void inputLine(QString);   // temp
     void connectToIrc(QStringList);
 
   signals:
-    void outputLine(const QString &);  // temp
     void msgFromGUI(QString network, QString channel, QString message);
-    void sendMessage(QString network, QString channel, QString message);
-    void sendStatusMsg(QString, QString);
+    void displayMsg(QString network, QString channel, Message message);
+    void displayStatusMsg(QString, QString);
 
     void connectToIrc(QString net);
     void disconnectFromIrc(QString net);
@@ -51,7 +49,7 @@ class Core : public QObject {
   private slots:
     void globalDataUpdated(QString);
     void recvStatusMsgFromServer(QString msg);
-    void recvMessageFromServer(QString buffer, QString msg);
+    void recvMessageFromServer(QString buffer, Message msg);
 
   private:
     QHash<QString, Server *> servers;