Sourcecode hierarchy cleanup: Move folders "tooltips" and "versioncontrol" into ...

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9602272caeb387d8a1e8a717037e5b80862e48bb..021edee38a4de3316fd01c2a3ff0106eefa9209d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,11 +22,6 @@ set(dolphinprivate_LIB_SRCS
     settings/filemetadataconfigurationdialog.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp
     settings/filemetadataconfigurationdialog.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp

-    tooltips/filemetadatatooltip.cpp
-    tooltips/tooltipmanager.cpp
-    versioncontrol/pendingthreadsmaintainer.cpp
-    versioncontrol/updateitemstatesthread.cpp
-    versioncontrol/versioncontrolobserver.cpp

     views/additionalinfoaccessor.cpp
     views/dolphincategorydrawer.cpp
     views/dolphindirlister.cpp
     views/additionalinfoaccessor.cpp
     views/dolphincategorydrawer.cpp
     views/dolphindirlister.cpp


@@ -46,9 +41,14 @@ set(dolphinprivate_LIB_SRCS
     views/dolphinviewcontroller.cpp
     views/draganddrophelper.cpp
     views/folderexpander.cpp
     views/dolphinviewcontroller.cpp
     views/draganddrophelper.cpp
     views/folderexpander.cpp

+    views/renamedialog.cpp

     views/selectiontoggle.cpp
     views/selectionmanager.cpp
     views/selectiontoggle.cpp
     views/selectionmanager.cpp

-    views/renamedialog.cpp
+    views/tooltips/filemetadatatooltip.cpp
+    views/tooltips/tooltipmanager.cpp
+    views/versioncontrol/pendingthreadsmaintainer.cpp
+    views/versioncontrol/updateitemstatesthread.cpp
+    views/versioncontrol/versioncontrolobserver.cpp

     views/viewextensionsfactory.cpp
     views/viewmodecontroller.cpp
     views/viewproperties.cpp
     views/viewextensionsfactory.cpp
     views/viewmodecontroller.cpp
     views/viewproperties.cpp


@@ -90,7 +90,7 @@ install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR})
 
 install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart)
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart)
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

-install(FILES versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})

 
 ##########################################
 
 
 ##########################################
 

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

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

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

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

diff --git a/src/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
similarity index 100%
rename from src/versioncontrol/fileviewversioncontrolplugin.desktop
rename to src/views/versioncontrol/fileviewversioncontrolplugin.desktop

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

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

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

diff --git a/src/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h
similarity index 98%
rename from src/versioncontrol/updateitemstatesthread.h
rename to src/views/versioncontrol/updateitemstatesthread.h
index 8467c87d7e2313b625f8cbb015c13d96fc98ad1f..9fac6192cb8d4264d21c761ecd705b33d22f4b4f 100644 (file)
--- a/src/versioncontrol/updateitemstatesthread.h
+++ b/src/views/versioncontrol/updateitemstatesthread.h
@@ -21,7 +21,7 @@
 #define UPDATEITEMSTATESTHREAD_H
 
 #include <libdolphin_export.h>
 #define UPDATEITEMSTATESTHREAD_H
 
 #include <libdolphin_export.h>

-#include <versioncontrol/versioncontrolobserver.h>
+#include <views/versioncontrol/versioncontrolobserver.h>

 
 #include <QMutex>
 #include <QThread>
 
 #include <QMutex>
 #include <QThread>

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

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