X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=4d168253e2909db7eb141bc755a105ad05d0811e;hb=c6a9c963d53a171394b5c25d9925661e2788cec3;hp=656a0090ca13f440d945d31988cace11dc9c686a;hpb=4da24f0893e38769d288a3c57421bd7440b3511f;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 656a0090..4d168253 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -36,6 +36,7 @@
 class ActionCollection;
 class BufferView;
 class BufferViewConfig;
+class ClientBufferViewConfig;
 class BufferViewDock;
 class BufferWidget;
 class InputWidget;
@@ -64,7 +65,7 @@ class MainWin
 
     void init();
 
-    void addBufferView(BufferViewConfig *config);
+    void addBufferView(ClientBufferViewConfig *config);
     BufferView *allBuffersView() const;
 
     inline QSystemTrayIcon *systemTrayIcon() const;
@@ -109,7 +110,7 @@ class MainWin
 #endif
     void on_actionConfigureNetworks_triggered();
     void on_actionConfigureViews_triggered();
-    void on_actionLockDockPositions_toggled(bool lock);
+    void on_actionLockLayout_toggled(bool lock);
     void on_actionDebugNetworkModel_triggered();
     void on_actionDebugMessageModel_triggered();
     void on_actionDebugLog_triggered();
@@ -165,7 +166,8 @@ class MainWin
     InputWidget *_inputWidget;
 
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
-    QToolBar *_networkToolBar, *_chatViewToolBar, *_nickToolBar;
+    QMenu *_toolbarMenu;
+    QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
 
     QWidget *_awayLog;
     friend class QtUi;