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

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

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

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>

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) :

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;
 

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>

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>

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>
 

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>

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;

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),

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;

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>

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),

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>

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

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),

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),

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),

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),

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),

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;

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"

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),

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>
 

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;

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>

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