Sourcecode hierarchy cleanup: Create folder "views" and move view related sources to it

svn path=/trunk/KDE/kdebase/apps/; revision=1154146

56 files changed, 64 insertions, 56 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bba1bf957..4dc2476c7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,27 +17,15 @@ endif (Nepomuk_FOUND)
 
 set(dolphinprivate_LIB_SRCS
     additionalinfoaccessor.cpp
-    dolphindetailsview.cpp
-    dolphindetailsviewexpander.cpp
-    dolphiniconsview.cpp
-    dolphincolumnview.cpp
-    dolphincolumnviewcontainer.cpp
     dolphindirlister.cpp
-    dolphinfileitemdelegate.cpp
     dolphinmodel.cpp
     dolphinnewmenuobserver.cpp
     dolphinsortfilterproxymodel.cpp
-    dolphincategorydrawer.cpp
-    dolphinview.cpp
     dolphinviewactionhandler.cpp
-    dolphinviewautoscroller.cpp
-    dolphinviewcontroller.cpp
     dolphinremoteencoding.cpp
     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp
-    selectiontoggle.cpp
-    selectionmanager.cpp
     settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/dolphinsettings.cpp
@@ -49,10 +37,22 @@ set(dolphinprivate_LIB_SRCS
     versioncontrol/pendingthreadsmaintainer.cpp
     versioncontrol/updateitemstatesthread.cpp
     versioncontrol/versioncontrolobserver.cpp
-    viewextensionsfactory.cpp
-    viewmodecontroller.cpp
     viewproperties.cpp
-    zoomlevelinfo.cpp
+    views/dolphincategorydrawer.cpp
+    views/dolphinview.cpp
+    views/dolphindetailsview.cpp
+    views/dolphindetailsviewexpander.cpp
+    views/dolphinfileitemdelegate.cpp
+    views/dolphiniconsview.cpp
+    views/dolphincolumnview.cpp
+    views/dolphincolumnviewcontainer.cpp
+    views/dolphinviewautoscroller.cpp
+    views/dolphinviewcontroller.cpp
+    views/selectiontoggle.cpp
+    views/selectionmanager.cpp
+    views/viewextensionsfactory.cpp
+    views/viewmodecontroller.cpp
+    views/zoomlevelinfo.cpp
 )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
@@ -101,7 +101,7 @@ set(dolphin_SRCS
     dolphinviewcontainer.cpp
     dolphindirlister.cpp
     dolphincontextmenu.cpp
-    filterbar.cpp
+    filterbar/filterbar.cpp
     main.cpp
     pixmapviewer.cpp
     panels/information/informationpanel.cpp
@@ -135,7 +135,7 @@ set(dolphin_SRCS
     statusbar/dolphinstatusbar.cpp
     statusbar/statusbarspaceinfo.cpp
     statusbar/statusbarmessagelabel.cpp
-    zoomlevelinfo.cpp
+    views/zoomlevelinfo.cpp
 )
 
 kde4_add_kcfg_files(dolphin_SRCS
@@ -205,7 +205,7 @@ set(kcm_dolphinviewmodes_PART_SRCS
     settings/viewmodes/iconsizegroupbox.cpp
     settings/viewmodes/iconsviewsettingspage.cpp
     settings/viewmodes/viewsettingspagebase.cpp
-    zoomlevelinfo.cpp)
+    views/zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS
     settings/kcm/kcmdolphinnavigation.cpp
diff --git a/src/additionalinfoaccessor.h b/src/additionalinfoaccessor.h
index 51319a11c..0a3d51459 100644
--- a/src/additionalinfoaccessor.h
+++ b/src/additionalinfoaccessor.h
@@ -20,9 +20,9 @@
 #ifndef ADDITIONALINFOACCESSOR_H
 #define ADDITIONALINFOACCESSOR_H
 
-#include <dolphinview.h>
 #include <libdolphin_export.h>
 #include <kfileitemdelegate.h>
+#include <views/dolphinview.h>
 
 #include <QList>
 #include <QMap>
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 9b49f7c89..84ad9d632 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -23,7 +23,6 @@
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
 #include "settings/dolphinsettings.h"
-#include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
@@ -52,6 +51,9 @@
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
 
+#include "views/dolphinview.h"
+#include "views/viewmodecontroller.h"
+
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index dfc171cf9..4d993865f 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -22,7 +22,6 @@
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 
-#include "dolphinview.h"
 #include "panels/panel.h"
 
 #include <config-nepomuk.h>
@@ -33,7 +32,9 @@
 #include <kxmlguiwindow.h>
 #include <kactionmenu.h>
 
-#include <QtCore/QList>
+#include "views/dolphinview.h"
+
+#include <QList>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
diff --git a/src/dolphinnewmenu.cpp b/src/dolphinnewmenu.cpp
index 234f75f81..5769e28ad 100644
--- a/src/dolphinnewmenu.cpp
+++ b/src/dolphinnewmenu.cpp
@@ -22,9 +22,9 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenuobserver.h"
-#include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "statusbar/dolphinstatusbar.h"
+#include "views/dolphinview.h"
 
 #include <kactioncollection.h>
 #include <kio/job.h>
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 2dec262e1..18ace8df5 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -20,7 +20,6 @@
 #include "dolphinpart.h"
 #include "dolphinviewactionhandler.h"
 #include "dolphinsortfilterproxymodel.h"
-#include "dolphinview.h"
 #include "dolphinmodel.h"
 #include "dolphinnewmenuobserver.h"
 #include "dolphinremoteencoding.h"
@@ -47,6 +46,7 @@
 #include <kinputdialog.h>
 
 #include "settings/dolphinsettings.h"
+#include "views/dolphinview.h"
 
 #include <QActionGroup>
 #include <QApplication>
diff --git a/src/dolphinsortfilterproxymodel.h b/src/dolphinsortfilterproxymodel.h
index bc101bd8b..3ae8a059c 100644
--- a/src/dolphinsortfilterproxymodel.h
+++ b/src/dolphinsortfilterproxymodel.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINSORTFILTERPROXYMODEL_H
 #define DOLPHINSORTFILTERPROXYMODEL_H
 
-#include <dolphinview.h>
+#include <views/dolphinview.h>
 #include <kdirsortfilterproxymodel.h>
 #include <libdolphin_export.h>
 
diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 8b1d35ac9..d2eaa4d51 100644
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -21,8 +21,8 @@
 
 #include "additionalinfoaccessor.h"
 #include "settings/viewpropertiesdialog.h"
-#include "dolphinview.h"
-#include "zoomlevelinfo.h"
+#include "views/dolphinview.h"
+#include "views/zoomlevelinfo.h"
 #include <konq_operations.h>
 
 #include <kaction.h>
diff --git a/src/dolphinviewactionhandler.h b/src/dolphinviewactionhandler.h
index dbe02a706..05339ce37 100644
--- a/src/dolphinviewactionhandler.h
+++ b/src/dolphinviewactionhandler.h
@@ -21,10 +21,10 @@
 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 
-#include "dolphinview.h"
 #include "libdolphin_export.h"
 #include <kactionmenu.h>
 #include <kselectaction.h>
+#include "views/dolphinview.h"
 #include <QtCore/QObject>
 
 class KToggleAction;
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index d11a4a9be..24ab43272 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -49,20 +49,20 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphinmodel.h"
-#include "dolphincolumnview.h"
-#include "dolphinviewcontroller.h"
 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
-#include "dolphindetailsview.h"
-#include "dolphiniconsview.h"
 #include "draganddrophelper.h"
-#include "filterbar.h"
+#include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"
 #include "settings/dolphinsettings.h"
 #include "statusbar/dolphinstatusbar.h"
-#include "viewmodecontroller.h"
 #include "viewproperties.h"
+#include "views/dolphincolumnview.h"
+#include "views/dolphindetailsview.h"
+#include "views/dolphiniconsview.h"
+#include "views/dolphinviewcontroller.h"
+#include "views/viewmodecontroller.h"
 
 DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     QWidget(parent),
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index c222e7a55..fe1ad8d6e 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -21,8 +21,6 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include "dolphinview.h"
-
 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
 #include <kglobalsettings.h>
@@ -36,6 +34,8 @@
 #include <QtGui/QBoxLayout>
 #include <QtGui/QWidget>
 
+#include <views/dolphinview.h>
+
 class FilterBar;
 class KUrl;
 class DolphinModel;
diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index 88dca9b40..0cca59ac4 100644
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -19,8 +19,6 @@
  ***************************************************************************/
 
 #include "draganddrophelper.h"
-#include "dolphiniconsview.h"
-#include "dolphinviewcontroller.h"
 
 #include <kdirmodel.h>
 #include <kfileitem.h>
@@ -28,6 +26,9 @@
 #include <klocale.h>
 #include <konq_operations.h>
 
+#include "views/dolphiniconsview.h"
+#include "views/dolphinviewcontroller.h"
+
 #include <QAbstractItemView>
 #include <QAbstractProxyModel>
 #include <QtDBus>
diff --git a/src/filterbar.cpp b/src/filterbar/filterbar.cpp
index b108570ce..b108570ce 100644
--- a/src/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
diff --git a/src/filterbar.h b/src/filterbar/filterbar.h
index bf1bce684..bf1bce684 100644
--- a/src/filterbar.h
+++ b/src/filterbar/filterbar.h
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 0542665d5..fb1b84fa7 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -21,7 +21,6 @@
 
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
-#include "dolphinview.h"
 #include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
@@ -44,6 +43,8 @@
 #include <QScrollBar>
 #include <QTimer>
 
+#include "views/dolphinview.h"
+
 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
     m_setLeafVisible(false),
diff --git a/src/panels/folders/paneltreeview.cpp b/src/panels/folders/paneltreeview.cpp
index 58866d6c3..69cf46cd6 100644
--- a/src/panels/folders/paneltreeview.cpp
+++ b/src/panels/folders/paneltreeview.cpp
@@ -19,12 +19,11 @@
 
 #include "paneltreeview.h"
 
-#include "dolphinviewcontroller.h"
 #include "dolphinmodel.h"
 #include "draganddrophelper.h"
-#include "viewmodecontroller.h"
 
 #include <kfileitemdelegate.h>
+#include <QListView>
 #include <QKeyEvent>
 #include <QPainter>
 #include <QHeaderView>
diff --git a/src/settings/dolphin_directoryviewpropertysettings.kcfgc b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
index 753642f8c..b938ab3e4 100644
--- a/src/settings/dolphin_directoryviewpropertysettings.kcfgc
+++ b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
@@ -3,4 +3,4 @@ Singleton=false
 ClassName=ViewPropertySettings
 Mutators=true
 GlobalEnums=true
-IncludeFiles=dolphinview.h,qnamespace.h
+IncludeFiles=views/dolphinview.h,qnamespace.h
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 1e1c6ed87..d891558e1 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -21,7 +21,6 @@
 
 #include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"
-#include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 
 #include "dolphin_generalsettings.h"
@@ -39,6 +38,8 @@
 #include <QPushButton>
 #include <QRadioButton>
 
+#include "views/dolphinview.h"
+
 StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
diff --git a/src/settings/viewmodes/columnviewsettingspage.cpp b/src/settings/viewmodes/columnviewsettingspage.cpp
index aac28f0fd..2a6265f2f 100644
--- a/src/settings/viewmodes/columnviewsettingspage.cpp
+++ b/src/settings/viewmodes/columnviewsettingspage.cpp
@@ -22,7 +22,6 @@
 #include "dolphinfontrequester.h"
 #include <dolphin_columnmodesettings.h>
 #include "iconsizegroupbox.h"
-#include "zoomlevelinfo.h"
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -38,6 +37,8 @@
 #include <QSlider>
 #include <QRadioButton>
 
+#include <views/zoomlevelinfo.h>
+
 ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
     m_iconSizeGroupBox(0),
diff --git a/src/settings/viewmodes/detailsviewsettingspage.cpp b/src/settings/viewmodes/detailsviewsettingspage.cpp
index 67cef32fe..253d12a79 100644
--- a/src/settings/viewmodes/detailsviewsettingspage.cpp
+++ b/src/settings/viewmodes/detailsviewsettingspage.cpp
@@ -22,7 +22,6 @@
 #include "iconsizegroupbox.h"
 #include "dolphinfontrequester.h"
 #include "dolphin_detailsmodesettings.h"
-#include "zoomlevelinfo.h"
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -36,7 +35,9 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QRadioButton>
-#include <QtGui/QSpinBox>
+#include <QSpinBox>
+
+#include <views/zoomlevelinfo.h>
 
 DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
diff --git a/src/settings/viewmodes/iconsizegroupbox.cpp b/src/settings/viewmodes/iconsizegroupbox.cpp
index d8e0e889a..900c75b2c 100644
--- a/src/settings/viewmodes/iconsizegroupbox.cpp
+++ b/src/settings/viewmodes/iconsizegroupbox.cpp
@@ -29,7 +29,7 @@
 #include <QRect>
 #include <QSlider>
 
-#include "zoomlevelinfo.h"
+#include <views/zoomlevelinfo.h>
 
 IconSizeGroupBox::IconSizeGroupBox(QWidget* parent) :
     QGroupBox(i18nc("@title:group", "Icon Size"), parent),
diff --git a/src/settings/viewmodes/iconsviewsettingspage.cpp b/src/settings/viewmodes/iconsviewsettingspage.cpp
index 059a4a846..a01b4a2db 100644
--- a/src/settings/viewmodes/iconsviewsettingspage.cpp
+++ b/src/settings/viewmodes/iconsviewsettingspage.cpp
@@ -22,7 +22,6 @@
 #include "dolphinfontrequester.h"
 #include "settings/dolphinsettings.h"
 #include "iconsizegroupbox.h"
-#include "zoomlevelinfo.h"
 
 #include "dolphin_iconsmodesettings.h"
 
@@ -41,6 +40,8 @@
 #include <QGridLayout>
 #include <QVBoxLayout>
 
+#include <views/zoomlevelinfo.h>
+
 IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
     m_iconSizeGroupBox(0),
diff --git a/src/settings/viewmodes/iconsviewsettingspage.h b/src/settings/viewmodes/iconsviewsettingspage.h
index 17fda4e26..9a1a9e8b4 100644
--- a/src/settings/viewmodes/iconsviewsettingspage.h
+++ b/src/settings/viewmodes/iconsviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef ICONSVIEWSETTINGSPAGE_H
 #define ICONSVIEWSETTINGSPAGE_H
 
-#include <dolphiniconsview.h>
+#include <views/dolphiniconsview.h>
 #include "viewsettingspagebase.h"
 
 class DolphinFontRequester;
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 3941a61cc..6e4efab1b 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -21,7 +21,7 @@
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
-#include "dolphinview.h"
+#include "views/dolphinview.h"
 #include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 684a807b8..e08d94948 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -20,7 +20,6 @@
 
 #include "dolphinstatusbar.h"
 
-#include "dolphinview.h"
 #include "dolphin_generalsettings.h"
 
 #include <kiconloader.h>
@@ -41,7 +40,8 @@
 #include <QToolButton>
 #include <QTimer>
 
-#include "zoomlevelinfo.h"
+#include <views/dolphinview.h>
+#include <views/zoomlevelinfo.h>
 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     QWidget(parent),
diff --git a/src/viewproperties.h b/src/viewproperties.h
index 517947022..bb476dc44 100644
--- a/src/viewproperties.h
+++ b/src/viewproperties.h
@@ -21,7 +21,7 @@
 #ifndef VIEWPROPERTIES_H
 #define VIEWPROPERTIES_H
 
-#include <dolphinview.h>
+#include <views/dolphinview.h>
 #include <kurl.h>
 #include <libdolphin_export.h>
 
diff --git a/src/dolphincategorydrawer.cpp b/src/views/dolphincategorydrawer.cpp
index 59743b7f5..59743b7f5 100644
--- a/src/dolphincategorydrawer.cpp
+++ b/src/views/dolphincategorydrawer.cpp
diff --git a/src/dolphincategorydrawer.h b/src/views/dolphincategorydrawer.h
index d9849727e..d9849727e 100644
--- a/src/dolphincategorydrawer.h
+++ b/src/views/dolphincategorydrawer.h
diff --git a/src/dolphincolumnview.cpp b/src/views/dolphincolumnview.cpp
index 7e2b522b4..7e2b522b4 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/views/dolphincolumnview.cpp
diff --git a/src/dolphincolumnview.h b/src/views/dolphincolumnview.h
index 64feac4f9..64feac4f9 100644
--- a/src/dolphincolumnview.h
+++ b/src/views/dolphincolumnview.h
diff --git a/src/dolphincolumnviewcontainer.cpp b/src/views/dolphincolumnviewcontainer.cpp
index 344d38d8a..344d38d8a 100644
--- a/src/dolphincolumnviewcontainer.cpp
+++ b/src/views/dolphincolumnviewcontainer.cpp
diff --git a/src/dolphincolumnviewcontainer.h b/src/views/dolphincolumnviewcontainer.h
index c67fb3cff..c67fb3cff 100644
--- a/src/dolphincolumnviewcontainer.h
+++ b/src/views/dolphincolumnviewcontainer.h
diff --git a/src/dolphindetailsview.cpp b/src/views/dolphindetailsview.cpp
index 961bd7872..961bd7872 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/views/dolphindetailsview.cpp
diff --git a/src/dolphindetailsview.h b/src/views/dolphindetailsview.h
index 1dff8fe59..3ac08d337 100644
--- a/src/dolphindetailsview.h
+++ b/src/views/dolphindetailsview.h
@@ -21,9 +21,9 @@
 #ifndef DOLPHINDETAILSVIEW_H
 #define DOLPHINDETAILSVIEW_H
 
-#include <dolphinview.h>
 #include <QTreeView>
 #include <libdolphin_export.h>
+#include <views/dolphinview.h>
 
 class DolphinViewController;
 class DolphinSortFilterProxyModel;
diff --git a/src/dolphindetailsviewexpander.cpp b/src/views/dolphindetailsviewexpander.cpp
index 0f3d3fde1..0f3d3fde1 100644
--- a/src/dolphindetailsviewexpander.cpp
+++ b/src/views/dolphindetailsviewexpander.cpp
diff --git a/src/dolphindetailsviewexpander.h b/src/views/dolphindetailsviewexpander.h
index b4dc2fc72..b4dc2fc72 100644
--- a/src/dolphindetailsviewexpander.h
+++ b/src/views/dolphindetailsviewexpander.h
diff --git a/src/dolphinfileitemdelegate.cpp b/src/views/dolphinfileitemdelegate.cpp
index 17447d8cb..17447d8cb 100644
--- a/src/dolphinfileitemdelegate.cpp
+++ b/src/views/dolphinfileitemdelegate.cpp
diff --git a/src/dolphinfileitemdelegate.h b/src/views/dolphinfileitemdelegate.h
index 405f24916..405f24916 100644
--- a/src/dolphinfileitemdelegate.h
+++ b/src/views/dolphinfileitemdelegate.h
diff --git a/src/dolphiniconsview.cpp b/src/views/dolphiniconsview.cpp
index 636bdd66c..636bdd66c 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/views/dolphiniconsview.cpp
diff --git a/src/dolphiniconsview.h b/src/views/dolphiniconsview.h
index 21e37ba02..21e37ba02 100644
--- a/src/dolphiniconsview.h
+++ b/src/views/dolphiniconsview.h
diff --git a/src/dolphinview.cpp b/src/views/dolphinview.cpp
index 73a0c63c3..73a0c63c3 100644
--- a/src/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
diff --git a/src/dolphinview.h b/src/views/dolphinview.h
index dbef511bf..dbef511bf 100644
--- a/src/dolphinview.h
+++ b/src/views/dolphinview.h
diff --git a/src/dolphinviewautoscroller.cpp b/src/views/dolphinviewautoscroller.cpp
index 45896a5eb..45896a5eb 100644
--- a/src/dolphinviewautoscroller.cpp
+++ b/src/views/dolphinviewautoscroller.cpp
diff --git a/src/dolphinviewautoscroller.h b/src/views/dolphinviewautoscroller.h
index 9fd35d494..9fd35d494 100644
--- a/src/dolphinviewautoscroller.h
+++ b/src/views/dolphinviewautoscroller.h
diff --git a/src/dolphinviewcontroller.cpp b/src/views/dolphinviewcontroller.cpp
index 6ef32f07f..6ef32f07f 100644
--- a/src/dolphinviewcontroller.cpp
+++ b/src/views/dolphinviewcontroller.cpp
diff --git a/src/dolphinviewcontroller.h b/src/views/dolphinviewcontroller.h
index 848110770..6eed68e1a 100644
--- a/src/dolphinviewcontroller.h
+++ b/src/views/dolphinviewcontroller.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINVIEWCONTROLLER_H
 #define DOLPHINVIEWCONTROLLER_H
 
-#include <dolphinview.h>
+#include <views/dolphinview.h>
 #include <kurl.h>
 #include <QtCore/QObject>
 #include <libdolphin_export.h>
diff --git a/src/selectionmanager.cpp b/src/views/selectionmanager.cpp
index 0d3efae09..0d3efae09 100644
--- a/src/selectionmanager.cpp
+++ b/src/views/selectionmanager.cpp
diff --git a/src/selectionmanager.h b/src/views/selectionmanager.h
index c2fcc88b4..c2fcc88b4 100644
--- a/src/selectionmanager.h
+++ b/src/views/selectionmanager.h
diff --git a/src/selectiontoggle.cpp b/src/views/selectiontoggle.cpp
index 6608b5821..6608b5821 100644
--- a/src/selectiontoggle.cpp
+++ b/src/views/selectiontoggle.cpp
diff --git a/src/selectiontoggle.h b/src/views/selectiontoggle.h
index 5519272b3..5519272b3 100644
--- a/src/selectiontoggle.h
+++ b/src/views/selectiontoggle.h
diff --git a/src/viewextensionsfactory.cpp b/src/views/viewextensionsfactory.cpp
index e5638c03e..e5638c03e 100644
--- a/src/viewextensionsfactory.cpp
+++ b/src/views/viewextensionsfactory.cpp
diff --git a/src/viewextensionsfactory.h b/src/views/viewextensionsfactory.h
index 9324932ac..9324932ac 100644
--- a/src/viewextensionsfactory.h
+++ b/src/views/viewextensionsfactory.h
diff --git a/src/viewmodecontroller.cpp b/src/views/viewmodecontroller.cpp
index 17d0ba61f..17d0ba61f 100644
--- a/src/viewmodecontroller.cpp
+++ b/src/views/viewmodecontroller.cpp
diff --git a/src/viewmodecontroller.h b/src/views/viewmodecontroller.h
index 27b8381cf..c7378d59a 100644
--- a/src/viewmodecontroller.h
+++ b/src/views/viewmodecontroller.h
@@ -20,10 +20,10 @@
 #ifndef VIEWMODECONTROLLER_H
 #define VIEWMODECONTROLLER_H
 
-#include <dolphinview.h>
 #include <kurl.h>
 #include <QObject>
 #include <libdolphin_export.h>
+#include <views/dolphinview.h>
 
 /**
  * @brief Allows the DolphinView to control the view implementations for the
diff --git a/src/zoomlevelinfo.cpp b/src/views/zoomlevelinfo.cpp
index 08e95e3ca..08e95e3ca 100644
--- a/src/zoomlevelinfo.cpp
+++ b/src/views/zoomlevelinfo.cpp
diff --git a/src/zoomlevelinfo.h b/src/views/zoomlevelinfo.h
index a6e92e653..a6e92e653 100644
--- a/src/zoomlevelinfo.h
+++ b/src/views/zoomlevelinfo.h