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

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

5 files changed, 10 insertions, 7 deletions

diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 8899c4861..9a56c2bca 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/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),
diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 9250226e9..252ac588d 100644
--- a/src/settings/applyviewpropsjob.cpp
+++ b/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) :
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 0d7a4a0ab..f1f05b8bd 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/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;
 
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 6e4efab1b..7830616d0 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/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),
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index c073d3d46..436dcdef6 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/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) :