Move the FileMetaDataConfigurationDialog from "settings" to "panels/information"...

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8bcce2529d95938ee40a551613ad142c10b9182..e7ac06c63dd1879decb547597401c109f5f0051e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,7 +18,6 @@ set(dolphinprivate_LIB_SRCS
     settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/dolphinsettings.cpp
-    settings/filemetadataconfigurationdialog.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp
     views/additionalinfoaccessor.cpp
@@ -103,6 +102,7 @@ set(dolphin_SRCS
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp
     main.cpp
+    panels/information/filemetadataconfigurationdialog.cpp
     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
     panels/information/pixmapviewer.cpp

diff --git a/src/settings/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
similarity index 100%
rename from src/settings/filemetadataconfigurationdialog.cpp
rename to src/panels/information/filemetadataconfigurationdialog.cpp

diff --git a/src/settings/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h
similarity index 96%
rename from src/settings/filemetadataconfigurationdialog.h
rename to src/panels/information/filemetadataconfigurationdialog.h
index 6cbfc6cc2f3ac934fca0c1f5ad8ede69c90d1041..dd9265c258dd0d6ad048c12aa23a751095135762 100644 (file)
--- a/src/settings/filemetadataconfigurationdialog.h
+++ b/src/panels/information/filemetadataconfigurationdialog.h
@@ -22,7 +22,6 @@
 
 #include <kdialog.h>
 #include <kfileitem.h>
-#include <libdolphin_export.h>
 
 class QLabel;
 class KFileMetaDataConfigurationWidget;
@@ -31,7 +30,7 @@ class KFileMetaDataConfigurationWidget;
  * @brief Dialog which allows to configure which meta data should be shown
  *        in the KFileMetaDataWidget.
  */
-class LIBDOLPHINPRIVATE_EXPORT FileMetaDataConfigurationDialog : public KDialog
+class FileMetaDataConfigurationDialog : public KDialog
 {
     Q_OBJECT
 

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index f8a72fb70401177bdbe9441af4f174fbbc10e2c6..591c47ff7390d933c415be38e49d495e7b35c879 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -49,8 +49,8 @@
 #include <QVBoxLayout>
 
 #include "dolphin_informationpanelsettings.h"
+#include "filemetadataconfigurationdialog.h"
 #include "settings/dolphinsettings.h"
-#include "settings/filemetadataconfigurationdialog.h"
 #include "phononwidget.h"
 #include "pixmapviewer.h"
 

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 542fa109397a1a74f9702bde86328546cd37ae87..6d9fa9c0e11d32f84fe0ab4c6c29ae4b8f454692 100644 (file)
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -21,7 +21,6 @@
 #include "behaviorsettingspage.h"
 
 #include "dolphin_generalsettings.h"
-#include <settings/filemetadataconfigurationdialog.h>
 #include <settings/dolphinsettings.h>
 
 #include <kdialog.h>