Fix off-by-one bug in a line that was even more buggy until a few hours ago.

[quassel.git] / src / qtgui / mainwin.h

diff --git a/src/qtgui/mainwin.h b/src/qtgui/mainwin.h
index 7876b50..123d5f4 100644 (file)
--- a/src/qtgui/mainwin.h
+++ b/src/qtgui/mainwin.h
@@ -22,15 +22,18 @@
 #define _MAINWIN_H_
 
 #include <QtGui>
-#include "gui/ui_mainwin.h"
+#include "ui_mainwin.h"
 
-#include "global.h"
+#include "quasselui.h"
+//#include "global.h"
 #include "message.h"
 #include "chatwidget.h"
+#include "bufferviewfilter.h"
+#include "bufferviewwidget.h"
 
 class ServerListDlg;
 class CoreConnectDlg;
-class BufferViewDock;
+//class BufferViewDock;
 class Buffer;
 class BufferWidget;
 class SettingsDlg;
@@ -40,46 +43,24 @@ class SettingsDlg;
  * dockwidgets and of course the chat window, this class also stores all data it
  * receives from the core, and it maintains a list of all known nicks.
  */
-class MainWin : public QMainWindow {
+class MainWin : public QMainWindow, public AbstractUi {
   Q_OBJECT
 
   public:
     MainWin();
-    ~MainWin();
+    virtual ~MainWin();
 
     void init();
     void registerBufferViewDock(BufferViewDock *);
 
+    AbstractUiMsg *layoutMsg(const Message &);
+
   protected:
     void closeEvent(QCloseEvent *event);
 
-  signals:
-    //void sendInput(BufferId, QString message);
-    //void bufferSelected(Buffer *);
-    //void bufferUpdated(Buffer *);
-    //void bufferActivity(Buffer::ActivityLevel, Buffer *);
-    //void bufferDestroyed(Buffer *);
-    //void backlogReceived(Buffer *, QList<Message>);
-    //void requestBacklog(BufferId, QVariant, QVariant);
-
-    void importOldBacklog();
+    //void importOldBacklog();
 
   private slots:
-    
-    //void userInput(BufferId, QString);
-    //void networkConnected(QString);
-    //void networkDisconnected(QString);
-    //void recvNetworkState(QString, QVariant);
-    //void recvMessage(Message message);
-    //void recvStatusMsg(QString network, QString message);
-    //void setTopic(QString net, QString buf, QString);
-    //void addNick(QString net, QString nick, VarMap props);
-    //void removeNick(QString net, QString nick);
-    //void renameNick(QString net, QString oldnick, QString newnick);
-    //void updateNick(QString net, QString nick, VarMap props);
-    //void setOwnNick(QString net, QString nick);
-    //void recvBacklogData(BufferId, QList<QVariant>, bool);
-    //void updateBufferId(BufferId);
 
     void showServerList();
     void showSettingsDlg();
@@ -89,43 +70,26 @@ class MainWin : public QMainWindow {
 
     void importBacklog();
 
+  signals:
+    void importOldBacklog();
+
   private:
     Ui::MainWin ui;
 
     void setupMenus();
     void setupViews();
     void setupSettingsDlg();
-    //void syncToCore();  // implemented in main_mono.cpp or main_gui.cpp
-    //Buffer * getBuffer(QString net, QString buf);
-    //Buffer *getBuffer(BufferId);
-    //BufferId getStatusBufferId(QString net);
-    //BufferId getBufferId(QString net, QString buf);
-    //void buffersUpdated();
 
     QSystemTrayIcon *systray;
-    //QWorkspace *workspace;
-    //QWidget *widget;
-    //BufferWidget *bufferWidget;
 
     ServerListDlg *serverListDlg;
     CoreConnectDlg *coreConnectDlg;
     SettingsDlg *settingsDlg;
 
-    //QString currentNetwork, currentBuffer;
-    //QHash<QString, QHash<QString, Buffer*> > buffers;
     uint currentBuffer;
-    //QHash<BufferId, Buffer *> buffers;
-    //QHash<uint, BufferId> bufferIds;
-    //QHash<QString, QHash<QString, VarMap> > nicks;
-    //QHash<QString, bool> connected;
-    //QHash<QString, QString> ownNick;
-    //QHash<QString, QList<Message> > coreBackLog;
-    //QList<BufferId> coreBuffers;
 
     QList<BufferViewDock *> netViews;
 
-    //QTimer *layoutTimer;
-    //QList<Message> layoutQueue;
 };
 
 #endif