Merge branch 'master' into mainwindow

1 files changed, 9 insertions, 6 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8b8f1cbe..fa96eb0e 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -25,7 +25,6 @@
 // Local Includes
 #include "findbar.h"
 #include "searchbar.h"
-#include "mainview.h"
 
 // KDE Includes
 #include <KUrl>
@@ -36,7 +35,8 @@
 #include <KToggleAction>
 #include <KMenu>
 
-
+class BookmarksProvider;
+class MainView;
 class QWebFrame;
 class WebView;
 
@@ -61,7 +61,7 @@ public:
 
 private:
     void setupActions();
-    void setupCustomMenu();
+    void setupHistoryMenu();
     void setupTabBar();
 
 public slots:
@@ -75,15 +75,16 @@ private slots:
     void slotUpdateWindowTitle(const QString &title = QString());
     void slotOpenLocation();
     void slotAboutToShowBackMenu();
+    void geometryChangeRequested(const QRect &geometry);
 
     // history related
     void slotOpenActionUrl(QAction *action);
     void slotOpenPrevious();
     void slotOpenNext();
 
-    void slotShowWindow();
-    void slotSwapFocus();
-    void geometryChangeRequested(const QRect &geometry);
+/*    void slotShowWindow();
+    void slotSwapFocus();*/
+
 
 
     // File Menu slots
@@ -121,6 +122,8 @@ private:
     KMenu *m_historyBackMenu;
     KMenu *m_windowMenu;
 
+    BookmarksProvider *m_bookmarksProvider;
+
     QAction *m_stopReload;
 
     QString m_lastSearch;