summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Ander Peñalba <jonan88@gmail.com>2010-08-30 17:10:04 +0200
committerJon Ander Peñalba <jonan88@gmail.com>2010-08-30 17:10:04 +0200
commit5fcf9b79a80d24261ae79999c13dc023ba1b677d (patch)
tree9e0ae80298ced0ea5744f45e2577fbb1db4274cd
parentMinor changes in the panels (diff)
downloadrekonq-5fcf9b79a80d24261ae79999c13dc023ba1b677d.tar.xz
panels directory removed
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/bookmarks/bookmarkspanel.cpp2
-rw-r--r--src/bookmarks/bookmarkspanel.h2
-rw-r--r--src/history/historypanel.cpp3
-rw-r--r--src/history/historypanel.h2
-rw-r--r--src/urlfilterproxymodel.cpp (renamed from src/panels/urlfilterproxymodel.cpp)0
-rw-r--r--src/urlfilterproxymodel.h (renamed from src/panels/urlfilterproxymodel.h)0
-rw-r--r--src/urlpanel.cpp (renamed from src/panels/urlpanel.cpp)3
-rw-r--r--src/urlpanel.h (renamed from src/panels/urlpanel.h)0
9 files changed, 7 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 276a2f25..ef623499 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,8 @@ SET( rekonq_KDEINIT_SRCS
protocolhandler.cpp
sessionmanager.cpp
tabbar.cpp
+ urlfilterproxymodel.cpp
+ urlpanel.cpp
walletbar.cpp
webicon.cpp
webinspectorpanel.cpp
@@ -32,9 +34,6 @@ SET( rekonq_KDEINIT_SRCS
webtab.cpp
zoombar.cpp
#----------------------------------------
- panels/urlfilterproxymodel.cpp
- panels/urlpanel.cpp
- #----------------------------------------
history/autosaver.cpp
history/historymanager.cpp
history/historymodels.cpp
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 0d912113..e88d3060 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -32,13 +32,13 @@
#include "rekonq.h"
// Local Includes
-#include "panels/urlfilterproxymodel.h"
#include "application.h"
#include "bookmarkprovider.h"
#include "bookmarkstreemodel.h"
#include "bookmarkscontextmenu.h"
#include "bookmarkowner.h"
#include "paneltreeview.h"
+#include "urlfilterproxymodel.h"
BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index e39158d3..2418ae81 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -34,7 +34,7 @@
#include "rekonq_defines.h"
// Local Includes
-#include "panels/urlpanel.h"
+#include "urlpanel.h"
// Forward Declarations
class KBookmark;
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index c0097965..84f2296e 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -32,11 +32,10 @@
#include "rekonq.h"
// Local Includes
-#include "panels/urlfilterproxymodel.h"
-
#include "application.h"
#include "paneltreeview.h"
#include "historymodels.h"
+#include "urlfilterproxymodel.h"
// KDE Includes
#include <KLocalizedString>
diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index 12ffe953..9c9d4a4e 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -33,7 +33,7 @@
#include "rekonq_defines.h"
// Local Includes
-#include "panels/urlpanel.h"
+#include "urlpanel.h"
class REKONQ_TESTS_EXPORT HistoryPanel : public UrlPanel
diff --git a/src/panels/urlfilterproxymodel.cpp b/src/urlfilterproxymodel.cpp
index b8e68342..b8e68342 100644
--- a/src/panels/urlfilterproxymodel.cpp
+++ b/src/urlfilterproxymodel.cpp
diff --git a/src/panels/urlfilterproxymodel.h b/src/urlfilterproxymodel.h
index f4f15395..f4f15395 100644
--- a/src/panels/urlfilterproxymodel.h
+++ b/src/urlfilterproxymodel.h
diff --git a/src/panels/urlpanel.cpp b/src/urlpanel.cpp
index 887dacf7..86246fd9 100644
--- a/src/panels/urlpanel.cpp
+++ b/src/urlpanel.cpp
@@ -32,9 +32,8 @@
#include "rekonq.h"
// Local Includes
-#include "panels/urlfilterproxymodel.h"
-
#include "paneltreeview.h"
+#include "urlfilterproxymodel.h"
// KDE Includes
#include <KLineEdit>
diff --git a/src/panels/urlpanel.h b/src/urlpanel.h
index b4ca2aa5..b4ca2aa5 100644
--- a/src/panels/urlpanel.h
+++ b/src/urlpanel.h