Last structure change, promised!

Anyway, this moving/renaming helped me finding lots of strange circulary
dependencies and easily solve them :)
We have also a more organized structure, hopefully letting people work on different areas
altogether.

27 files changed, 34 insertions, 30 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f7c85dd..a1604c3b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,36 +9,37 @@ ADD_SUBDIRECTORY( adblock )
 
 SET( rekonq_KDEINIT_SRCS
     application.cpp 
-    bookmarks.cpp
     findbar.cpp
-    lineedit.cpp
     mainview.cpp
     mainwindow.cpp 
     previewimage.cpp
     sessionmanager.cpp
-    sidepanel.cpp
     tabbar.cpp
-    urlbar.cpp
     webpage.cpp
     webpluginfactory.cpp
     websnap.cpp
     webview.cpp
 #----------------------------------------
     history/autosaver.cpp 
-    history/history.cpp
+    history/historymanager.cpp
     history/historymodels.cpp
     history/historypanel.cpp
+    history/sidepanel.cpp
 #----------------------------------------
     rekonqpage/newtabpage.cpp
 #----------------------------------------
     settings/settingsdialog.cpp
 #----------------------------------------
-    bookmarkspanel/bookmarkspanel.cpp
-    bookmarkspanel/bookmarkstreemodel.cpp
-    bookmarkspanel/bookmarksproxy.cpp
+    bookmarks/bookmarksmanager.cpp
+    bookmarks/bookmarkspanel.cpp
+    bookmarks/bookmarkstreemodel.cpp
+    bookmarks/bookmarksproxy.cpp
 #----------------------------------------
     adblock/adblockmanager.cpp
     adblock/khtml_filter.cpp
+#----------------------------------------
+    urlbar/urlbar.cpp
+    urlbar/lineedit.cpp
 )
 
 
@@ -57,6 +58,8 @@ KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc )
 
 INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_SOURCE_DIR}
                         ${CMAKE_CURRENT_SOURCE_DIR}/adblock
+                        ${CMAKE_CURRENT_SOURCE_DIR}/urlbar
+                        ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks
                         ${CMAKE_CURRENT_SOURCE_DIR}/history
                         ${CMAKE_CURRENT_SOURCE_DIR}/rekonqpage
                         ${CMAKE_CURRENT_SOURCE_DIR}/settings
diff --git a/src/application.cpp b/src/application.cpp
index 766d56ed..3a0ce638 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -35,7 +35,8 @@
 
 // Local Includes
 #include "mainwindow.h"
-#include "history.h"
+#include "historymanager.h"
+#include "bookmarksmanager.h"
 #include "mainview.h"
 #include "webview.h"
 #include "urlbar.h"
@@ -443,4 +444,4 @@ AdBlockManager *Application::adblockManager()
         s_adblockManager = new AdBlockManager(instance());
     }
     return s_adblockManager;
-}
\ No newline at end of file
+}
diff --git a/src/bookmarks.cpp b/src/bookmarks/bookmarksmanager.cpp
index 5f1ea393..1c881e08 100644
--- a/src/bookmarks.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -27,13 +27,12 @@
 
 
 // Self Includes
-#include "bookmarks.h"
-#include "bookmarks.moc"
+#include "bookmarksmanager.h"
+#include "bookmarksmanager.moc"
 
 // Local Includes
 #include "mainwindow.h"
 #include "webview.h"
-#include "application.h"
 
 // KDE Includes
 #include <KActionCollection>
diff --git a/src/bookmarks.h b/src/bookmarks/bookmarksmanager.h
index febac234..febac234 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks/bookmarksmanager.h
diff --git a/src/bookmarkspanel/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index a09e0058..a09e0058 100644
--- a/src/bookmarkspanel/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
diff --git a/src/bookmarkspanel/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index 8c3e6121..8c3e6121 100644
--- a/src/bookmarkspanel/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
diff --git a/src/bookmarkspanel/bookmarksproxy.cpp b/src/bookmarks/bookmarksproxy.cpp
index 87d1ce71..87d1ce71 100644
--- a/src/bookmarkspanel/bookmarksproxy.cpp
+++ b/src/bookmarks/bookmarksproxy.cpp
diff --git a/src/bookmarkspanel/bookmarksproxy.h b/src/bookmarks/bookmarksproxy.h
index 99483331..99483331 100644
--- a/src/bookmarkspanel/bookmarksproxy.h
+++ b/src/bookmarks/bookmarksproxy.h
diff --git a/src/bookmarkspanel/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 99441a63..b5690a9b 100644
--- a/src/bookmarkspanel/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -1,8 +1,8 @@
 #include "bookmarkstreemodel.h"
 
 // rekonq includes
-#include "../application.h"
-#include "../bookmarks.h"
+#include "application.h"
+#include "bookmarksmanager.h"
 
 // KDE includes
 #include <KBookmarkGroup>
diff --git a/src/bookmarkspanel/bookmarkstreemodel.h b/src/bookmarks/bookmarkstreemodel.h
index 9753999c..9753999c 100644
--- a/src/bookmarkspanel/bookmarkstreemodel.h
+++ b/src/bookmarks/bookmarkstreemodel.h
diff --git a/src/history/history.cpp b/src/history/historymanager.cpp
index 07580433..29bdb45b 100644
--- a/src/history/history.cpp
+++ b/src/history/historymanager.cpp
@@ -27,8 +27,8 @@
 
 
 // Self Includes
-#include "history.h"
-#include "history.moc"
+#include "historymanager.h"
+#include "historymanager.moc"
 
 // Auto Includes
 #include "rekonq.h"
diff --git a/src/history/history.h b/src/history/historymanager.h
index ff3b4381..ff3b4381 100644
--- a/src/history/history.h
+++ b/src/history/historymanager.h
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index cb8bea41..08f3f63e 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -31,7 +31,7 @@
 
 
 // Local Includes
-#include "history.h"
+#include "historymanager.h"
 
 // KDE Includes
 #include <KUrl>
diff --git a/src/sidepanel.cpp b/src/history/sidepanel.cpp
index 7c42301c..7c42301c 100644
--- a/src/sidepanel.cpp
+++ b/src/history/sidepanel.cpp
diff --git a/src/sidepanel.h b/src/history/sidepanel.h
index 6aca3587..6aca3587 100644
--- a/src/sidepanel.h
+++ b/src/history/sidepanel.h
diff --git a/src/mainview.cpp b/src/mainview.cpp
index ebcad088..f4598f22 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -35,10 +35,7 @@
 
 // Local Includes
 #include "tabbar.h"
-#include "application.h"
-#include "history.h"
 #include "urlbar.h"
-#include "webview.h"
 #include "sessionmanager.h"
 
 // KDE Includes
@@ -50,6 +47,7 @@
 #include <KDebug>
 #include <KStandardDirs>
 #include <KPassivePopup>
+#include <KLocalizedString>
 
 // Qt Includes
 #include <QtCore/QTimer>
diff --git a/src/mainview.h b/src/mainview.h
index 9c8a24aa..af957da2 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -35,7 +35,7 @@
 #include "webview.h"
 #include "webpage.h"
 #include "application.h"
-#include "history.h"
+#include "historymanager.h"
 #include "mainwindow.h"
 
 // KDE Includes
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f2809beb..628743ee 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -34,15 +34,14 @@
 #include "rekonq.h"
 
 // Local Includes
-#include "application.h"
 #include "settingsdialog.h"
-#include "history.h"
-#include "bookmarks.h"
+#include "historymanager.h"
+#include "bookmarksmanager.h"
 #include "webview.h"
 #include "mainview.h"
 #include "findbar.h"
 #include "sidepanel.h"
-#include "bookmarkspanel/bookmarkspanel.h"
+#include "bookmarkspanel.h"
 #include "urlbar.h"
 #include "tabbar.h"
 #include "newtabpage.h"
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 64ce6967..d47b0d50 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -31,13 +31,13 @@
 
 
 // Local Includes
-#include "bookmarks.h"
-#include "webview.h"
+#include "application.h"
 
 // KDE Includes
 #include <KMainWindow>
 #include <KActionCollection>
 #include <KToolBar>
+#include <KUrl>
 
 // Forward Declarations
 class QWebFrame;
diff --git a/src/previewimage.cpp b/src/previewimage.cpp
index 6d5b598d..80757ca2 100644
--- a/src/previewimage.cpp
+++ b/src/previewimage.cpp
@@ -30,7 +30,7 @@
 
 // Local Includes
 #include "application.h"
-#include "history.h"
+#include "historymanager.h"
 #include "rekonq.h"
 #include "mainwindow.h"
 #include "mainview.h"
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index b34990fc..4a7a72e0 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -32,7 +32,7 @@
 
 // Local Includes
 #include "historymodels.h"
-#include "bookmarks.h"
+#include "bookmarksmanager.h"
 #include "application.h"
 #include "mainwindow.h"
 #include "mainview.h"
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 6fdf4346..1246d669 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -45,6 +45,7 @@
 #include <KStandardShortcut>
 #include <KGlobalSettings>
 #include <KPassivePopup>
+#include <KMenu>
 
 // Qt Includes
 #include <QString>
diff --git a/src/lineedit.cpp b/src/urlbar/lineedit.cpp
index f3c93e8e..f3c93e8e 100644
--- a/src/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
diff --git a/src/lineedit.h b/src/urlbar/lineedit.h
index 67ded052..67ded052 100644
--- a/src/lineedit.h
+++ b/src/urlbar/lineedit.h
diff --git a/src/urlbar.cpp b/src/urlbar/urlbar.cpp
index 2adfcd17..2adfcd17 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
diff --git a/src/urlbar.h b/src/urlbar/urlbar.h
index 0e8bab26..0e8bab26 100644
--- a/src/urlbar.h
+++ b/src/urlbar/urlbar.h
diff --git a/src/webview.cpp b/src/webview.cpp
index f38d363e..c25b8903 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -37,11 +37,14 @@
 #include "mainwindow.h"
 #include "mainview.h"
 #include "webpage.h"
+#include "bookmarksmanager.h"
 
 // KDE Includes
 #include <KService>
 #include <KUriFilterData>
 #include <KStandardShortcut>
+#include <KMenu>
+#include <KActionMenu>
 
 // Qt Includes
 #include <QContextMenuEvent>