From 9dcb1b5bfd4772726f41bf011abf6810b6ce25ad Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 2 Aug 2010 00:50:04 +0200
Subject: Merging mr 154 by hand!!

WARNING: I'm NOT sure about this. Please everyone, check it twice!!

PS: Many thanks to Yoann21. He is doing a fantastic work on the bookmarks
toolbar
---
 src/mainwindow.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/mainwindow.h')

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 1ec79a4b..96fe0f2d 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -34,6 +34,9 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+// Local Includes
+#include "bookmarksmanager.h"
+                     
 // KDE Includes
 #include <KXmlGuiWindow>
 #include <KActionCollection>
@@ -172,11 +175,13 @@ private:
     BookmarksPanel *m_bookmarksPanel;
     WebInspectorPanel *m_webInspectorPanel;
     NetworkAnalyzerPanel *m_analyzerPanel;
-    
+
     KAction *m_stopReloadAction;
     KMenu *m_historyBackMenu;
     KMenu *m_encodingMenu;
 
+    BookmarkToolBar *m_bookmarksBar;
+    
     QSlider *m_zoomSlider;
 
     QString m_lastSearch;
-- 
cgit v1.2.1