From 96807aee813280c195224455c85d6c3e6d180c4e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 26 Jul 2010 19:07:25 +0200 Subject: Back to XMLGUI. This means configurable toolbars and the old problems with our no menubar choice. We'll see what will happen this time... Yoann: can you pls check my port of the bookmarks toolbar? --- src/mainwindow.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 286290c0..1ec79a4b 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -35,7 +35,7 @@ #include "rekonq_defines.h" // KDE Includes -#include +#include #include #include #include @@ -61,7 +61,7 @@ class QSlider; * It handles the menus, toolbars, and status bars. * */ -class REKONQ_TESTS_EXPORT MainWindow : public KMainWindow +class REKONQ_TESTS_EXPORT MainWindow : public KXmlGuiWindow { Q_OBJECT @@ -70,7 +70,6 @@ public: ~MainWindow(); inline MainView *mainView() const { return m_view; } - inline KActionCollection *actionCollection() const { return m_ac; } inline QAction *actionByName(const QString &name) { return actionCollection()->action(name); } WebTab *currentTab() const; @@ -178,17 +177,13 @@ private: KMenu *m_historyBackMenu; KMenu *m_encodingMenu; - KToolBar *m_mainBar; - KToolBar *m_bmBar; - QSlider *m_zoomSlider; QString m_lastSearch; KPassivePopup *m_popup; QTimer *m_hidePopup; - - KActionCollection *m_ac; }; #endif // MAINWINDOW_H + \ No newline at end of file -- cgit v1.2.1