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

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bba1bf957162cede4ffa34a203bd2fc982b52662..4dc2476c7c237d3b380a36126107c54efd2dc091 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,27 +17,15 @@ endif (Nepomuk_FOUND)
 
 set(dolphinprivate_LIB_SRCS
     additionalinfoaccessor.cpp
 
 set(dolphinprivate_LIB_SRCS
     additionalinfoaccessor.cpp

-    dolphindetailsview.cpp
-    dolphindetailsviewexpander.cpp
-    dolphiniconsview.cpp
-    dolphincolumnview.cpp
-    dolphincolumnviewcontainer.cpp

     dolphindirlister.cpp
     dolphindirlister.cpp

-    dolphinfileitemdelegate.cpp

     dolphinmodel.cpp
     dolphinnewmenuobserver.cpp
     dolphinsortfilterproxymodel.cpp
     dolphinmodel.cpp
     dolphinnewmenuobserver.cpp
     dolphinsortfilterproxymodel.cpp

-    dolphincategorydrawer.cpp
-    dolphinview.cpp

     dolphinviewactionhandler.cpp
     dolphinviewactionhandler.cpp

-    dolphinviewautoscroller.cpp
-    dolphinviewcontroller.cpp

     dolphinremoteencoding.cpp
     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp
     dolphinremoteencoding.cpp
     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp

-    selectiontoggle.cpp
-    selectionmanager.cpp

     settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/dolphinsettings.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
     versioncontrol/pendingthreadsmaintainer.cpp
     versioncontrol/updateitemstatesthread.cpp
     versioncontrol/versioncontrolobserver.cpp

-    viewextensionsfactory.cpp
-    viewmodecontroller.cpp

     viewproperties.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
 )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS


@@ -101,7 +101,7 @@ set(dolphin_SRCS
     dolphinviewcontainer.cpp
     dolphindirlister.cpp
     dolphincontextmenu.cpp
     dolphinviewcontainer.cpp
     dolphindirlister.cpp
     dolphincontextmenu.cpp

-    filterbar.cpp
+    filterbar/filterbar.cpp

     main.cpp
     pixmapviewer.cpp
     panels/information/informationpanel.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
     statusbar/dolphinstatusbar.cpp
     statusbar/statusbarspaceinfo.cpp
     statusbar/statusbarmessagelabel.cpp

-    zoomlevelinfo.cpp
+    views/zoomlevelinfo.cpp

 )
 
 kde4_add_kcfg_files(dolphin_SRCS
 )
 
 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
     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
 
 set(kcm_dolphinnavigation_PART_SRCS
     settings/kcm/kcmdolphinnavigation.cpp

diff --git a/src/additionalinfoaccessor.h b/src/additionalinfoaccessor.h
index 51319a11cf88f93d7f8401483a1e3830c593374b..0a3d51459aa245f02accce45152f0aa4bafcbb94 100644 (file)
--- a/src/additionalinfoaccessor.h
+++ b/src/additionalinfoaccessor.h
@@ -20,9 +20,9 @@
 #ifndef ADDITIONALINFOACCESSOR_H
 #define ADDITIONALINFOACCESSOR_H
 
 #ifndef ADDITIONALINFOACCESSOR_H
 #define ADDITIONALINFOACCESSOR_H
 

-#include <dolphinview.h>

 #include <libdolphin_export.h>
 #include <kfileitemdelegate.h>
 #include <libdolphin_export.h>
 #include <kfileitemdelegate.h>

+#include <views/dolphinview.h>

 
 #include <QList>
 #include <QMap>
 
 #include <QList>
 #include <QMap>

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 9b49f7c89fa0bfadf1e0b4e9351cf1e10679b279..84ad9d632b6a1fb6faa11c4887f5e8831e2020ac 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -23,7 +23,6 @@
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
 #include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
 #include "settings/dolphinsettings.h"

-#include "dolphinview.h"

 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 


@@ -52,6 +51,9 @@
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
 
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
 

+#include "views/dolphinview.h"
+#include "views/viewmodecontroller.h"
+

 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index dfc171cf92d5a01e781294e477ab44eabc747e14..4d993865f24ab1acf5afb4328cbf36bca6ab4df1 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -22,7 +22,6 @@
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 

-#include "dolphinview.h"

 #include "panels/panel.h"
 
 #include <config-nepomuk.h>
 #include "panels/panel.h"
 
 #include <config-nepomuk.h>


@@ -33,7 +32,9 @@
 #include <kxmlguiwindow.h>
 #include <kactionmenu.h>
 
 #include <kxmlguiwindow.h>
 #include <kactionmenu.h>
 

-#include <QtCore/QList>
+#include "views/dolphinview.h"
+
+#include <QList>

 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 

diff --git a/src/dolphinnewmenu.cpp b/src/dolphinnewmenu.cpp
index 234f75f8183bbd534b4c417c3fc6d293ae9ffef7..5769e28adf296a6dd2620d11d5ee7096fefbbfc6 100644 (file)
--- a/src/dolphinnewmenu.cpp
+++ b/src/dolphinnewmenu.cpp
@@ -22,9 +22,9 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenuobserver.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenuobserver.h"

-#include "dolphinview.h"

 #include "dolphinviewcontainer.h"
 #include "statusbar/dolphinstatusbar.h"
 #include "dolphinviewcontainer.h"
 #include "statusbar/dolphinstatusbar.h"

+#include "views/dolphinview.h"

 
 #include <kactioncollection.h>
 #include <kio/job.h>
 
 #include <kactioncollection.h>
 #include <kio/job.h>

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 2dec262e11e5607a14cc553a3d7fe6604058965b..18ace8df54f8b42c409a771eb33990a1f193e27c 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -20,7 +20,6 @@
 #include "dolphinpart.h"
 #include "dolphinviewactionhandler.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinpart.h"
 #include "dolphinviewactionhandler.h"
 #include "dolphinsortfilterproxymodel.h"

-#include "dolphinview.h"

 #include "dolphinmodel.h"
 #include "dolphinnewmenuobserver.h"
 #include "dolphinremoteencoding.h"
 #include "dolphinmodel.h"
 #include "dolphinnewmenuobserver.h"
 #include "dolphinremoteencoding.h"


@@ -47,6 +46,7 @@
 #include <kinputdialog.h>
 
 #include "settings/dolphinsettings.h"
 #include <kinputdialog.h>
 
 #include "settings/dolphinsettings.h"

+#include "views/dolphinview.h"

 
 #include <QActionGroup>
 #include <QApplication>
 
 #include <QActionGroup>
 #include <QApplication>

diff --git a/src/dolphinsortfilterproxymodel.h b/src/dolphinsortfilterproxymodel.h
index bc101bd8ba143fadb67c2037c311324f35c580b1..3ae8a059cef20145c2bf7540488beb56474e6ad7 100644 (file)
--- a/src/dolphinsortfilterproxymodel.h
+++ b/src/dolphinsortfilterproxymodel.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINSORTFILTERPROXYMODEL_H
 #define DOLPHINSORTFILTERPROXYMODEL_H
 
 #ifndef DOLPHINSORTFILTERPROXYMODEL_H
 #define DOLPHINSORTFILTERPROXYMODEL_H
 

-#include <dolphinview.h>
+#include <views/dolphinview.h>

 #include <kdirsortfilterproxymodel.h>
 #include <libdolphin_export.h>
 
 #include <kdirsortfilterproxymodel.h>
 #include <libdolphin_export.h>
 

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 8b1d35ac9d0d42af9d86eda604ad49b61a87d188..d2eaa4d5125a74d5861c223eff6474ab800aca6d 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -21,8 +21,8 @@
 
 #include "additionalinfoaccessor.h"
 #include "settings/viewpropertiesdialog.h"
 
 #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>
 #include <konq_operations.h>
 
 #include <kaction.h>

diff --git a/src/dolphinviewactionhandler.h b/src/dolphinviewactionhandler.h
index dbe02a7066ee4bd2fc6e8c49a8b6716c62570458..05339ce3740cc928c822a9579d8e67178c1ab035 100644 (file)
--- a/src/dolphinviewactionhandler.h
+++ b/src/dolphinviewactionhandler.h
@@ -21,10 +21,10 @@
 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 

-#include "dolphinview.h"

 #include "libdolphin_export.h"
 #include <kactionmenu.h>
 #include <kselectaction.h>
 #include "libdolphin_export.h"
 #include <kactionmenu.h>
 #include <kselectaction.h>

+#include "views/dolphinview.h"

 #include <QtCore/QObject>
 
 class KToggleAction;
 #include <QtCore/QObject>
 
 class KToggleAction;

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index d11a4a9be94e8e7d36d7003a9f0134d70def34f6..24ab432725398a4f90105d084be864275130fd14 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -49,20 +49,20 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphinmodel.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphinmodel.h"

-#include "dolphincolumnview.h"
-#include "dolphinviewcontroller.h"

 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"

-#include "dolphindetailsview.h"
-#include "dolphiniconsview.h"

 #include "draganddrophelper.h"
 #include "draganddrophelper.h"

-#include "filterbar.h"
+#include "filterbar/filterbar.h"

 #include "search/dolphinsearchbox.h"
 #include "settings/dolphinsettings.h"
 #include "statusbar/dolphinstatusbar.h"
 #include "search/dolphinsearchbox.h"
 #include "settings/dolphinsettings.h"
 #include "statusbar/dolphinstatusbar.h"

-#include "viewmodecontroller.h"

 #include "viewproperties.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),
 
 DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     QWidget(parent),

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index c222e7a559f4d0df78bdb8b2e1c792dd93b8bc68..fe1ad8d6e08d95aa4a2f06d0550d4fd6648ca662 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -21,8 +21,6 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 

-#include "dolphinview.h"
-

 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
 #include <kglobalsettings.h>
 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
 #include <kglobalsettings.h>


@@ -36,6 +34,8 @@
 #include <QtGui/QBoxLayout>
 #include <QtGui/QWidget>
 
 #include <QtGui/QBoxLayout>
 #include <QtGui/QWidget>
 

+#include <views/dolphinview.h>
+

 class FilterBar;
 class KUrl;
 class DolphinModel;
 class FilterBar;
 class KUrl;
 class DolphinModel;

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index 88dca9b40b9fc29114eb52327e014f1ed0419f67..0cca59ac4d6d1428b7fbbab49a5af12b7977640e 100644 (file)
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -19,8 +19,6 @@
  ***************************************************************************/
 
 #include "draganddrophelper.h"
  ***************************************************************************/
 
 #include "draganddrophelper.h"

-#include "dolphiniconsview.h"
-#include "dolphinviewcontroller.h"

 
 #include <kdirmodel.h>
 #include <kfileitem.h>
 
 #include <kdirmodel.h>
 #include <kfileitem.h>


@@ -28,6 +26,9 @@
 #include <klocale.h>
 #include <konq_operations.h>
 
 #include <klocale.h>
 #include <konq_operations.h>
 

+#include "views/dolphiniconsview.h"
+#include "views/dolphinviewcontroller.h"
+

 #include <QAbstractItemView>
 #include <QAbstractProxyModel>
 #include <QtDBus>
 #include <QAbstractItemView>
 #include <QAbstractProxyModel>
 #include <QtDBus>

diff --git a/src/filterbar.cpp b/src/filterbar/filterbar.cpp
similarity index 100%
rename from src/filterbar.cpp
rename to src/filterbar/filterbar.cpp

diff --git a/src/filterbar.h b/src/filterbar/filterbar.h
similarity index 100%
rename from src/filterbar.h
rename to src/filterbar/filterbar.h

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 0542665d5bb0b9ee38dba917ff5358ea51b49df7..fb1b84fa7f8fcc67d2255a86b8fa407d65e5ca5e 100644 (file)
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -21,7 +21,6 @@
 
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"

-#include "dolphinview.h"

 #include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
 #include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"


@@ -44,6 +43,8 @@
 #include <QScrollBar>
 #include <QTimer>
 
 #include <QScrollBar>
 #include <QTimer>
 

+#include "views/dolphinview.h"
+

 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
     m_setLeafVisible(false),
 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
     m_setLeafVisible(false),

diff --git a/src/panels/folders/paneltreeview.cpp b/src/panels/folders/paneltreeview.cpp
index 58866d6c3129890dea0fb1139a899895dba9f4a3..69cf46cd622ca2841826fff7930ff8e1903a67bd 100644 (file)
--- a/src/panels/folders/paneltreeview.cpp
+++ b/src/panels/folders/paneltreeview.cpp
@@ -19,12 +19,11 @@
 
 #include "paneltreeview.h"
 
 
 #include "paneltreeview.h"
 

-#include "dolphinviewcontroller.h"

 #include "dolphinmodel.h"
 #include "draganddrophelper.h"
 #include "dolphinmodel.h"
 #include "draganddrophelper.h"

-#include "viewmodecontroller.h"

 
 #include <kfileitemdelegate.h>
 
 #include <kfileitemdelegate.h>

+#include <QListView>

 #include <QKeyEvent>
 #include <QPainter>
 #include <QHeaderView>
 #include <QKeyEvent>
 #include <QPainter>
 #include <QHeaderView>

diff --git a/src/settings/dolphin_directoryviewpropertysettings.kcfgc b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
index 753642f8cb57795f8bd651a4f4d433c0f76e834b..b938ab3e4304ab2f5c58199d98e334044b0386e4 100644 (file)
--- a/src/settings/dolphin_directoryviewpropertysettings.kcfgc
+++ b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
@@ -3,4 +3,4 @@ Singleton=false
 ClassName=ViewPropertySettings
 Mutators=true
 GlobalEnums=true
 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 1e1c6ed87f1554168b881a539082b57c761a0db7..d891558e1bf5dd603e3a47f66a145f4346b9c95d 100644 (file)
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -21,7 +21,6 @@
 
 #include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"
 
 #include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"

-#include "dolphinview.h"

 #include "dolphinviewcontainer.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphinviewcontainer.h"
 
 #include "dolphin_generalsettings.h"


@@ -39,6 +38,8 @@
 #include <QPushButton>
 #include <QRadioButton>
 
 #include <QPushButton>
 #include <QRadioButton>
 

+#include "views/dolphinview.h"
+

 StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
 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 aac28f0fd1b43e44039b712a6cd99e2326d09712..2a6265f2fd4d80bb66663cb4efdb6cfdae0e4dae 100644 (file)
--- 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 "dolphinfontrequester.h"
 #include <dolphin_columnmodesettings.h>
 #include "iconsizegroupbox.h"

-#include "zoomlevelinfo.h"

 
 #include <kdialog.h>
 #include <klocale.h>
 
 #include <kdialog.h>
 #include <klocale.h>


@@ -38,6 +37,8 @@
 #include <QSlider>
 #include <QRadioButton>
 
 #include <QSlider>
 #include <QRadioButton>
 

+#include <views/zoomlevelinfo.h>
+

 ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
     m_iconSizeGroupBox(0),
 ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
     m_iconSizeGroupBox(0),

diff --git a/src/settings/viewmodes/detailsviewsettingspage.cpp b/src/settings/viewmodes/detailsviewsettingspage.cpp
index 67cef32fee07a99cc8febaff66c685588082490e..253d12a799b15d16d97de94432c61a33b8348f3a 100644 (file)
--- 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 "iconsizegroupbox.h"
 #include "dolphinfontrequester.h"
 #include "dolphin_detailsmodesettings.h"

-#include "zoomlevelinfo.h"

 
 #include <kdialog.h>
 #include <klocale.h>
 
 #include <kdialog.h>
 #include <klocale.h>


@@ -36,7 +35,9 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QRadioButton>
 #include <QGridLayout>
 #include <QLabel>
 #include <QRadioButton>

-#include <QtGui/QSpinBox>
+#include <QSpinBox>
+
+#include <views/zoomlevelinfo.h>

 
 DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
 
 DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),

diff --git a/src/settings/viewmodes/iconsizegroupbox.cpp b/src/settings/viewmodes/iconsizegroupbox.cpp
index d8e0e889a989eecd99cd14ff8e4f008950a5bcb6..900c75b2c811a704928c90e58b218acd65fc64fa 100644 (file)
--- a/src/settings/viewmodes/iconsizegroupbox.cpp
+++ b/src/settings/viewmodes/iconsizegroupbox.cpp
@@ -29,7 +29,7 @@
 #include <QRect>
 #include <QSlider>
 
 #include <QRect>
 #include <QSlider>
 

-#include "zoomlevelinfo.h"
+#include <views/zoomlevelinfo.h>

 
 IconSizeGroupBox::IconSizeGroupBox(QWidget* parent) :
     QGroupBox(i18nc("@title:group", "Icon Size"), parent),
 
 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 059a4a84611f88ea2f776573092d978b13c2a937..a01b4a2db6e4b06be2adace39627a2c06f74aec2 100644 (file)
--- 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 "dolphinfontrequester.h"
 #include "settings/dolphinsettings.h"
 #include "iconsizegroupbox.h"

-#include "zoomlevelinfo.h"

 
 #include "dolphin_iconsmodesettings.h"
 
 
 #include "dolphin_iconsmodesettings.h"
 


@@ -41,6 +40,8 @@
 #include <QGridLayout>
 #include <QVBoxLayout>
 
 #include <QGridLayout>
 #include <QVBoxLayout>
 

+#include <views/zoomlevelinfo.h>
+

 IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
     m_iconSizeGroupBox(0),
 IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
     m_iconSizeGroupBox(0),

diff --git a/src/settings/viewmodes/iconsviewsettingspage.h b/src/settings/viewmodes/iconsviewsettingspage.h
index 17fda4e266e890b9cd7577b377f6552c483552dd..9a1a9e8b4a8bf414dff1593b94ced1df020d9801 100644 (file)
--- a/src/settings/viewmodes/iconsviewsettingspage.h
+++ b/src/settings/viewmodes/iconsviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef ICONSVIEWSETTINGSPAGE_H
 #define ICONSVIEWSETTINGSPAGE_H
 
 #ifndef ICONSVIEWSETTINGSPAGE_H
 #define ICONSVIEWSETTINGSPAGE_H
 

-#include <dolphiniconsview.h>
+#include <views/dolphiniconsview.h>

 #include "viewsettingspagebase.h"
 
 class DolphinFontRequester;
 #include "viewsettingspagebase.h"
 
 class DolphinFontRequester;

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 3941a61ccb4467f1d57779183c14ccedf21dbf23..6e4efab1b7a2f0640ee774bf219f5b4348e79cd7 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -21,7 +21,7 @@
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"

-#include "dolphinview.h"
+#include "views/dolphinview.h"

 #include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.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 684a807b862fe52495fa6ec3923ffd2f47bc8de2..e08d94948d0da29d85bff8ad72477228a3f48aad 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -20,7 +20,6 @@
 
 #include "dolphinstatusbar.h"
 
 
 #include "dolphinstatusbar.h"
 

-#include "dolphinview.h"

 #include "dolphin_generalsettings.h"
 
 #include <kiconloader.h>
 #include "dolphin_generalsettings.h"
 
 #include <kiconloader.h>


@@ -41,7 +40,8 @@
 #include <QToolButton>
 #include <QTimer>
 
 #include <QToolButton>
 #include <QTimer>
 

-#include "zoomlevelinfo.h"
+#include <views/dolphinview.h>
+#include <views/zoomlevelinfo.h>

 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     QWidget(parent),
 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     QWidget(parent),

diff --git a/src/viewproperties.h b/src/viewproperties.h
index 5179470222411dea93fa9b3fb0880e51f57f9699..bb476dc44a16b2a77a0b4a8be8a7694af28b9a65 100644 (file)
--- a/src/viewproperties.h
+++ b/src/viewproperties.h
@@ -21,7 +21,7 @@
 #ifndef VIEWPROPERTIES_H
 #define VIEWPROPERTIES_H
 
 #ifndef VIEWPROPERTIES_H
 #define VIEWPROPERTIES_H
 

-#include <dolphinview.h>
+#include <views/dolphinview.h>

 #include <kurl.h>
 #include <libdolphin_export.h>
 
 #include <kurl.h>
 #include <libdolphin_export.h>
 

diff --git a/src/dolphincategorydrawer.cpp b/src/views/dolphincategorydrawer.cpp
similarity index 100%
rename from src/dolphincategorydrawer.cpp
rename to src/views/dolphincategorydrawer.cpp

diff --git a/src/dolphincategorydrawer.h b/src/views/dolphincategorydrawer.h
similarity index 100%
rename from src/dolphincategorydrawer.h
rename to src/views/dolphincategorydrawer.h

diff --git a/src/dolphincolumnview.cpp b/src/views/dolphincolumnview.cpp
similarity index 100%
rename from src/dolphincolumnview.cpp
rename to src/views/dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.h b/src/views/dolphincolumnview.h
similarity index 100%
rename from src/dolphincolumnview.h
rename to src/views/dolphincolumnview.h

diff --git a/src/dolphincolumnviewcontainer.cpp b/src/views/dolphincolumnviewcontainer.cpp
similarity index 100%
rename from src/dolphincolumnviewcontainer.cpp
rename to src/views/dolphincolumnviewcontainer.cpp

diff --git a/src/dolphincolumnviewcontainer.h b/src/views/dolphincolumnviewcontainer.h
similarity index 100%
rename from src/dolphincolumnviewcontainer.h
rename to src/views/dolphincolumnviewcontainer.h

diff --git a/src/dolphindetailsview.cpp b/src/views/dolphindetailsview.cpp
similarity index 100%
rename from src/dolphindetailsview.cpp
rename to src/views/dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.h b/src/views/dolphindetailsview.h
similarity index 99%
rename from src/dolphindetailsview.h
rename to src/views/dolphindetailsview.h
index 1dff8fe59d3708f8b66f1529949f842e1a3cc9b5..3ac08d337e21e2bb1857d4bc3808d64e4e094666 100644 (file)
--- a/src/dolphindetailsview.h
+++ b/src/views/dolphindetailsview.h
@@ -21,9 +21,9 @@
 #ifndef DOLPHINDETAILSVIEW_H
 #define DOLPHINDETAILSVIEW_H
 
 #ifndef DOLPHINDETAILSVIEW_H
 #define DOLPHINDETAILSVIEW_H
 

-#include <dolphinview.h>

 #include <QTreeView>
 #include <libdolphin_export.h>
 #include <QTreeView>
 #include <libdolphin_export.h>

+#include <views/dolphinview.h>

 
 class DolphinViewController;
 class DolphinSortFilterProxyModel;
 
 class DolphinViewController;
 class DolphinSortFilterProxyModel;

diff --git a/src/dolphindetailsviewexpander.cpp b/src/views/dolphindetailsviewexpander.cpp
similarity index 100%
rename from src/dolphindetailsviewexpander.cpp
rename to src/views/dolphindetailsviewexpander.cpp

diff --git a/src/dolphindetailsviewexpander.h b/src/views/dolphindetailsviewexpander.h
similarity index 100%
rename from src/dolphindetailsviewexpander.h
rename to src/views/dolphindetailsviewexpander.h

diff --git a/src/dolphinfileitemdelegate.cpp b/src/views/dolphinfileitemdelegate.cpp
similarity index 100%
rename from src/dolphinfileitemdelegate.cpp
rename to src/views/dolphinfileitemdelegate.cpp

diff --git a/src/dolphinfileitemdelegate.h b/src/views/dolphinfileitemdelegate.h
similarity index 100%
rename from src/dolphinfileitemdelegate.h
rename to src/views/dolphinfileitemdelegate.h

diff --git a/src/dolphiniconsview.cpp b/src/views/dolphiniconsview.cpp
similarity index 100%
rename from src/dolphiniconsview.cpp
rename to src/views/dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.h b/src/views/dolphiniconsview.h
similarity index 100%
rename from src/dolphiniconsview.h
rename to src/views/dolphiniconsview.h

diff --git a/src/dolphinview.cpp b/src/views/dolphinview.cpp
similarity index 100%
rename from src/dolphinview.cpp
rename to src/views/dolphinview.cpp

diff --git a/src/dolphinview.h b/src/views/dolphinview.h
similarity index 100%
rename from src/dolphinview.h
rename to src/views/dolphinview.h

diff --git a/src/dolphinviewautoscroller.cpp b/src/views/dolphinviewautoscroller.cpp
similarity index 100%
rename from src/dolphinviewautoscroller.cpp
rename to src/views/dolphinviewautoscroller.cpp

diff --git a/src/dolphinviewautoscroller.h b/src/views/dolphinviewautoscroller.h
similarity index 100%
rename from src/dolphinviewautoscroller.h
rename to src/views/dolphinviewautoscroller.h

diff --git a/src/dolphinviewcontroller.cpp b/src/views/dolphinviewcontroller.cpp
similarity index 100%
rename from src/dolphinviewcontroller.cpp
rename to src/views/dolphinviewcontroller.cpp

diff --git a/src/dolphinviewcontroller.h b/src/views/dolphinviewcontroller.h
similarity index 99%
rename from src/dolphinviewcontroller.h
rename to src/views/dolphinviewcontroller.h
index 8481107700803e5604c4327599d204103b87ae20..6eed68e1a0e07880cad05cc686b953457974a9d3 100644 (file)
--- a/src/dolphinviewcontroller.h
+++ b/src/views/dolphinviewcontroller.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINVIEWCONTROLLER_H
 #define DOLPHINVIEWCONTROLLER_H
 
 #ifndef DOLPHINVIEWCONTROLLER_H
 #define DOLPHINVIEWCONTROLLER_H
 

-#include <dolphinview.h>
+#include <views/dolphinview.h>

 #include <kurl.h>
 #include <QtCore/QObject>
 #include <libdolphin_export.h>
 #include <kurl.h>
 #include <QtCore/QObject>
 #include <libdolphin_export.h>

diff --git a/src/selectionmanager.cpp b/src/views/selectionmanager.cpp
similarity index 100%
rename from src/selectionmanager.cpp
rename to src/views/selectionmanager.cpp

diff --git a/src/selectionmanager.h b/src/views/selectionmanager.h
similarity index 100%
rename from src/selectionmanager.h
rename to src/views/selectionmanager.h

diff --git a/src/selectiontoggle.cpp b/src/views/selectiontoggle.cpp
similarity index 100%
rename from src/selectiontoggle.cpp
rename to src/views/selectiontoggle.cpp

diff --git a/src/selectiontoggle.h b/src/views/selectiontoggle.h
similarity index 100%
rename from src/selectiontoggle.h
rename to src/views/selectiontoggle.h

diff --git a/src/viewextensionsfactory.cpp b/src/views/viewextensionsfactory.cpp
similarity index 100%
rename from src/viewextensionsfactory.cpp
rename to src/views/viewextensionsfactory.cpp

diff --git a/src/viewextensionsfactory.h b/src/views/viewextensionsfactory.h
similarity index 100%
rename from src/viewextensionsfactory.h
rename to src/views/viewextensionsfactory.h

diff --git a/src/viewmodecontroller.cpp b/src/views/viewmodecontroller.cpp
similarity index 100%
rename from src/viewmodecontroller.cpp
rename to src/views/viewmodecontroller.cpp

diff --git a/src/viewmodecontroller.h b/src/views/viewmodecontroller.h
similarity index 99%
rename from src/viewmodecontroller.h
rename to src/views/viewmodecontroller.h
index 27b8381cfbd891def7e5fd8bbc06e8b640354694..c7378d59ad759ad172baed9fe98de78cdbb75bcd 100644 (file)
--- a/src/viewmodecontroller.h
+++ b/src/views/viewmodecontroller.h
@@ -20,10 +20,10 @@
 #ifndef VIEWMODECONTROLLER_H
 #define VIEWMODECONTROLLER_H
 
 #ifndef VIEWMODECONTROLLER_H
 #define VIEWMODECONTROLLER_H
 

-#include <dolphinview.h>

 #include <kurl.h>
 #include <QObject>
 #include <libdolphin_export.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
 
 /**
  * @brief Allows the DolphinView to control the view implementations for the

diff --git a/src/zoomlevelinfo.cpp b/src/views/zoomlevelinfo.cpp
similarity index 100%
rename from src/zoomlevelinfo.cpp
rename to src/views/zoomlevelinfo.cpp

diff --git a/src/zoomlevelinfo.h b/src/views/zoomlevelinfo.h
similarity index 100%
rename from src/zoomlevelinfo.h
rename to src/views/zoomlevelinfo.h