Renamed NetworkView[Widget] to BufferView[Widget].

[quassel.git] / core / core.h

diff --git a/core/core.h b/core/core.h
index 23ba3c6..a90a8f6 100644 (file)
--- a/core/core.h
+++ b/core/core.h
@@ -24,8 +24,12 @@
 #include <QMap>
 #include <QString>
 #include <QVariant>
+#include <QSqlDatabase>
 
 #include "server.h"
+#include "backlog.h"
+#include "storage.h"
+#include "global.h"
 
 class Core : public QObject {
   Q_OBJECT
@@ -33,28 +37,37 @@ class Core : public QObject {
   public:
 
     Core();
-    //~Core();
+    ~Core();
+    QList<BufferId> getBuffers();
 
   public slots:
-    void inputLine(QString);   // temp
     void connectToIrc(QStringList);
+    void sendBacklog(BufferId, QVariant, QVariant);
+    void msgFromGUI(BufferId, QString message);
 
   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 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<QVariant>, bool done);
+
+    void bufferIdUpdated(BufferId);
 
   private slots:
     void globalDataUpdated(QString);
     void recvStatusMsgFromServer(QString msg);
-    void recvMessageFromServer(QString buffer, QString msg);
+    void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+    void serverDisconnected(QString net);
 
   private:
+    Storage *storage;
     QHash<QString, Server *> servers;
+    UserId user;
 
 };