X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcore.h;h=6b7a0aec2cf3c36af8aad56ad078127b989e8138;hp=23ba3c6f7bc6ba5ffb7ff96eb4f809589b7b56d7;hb=057883f768f86257c9dbefeb5ef12403b207b773;hpb=82403b8a8777d44cbc35619e3bbd4feabfad5dc4 diff --git a/core/core.h b/core/core.h index 23ba3c6f..6b7a0aec 100644 --- 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 servers;