After some discussions at http://reviewboard.kde.org/r/1938 it turned out that moving KMetaDataWidget and KMetaDataConfigurationDialog to kdelibs should be postponed to KDE 4.5. The main reason is that adding application specific properties is not possible with the current API in a generic way. Also the topic how to hide properties application specific is an open point...

So now all adjustments from the review have been adapted to the Dolphin code. After KDE 4.4 has been released some refactoring will be done so that the open topics above are handled in a nice way.

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

1 files changed, 4 insertions, 14 deletions

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 854af58ef..831a6e78b 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -47,21 +47,11 @@
 
 #include "dolphin_informationpanelsettings.h"
 #include "settings/dolphinsettings.h"
-#include "metadatawidget.h"
-#include "metadataconfigurationdialog.h"
+#include "kmetadatawidget.h"
+#include "kmetadataconfigurationdialog.h"
 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
-/**
- * Helper function for sorting items with qSort() in
- * InformationPanelContent::contextMenu().
- */
-bool lessThan(const QAction* action1, const QAction* action2)
-{
-    return action1->text() < action2->text();
-}
-
-
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     Panel(parent),
     m_item(),
@@ -117,7 +107,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_preview->setVisible(showPreview);
     m_previewSeparator->setVisible(showPreview);
 
-    m_metaDataWidget = new MetaDataWidget(parent);
+    m_metaDataWidget = new KMetaDataWidget(parent);
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 
     // Encapsulate the MetaDataWidget inside a container that has a dummy widget
@@ -302,7 +292,7 @@ void InformationPanelContent::configureSettings()
         m_previewSeparator->setVisible(isChecked);
         InformationPanelSettings::setShowPreview(isChecked);
     } else if (action == configureAction) {
-        MetaDataConfigurationDialog dialog(m_metaDataWidget, this, Qt::Dialog);
+        KMetaDataConfigurationDialog dialog(m_metaDataWidget, this, Qt::Dialog);
         dialog.exec();
     }