Dolphin: Use the Nepomuk2::FileMetaDatConfigWidget

Instead of the KFileMetaDataConfigurationWidget

REVIEW: 111294

diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index 99f799dddd5e36d56a37e7abfaa8d4677f6f3c6a..0d1395b046d36a7cfccbdcd8a290633a74cd5a9f 100644 (file)
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -19,7 +19,12 @@
 
 #include "filemetadataconfigurationdialog.h"
 
+#ifndef HAVE_NEPOMUK
 #include <kfilemetadataconfigurationwidget.h>
+#else
+#include <nepomuk2/filemetadataconfigwidget.h>
+#endif
+
 #include <KLocale>
 #include <QLabel>
 #include <QVBoxLayout>
@@ -34,13 +39,17 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent
     setButtons(KDialog::Ok | KDialog::Cancel);
     setDefaultButton(KDialog::Ok);
 
-
     m_descriptionLabel = new QLabel(i18nc("@label::textbox",
                                           "Select which data should "
                                           "be shown:"), this);
     m_descriptionLabel->setWordWrap(true);
 
+#ifndef HAVE_NEPOMUK
     m_configWidget = new KFileMetaDataConfigurationWidget(this);
+#else
+    m_configWidget = new Nepomuk2::FileMetaDataConfigWidget(this);
+#endif
+
 
     QWidget* mainWidget = new QWidget(this);
     QVBoxLayout* topLayout = new QVBoxLayout(mainWidget);

diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h
index bd28f71c8307f58721c087b7768ff9644623bf27..e897d245b7aba7a2167dad5c6c8f0a06f07bf146 100644 (file)
--- a/src/panels/information/filemetadataconfigurationdialog.h
+++ b/src/panels/information/filemetadataconfigurationdialog.h
@@ -22,9 +22,17 @@
 
 #include <KDialog>
 #include <KFileItem>
+#include "config-nepomuk.h"
 
-class QLabel;
+#ifndef HAVE_NEPOMUK
 class KFileMetaDataConfigurationWidget;
+#else
+namespace Nepomuk2 {
+    class FileMetaDataConfigWidget;
+}
+#endif
+
+class QLabel;
 
 /**
  * @brief Dialog which allows to configure which meta data should be shown
@@ -63,7 +71,11 @@ protected slots:
 
 private:
     QLabel* m_descriptionLabel;
+#ifndef HAVE_NEPOMUK
     KFileMetaDataConfigurationWidget* m_configWidget;
+#else
+    Nepomuk2::FileMetaDataConfigWidget* m_configWidget;
+#endif
 };
 
 #endif