X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=core%2Fcore.h;h=a90a8f6f5afd615e3016375eb6b4ab9ae375a29c;hb=c66cfafe5dfa8ccdb830e1ae412e7b51cbcdd184;hp=46258ae612f40b11b56bfeba8b4807d644774d26;hpb=04e21ce26ebabdde9586ca9d2a3168431e448df5;p=quassel.git diff --git a/core/core.h b/core/core.h index 46258ae6..a90a8f6f 100644 --- a/core/core.h +++ b/core/core.h @@ -24,8 +24,12 @@ #include #include #include +#include #include "server.h" +#include "backlog.h" +#include "storage.h" +#include "global.h" class Core : public QObject { Q_OBJECT @@ -33,26 +37,37 @@ class Core : public QObject { public: Core(); - void init(); - VarMap loadNetworks(); - void storeNetworks(VarMap); - VarMap loadIdentities(); - void storeIdentities(VarMap); + ~Core(); + QList getBuffers(); public slots: - void inputLine(QString); // temp - void connectToIrc(const QString &, quint16 port = 6667); + void connectToIrc(QStringList); + void sendBacklog(BufferId, QVariant, QVariant); + void msgFromGUI(BufferId, QString message); signals: - void outputLine(const QString &); // temp + void msgFromGUI(QString net, QString buf, QString message); + void displayMsg(Message message); + void displayStatusMsg(QString, QString); + + void connectToIrc(QString net); + void disconnectFromIrc(QString net); + void serverStateRequested(); + + void backlogData(BufferId, QList, bool done); + + void bufferIdUpdated(BufferId); private slots: void globalDataUpdated(QString); + void recvStatusMsgFromServer(QString msg); + void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None); + void serverDisconnected(QString net); private: - //void run(); - - Server server; // temp + Storage *storage; + QHash servers; + UserId user; };