From dedebed4683014f8604d2319f266c7990ab53daf Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Fri, 28 Jun 2013 19:08:30 +0530 Subject: [PATCH] Dolphin: Use the Nepomuk2::FileMetaDatConfigWidget Instead of the KFileMetaDataConfigurationWidget REVIEW: 111294 --- .../filemetadataconfigurationdialog.cpp | 11 ++++++++++- .../information/filemetadataconfigurationdialog.h | 14 +++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp index 99f799dddd..0d1395b046 100644 --- a/src/panels/information/filemetadataconfigurationdialog.cpp +++ b/src/panels/information/filemetadataconfigurationdialog.cpp @@ -19,7 +19,12 @@ #include "filemetadataconfigurationdialog.h" +#ifndef HAVE_NEPOMUK #include +#else +#include +#endif + #include #include #include @@ -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 bd28f71c83..e897d245b7 100644 --- a/src/panels/information/filemetadataconfigurationdialog.h +++ b/src/panels/information/filemetadataconfigurationdialog.h @@ -22,9 +22,17 @@ #include #include +#include "config-nepomuk.h" + +#ifndef HAVE_NEPOMUK +class KFileMetaDataConfigurationWidget; +#else +namespace Nepomuk2 { + class FileMetaDataConfigWidget; +} +#endif class QLabel; -class KFileMetaDataConfigurationWidget; /** * @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