From 05a4d27813e302a2f7e8f713b26d55116e6c98c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20Br=C3=BCns?= Date: Sun, 14 Apr 2019 14:46:51 +0200 Subject: [PATCH] Remove last traces of KFileMetaDataWidget from information panel Summary: The whole information panel is not included when Baloo is not found, so there is no need for the HAVE_BALOO guards. KFileMetaDataWidget and KFileMetaDataConfigurationWidget were never part of KF5, see https://git.reviewboard.kde.org/r/113153/ Test Plan: ctest Reviewers: #frameworks, apol, ngraham, #dolphin, elvisangelaccio Reviewed By: #dolphin, elvisangelaccio Subscribers: elvisangelaccio, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D20513 --- src/panels/information/filemetadataconfigurationdialog.h | 6 +----- src/panels/information/informationpanelcontent.h | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h index 04357783c..0a57cf29f 100644 --- a/src/panels/information/filemetadataconfigurationdialog.h +++ b/src/panels/information/filemetadataconfigurationdialog.h @@ -24,19 +24,15 @@ #include #include -#ifndef HAVE_BALOO -class KFileMetaDataConfigurationWidget; -#else namespace Baloo { class FileMetaDataConfigWidget; } -#endif class QLabel; /** * @brief Dialog which allows to configure which meta data should be shown - * in the KFileMetaDataWidget. + * in the Baloo:FileMetaDataWidget. */ class FileMetaDataConfigurationDialog : public QDialog { diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index 83fb3d80b..4f88b597e 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -40,13 +40,9 @@ namespace KIO { class PreviewJob; } -#ifndef HAVE_BALOO -class KFileMetaDataWidget; -#else namespace Baloo { class FileMetaDataWidget; } -#endif /** * @brief Manages the widgets that display the meta information @@ -138,11 +134,7 @@ private: PixmapViewer* m_preview; PhononWidget* m_phononWidget; QLabel* m_nameLabel; -#ifndef HAVE_BALOO - KFileMetaDataWidget* m_metaDataWidget; -#else Baloo::FileMetaDataWidget* m_metaDataWidget; -#endif QScrollArea* m_metaDataArea; PlacesItemModel* m_placesItemModel; -- 2.47.3