Sourcecode hierarchy cleanup: Move further files from src to src/views

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

src/CMakeLists.txt

@@ -16,16 +16,6 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    additionalinfoaccessor.cpp
-    dolphindirlister.cpp
-    dolphinmodel.cpp
-    dolphinnewmenuobserver.cpp
-    dolphinsortfilterproxymodel.cpp
-    dolphinviewactionhandler.cpp
-    dolphinremoteencoding.cpp
-    draganddrophelper.cpp
-    folderexpander.cpp
-    renamedialog.cpp
     settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/dolphinsettings.cpp
@@ -37,8 +27,9 @@ set(dolphinprivate_LIB_SRCS
     versioncontrol/pendingthreadsmaintainer.cpp
     versioncontrol/updateitemstatesthread.cpp
     versioncontrol/versioncontrolobserver.cpp
-    viewproperties.cpp
+    views/additionalinfoaccessor.cpp
     views/dolphincategorydrawer.cpp
+    views/dolphindirlister.cpp
     views/dolphinview.cpp
     views/dolphindetailsview.cpp
     views/dolphindetailsviewexpander.cpp
@@ -46,12 +37,21 @@ set(dolphinprivate_LIB_SRCS
     views/dolphiniconsview.cpp
     views/dolphincolumnview.cpp
     views/dolphincolumnviewcontainer.cpp
+    views/dolphinmodel.cpp
+    views/dolphinnewmenuobserver.cpp
+    views/dolphinremoteencoding.cpp
+    views/dolphinsortfilterproxymodel.cpp
+    views/dolphinviewactionhandler.cpp
     views/dolphinviewautoscroller.cpp
     views/dolphinviewcontroller.cpp
+    views/draganddrophelper.cpp
+    views/folderexpander.cpp
     views/selectiontoggle.cpp
     views/selectionmanager.cpp
+    views/renamedialog.cpp
     views/viewextensionsfactory.cpp
     views/viewmodecontroller.cpp
+    views/viewproperties.cpp
     views/zoomlevelinfo.cpp
 )
 
@@ -99,7 +99,6 @@ set(dolphin_SRCS
     dolphinmainwindow.cpp
     dolphinnewmenu.cpp
     dolphinviewcontainer.cpp
-    dolphindirlister.cpp
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp
     main.cpp
@@ -135,6 +134,7 @@ set(dolphin_SRCS
     statusbar/dolphinstatusbar.cpp
     statusbar/statusbarspaceinfo.cpp
     statusbar/statusbarmessagelabel.cpp
+    views/dolphindirlister.cpp
     views/zoomlevelinfo.cpp
 )
 

src/dolphinmainwindow.cpp

@@ -20,23 +20,24 @@
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"
-#include "dolphinviewactionhandler.h"
-#include "dolphinremoteencoding.h"
 
 #include <config-nepomuk.h>
 
 #include "dolphinapplication.h"
 #include "dolphincontextmenu.h"
 #include "dolphinnewmenu.h"
-#include "settings/dolphinsettings.h"
-#include "settings/dolphinsettingsdialog.h"
 #include "dolphinviewcontainer.h"
+#include "mainwindowadaptor.h"
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
-#include "mainwindowadaptor.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
 #include "statusbar/dolphinstatusbar.h"
-#include "viewproperties.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/draganddrophelper.h"
+#include "views/viewproperties.h"
 
 #ifndef Q_OS_WIN
 #include "panels/terminal/terminalpanel.h"
@@ -44,7 +45,6 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
-#include "draganddrophelper.h"
 
 #include <kaction.h>
 #include <kactioncollection.h>

src/dolphinnewmenu.cpp

@@ -21,9 +21,9 @@
 #include "dolphinnewmenu.h"
 
 #include "dolphinmainwindow.h"
-#include "dolphinnewmenuobserver.h"
 #include "dolphinviewcontainer.h"
 #include "statusbar/dolphinstatusbar.h"
+#include "views/dolphinnewmenuobserver.h"
 #include "views/dolphinview.h"
 
 #include <kactioncollection.h>

src/dolphinpart.cpp

@@ -18,11 +18,6 @@
 */
 
 #include "dolphinpart.h"
-#include "dolphinviewactionhandler.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "dolphinmodel.h"
-#include "dolphinnewmenuobserver.h"
-#include "dolphinremoteencoding.h"
 
 #include <kfileitemlistproperties.h>
 #include <konq_operations.h>
@@ -47,6 +42,11 @@
 
 #include "settings/dolphinsettings.h"
 #include "views/dolphinview.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinsortfilterproxymodel.h"
+#include "views/dolphinmodel.h"
+#include "views/dolphinnewmenuobserver.h"
+#include "views/dolphinremoteencoding.h"
 
 #include <QActionGroup>
 #include <QApplication>

src/dolphinviewcontainer.cpp

@@ -48,21 +48,21 @@
 #include <krun.h>
 
 #include "dolphin_generalsettings.h"
-#include "dolphinmodel.h"
 #include "dolphinmainwindow.h"
-#include "dolphindirlister.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "draganddrophelper.h"
 #include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"
 #include "settings/dolphinsettings.h"
 #include "statusbar/dolphinstatusbar.h"
-#include "viewproperties.h"
 #include "views/dolphincolumnview.h"
 #include "views/dolphindetailsview.h"
+#include "views/dolphindirlister.h"
+#include "views/dolphinsortfilterproxymodel.h"
+#include "views/draganddrophelper.h"
 #include "views/dolphiniconsview.h"
+#include "views/dolphinmodel.h"
 #include "views/dolphinviewcontroller.h"
 #include "views/viewmodecontroller.h"
+#include "views/viewproperties.h"
 
 DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     QWidget(parent),

src/panels/folders/folderspanel.cpp

@@ -19,14 +19,9 @@
 
 #include "folderspanel.h"
 
-#include "dolphinmodel.h"
-#include "dolphinsortfilterproxymodel.h"
 #include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
-#include "draganddrophelper.h"
-#include "folderexpander.h"
-#include "renamedialog.h"
 #include "paneltreeview.h"
 #include "treeviewcontextmenu.h"
 
@@ -43,7 +38,12 @@
 #include <QScrollBar>
 #include <QTimer>
 
-#include "views/dolphinview.h"
+#include <views/draganddrophelper.h>
+#include <views/dolphinmodel.h>
+#include <views/dolphinsortfilterproxymodel.h>
+#include <views/dolphinview.h>
+#include <views/folderexpander.h>
+#include <views/renamedialog.h>
 
 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),

src/panels/folders/paneltreeview.cpp

@@ -19,9 +19,6 @@
 
 #include "paneltreeview.h"
 
-#include "dolphinmodel.h"
-#include "draganddrophelper.h"
-
 #include <kfileitemdelegate.h>
 #include <QListView>
 #include <QKeyEvent>
@@ -29,6 +26,9 @@
 #include <QHeaderView>
 #include <QScrollBar>
 
+#include <views/dolphinmodel.h>
+#include <views/draganddrophelper.h>
+
 PanelTreeView::PanelTreeView(QWidget* parent) :
     KTreeView(parent)
 {

src/panels/places/placespanel.cpp

@@ -21,10 +21,10 @@
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"
-#include "draganddrophelper.h"
 #include <kfileitem.h>
 #include <konq_operations.h>
 #include "settings/dolphinsettings.h"
+#include "views/draganddrophelper.h"
 
 PlacesPanel::PlacesPanel(QWidget* parent) :
     KFilePlacesView(parent),

src/settings/additionalinfodialog.cpp

@@ -19,13 +19,14 @@
 
 #include "additionalinfodialog.h"
 
-#include "additionalinfoaccessor.h"
 #include <klocale.h>
 
 #include <QCheckBox>
 #include <QLabel>
 #include <QVBoxLayout>
 
+#include "views/additionalinfoaccessor.h"
+
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
                                            KFileItemDelegate::InformationList infoList) :
     KDialog(parent),

src/settings/applyviewpropsjob.cpp

@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 #include "applyviewpropsjob.h"
-#include "viewproperties.h"
+#include <views/viewproperties.h>
 
 ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
                                      const ViewProperties& viewProps) :

src/settings/general/behaviorsettingspage.cpp

@@ -23,7 +23,6 @@
 #include "dolphin_generalsettings.h"
 #include <settings/filemetadataconfigurationdialog.h>
 #include <settings/dolphinsettings.h>
-#include <viewproperties.h>
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -35,6 +34,8 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 
+#include <views/viewproperties.h>
+
 const bool CONFIRM_TRASH = false;
 const bool CONFIRM_DELETE = true;
 

src/settings/viewpropertiesdialog.cpp

@@ -23,10 +23,8 @@
 #include "additionalinfodialog.h"
 #include "views/dolphinview.h"
 #include "settings/dolphinsettings.h"
-#include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
-#include "viewproperties.h"
 #include "viewpropsprogressinfo.h"
 
 #include <config-nepomuk.h>
@@ -54,6 +52,9 @@
 #include <QRadioButton>
 #include <QBoxLayout>
 
+#include <views/dolphinsortfilterproxymodel.h>
+#include <views/viewproperties.h>
+
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),
     m_isDirty(false),

src/settings/viewpropsprogressinfo.cpp

@@ -20,17 +20,17 @@
 
 #include "viewpropsprogressinfo.h"
 #include "applyviewpropsjob.h"
-#include "viewproperties.h"
 
 #include <QtGui/QLabel>
 #include <QtGui/QProgressBar>
 #include <QtCore/QTimer>
 #include <QtGui/QBoxLayout>
 
-#include <assert.h>
 #include <klocale.h>
 #include <kio/jobclasses.h>
 
+#include <views/viewproperties.h>
+
 ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
                                              const KUrl& dir,
                                              const ViewProperties& viewProps) :

src/tooltips/tooltipmanager.cpp

@@ -19,9 +19,6 @@
 
 #include "tooltipmanager.h"
 
-#include "dolphinmodel.h"
-#include "dolphinsortfilterproxymodel.h"
-
 #include "filemetadatatooltip.h"
 #include <kicon.h>
 #include <kio/previewjob.h>
@@ -33,6 +30,9 @@
 #include <QScrollBar>
 #include <QTimer>
 
+#include <views/dolphinmodel.h>
+#include <views/dolphinsortfilterproxymodel.h>
+
 ToolTipManager::ToolTipManager(QAbstractItemView* parent,
                                DolphinSortFilterProxyModel* model) :
     QObject(parent),

src/versioncontrol/versioncontrolobserver.cpp

@@ -19,7 +19,6 @@
 
 #include "versioncontrolobserver.h"
 
-#include <dolphinmodel.h>
 #include "dolphin_versioncontrolsettings.h"
 
 #include <kdirlister.h>
@@ -36,6 +35,8 @@
 #include <QMutexLocker>
 #include <QTimer>
 
+#include <views/dolphinmodel.h>
+
 VersionControlObserver::VersionControlObserver(QAbstractItemView* view) :
     QObject(view),
     m_pendingItemStatesUpdate(false),

src/views/dolphinfileitemdelegate.cpp

@@ -19,7 +19,7 @@
 
 #include "dolphinfileitemdelegate.h"
 
-#include <dolphinmodel.h>
+#include "dolphinmodel.h"
 #include <kfileitem.h>
 #include <kicon.h>
 #include <kiconloader.h>

src/views/dolphinfileitemdelegate.h

@@ -20,8 +20,8 @@
 #ifndef DOLPHINFILEITEMDELEGATE_H
 #define DOLPHINFILEITEMDELEGATE_H
 
-#include <dolphinmodel.h>
 #include <kfileitemdelegate.h>
+#include <views/dolphinmodel.h>
 
 class QAbstractProxyModel;