Fixed formatting code %O (which should switch off all format codes, but accidentally

[quassel.git] / core / core.h

diff --git a/core/core.h b/core/core.h
index f5532c3..459c684 100644 (file)
--- a/core/core.h
+++ b/core/core.h
@@ -24,8 +24,11 @@
 #include <QMap>
 #include <QString>
 #include <QVariant>
+#include <QSqlDatabase>
 
 #include "server.h"
+#include "backlog.h"
+#include "global.h"
 
 class Core : public QObject {
   Q_OBJECT
@@ -33,35 +36,55 @@ class Core : public QObject {
   public:
 
     Core();
-    //~Core();
+    ~Core();
+    QHash<QString, QList<Message> > getBackLog() { return QHash<QString, QList<Message> >()/*backLog*/; }; // FIXME
+    QList<BufferId> getBuffers();
 
   public slots:
     void connectToIrc(QStringList);
+    void sendBacklog(BufferId, QVariant, QVariant);
+    void msgFromGUI(BufferId, QString message);
 
   signals:
-    void msgFromGUI(QString network, QString channel, QString message);
-    void displayMsg(QString network, QString channel, Message message);
+    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 serverStatesRequested();
     void globalDataUpdated(QString);
     void recvStatusMsgFromServer(QString msg);
-    void recvMessageFromServer(QString buffer, Message msg);
+    //void recvMessageFromServer(Message msg);
+    void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+    void serverDisconnected(QString net);
 
   private:
-    QHash<QString, Server *> servers;
-    QList<Message> backLog;
-    bool backLogEnabled;
+    Backlog backlog;
     QDir backLogDir;
-    QFile currentLogFile;
-    QDataStream logStream;
-    QDate currentLogFileDate;
+    bool backLogEnabled;
+    QHash<QString, Server *> servers;
+    //QHash<QString, QList<Message> > backLog;
+    //QHash<QString, int> netIdx;
+    //QHash<QString, QFile *> logFiles;
+    //QHash<QString, QDataStream *> logStreams;
+    //QHash<QString, QDate> logFileDates;
+    //QHash<QString, QDir> logFileDirs;
+
+    //QSqlDatabase logDb;
 
-    void initBackLog();
-    void logMessage(Message);
+    //uint getNetIdx(QString net);
+    //void initBackLog();
+    //void initBackLogOld();
+    //void logMessage(QString, Message);
+    //void logMessageOld(QString, Message);
 
 };