From 16072a8703434afc39acf991673cf932747d80c6 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 22 Aug 2009 22:51:17 +0200
Subject: Removed MenuBar. First steps..

---
 src/mainwindow.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/mainwindow.h')

diff --git a/src/mainwindow.h b/src/mainwindow.h
index b7f9bae1..a2031692 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -36,7 +36,9 @@
 #include "webview.h"
 
 // KDE Includes
-#include <KXmlGuiWindow>
+#include <KMainWindow>
+#include <KActionCollection>
+#include <KToolBar>
 
 // Forward Declarations
 class QWebFrame;
@@ -55,7 +57,7 @@ class WebView;
  * It handles the menus, toolbars, and status bars.
  *
  */
-class MainWindow : public KXmlGuiWindow
+class MainWindow : public KMainWindow
 {
     Q_OBJECT
 
@@ -67,12 +69,13 @@ public:
     WebView *currentTab() const;
     QAction *actionByName(const QString name);
     virtual QSize sizeHint() const;
-
+    virtual KActionCollection *actionCollection () const;
+    
 private:
     void setupActions();
     void setupHistoryMenu();
-    void setupBars();
     void setupTools();
+    void setupToolbar();
 
     void setupSidePanel();
     SidePanel *sidePanel();
@@ -152,6 +155,8 @@ private:
     QString m_homePage;
 
     QPointer<KPassivePopup> m_popup;
+
+    KActionCollection *m_ac;
 };
 
 #endif // MAINWINDOW_H
-- 
cgit v1.2.1