diff --git a/kio/kfile/kfilemetadataconfigurationwidget.cpp b/kio/kfile/kfilemetadataconfigurationwidget.cpp index a8c14a26..d43465ce 100644 --- a/kio/kfile/kfilemetadataconfigurationwidget.cpp +++ b/kio/kfile/kfilemetadataconfigurationwidget.cpp @@ -108,10 +108,7 @@ void KFileMetaDataConfigurationWidget::Private::addItem(const QString& uri) KConfig config("kmetainformationrc", KConfig::NoGlobals); KConfigGroup settings = config.group("Show"); - const QString label = (m_provider == 0) - ? KFileMetaInfo::name(uri) - : m_provider->label(uri); - + const QString label = KFileMetaInfo::name(uri); QListWidgetItem* item = new QListWidgetItem(label, m_metaDataList); item->setData(Qt::UserRole, uri); const bool show = settings.readEntry(uri, true); diff --git a/kio/kfile/kfilemetadataprovider.cpp b/kio/kfile/kfilemetadataprovider.cpp index c8b36685..65c54b8c 100644 --- a/kio/kfile/kfilemetadataprovider.cpp +++ b/kio/kfile/kfilemetadataprovider.cpp @@ -86,11 +86,6 @@ void KFileMetaDataProvider::setItems(const KFileItemList& items) emit loadingFinished(); } -QString KFileMetaDataProvider::label(const QString& metaDataUri) const -{ - return KFileMetaInfo::name(metaDataUri); -} - KFileItemList KFileMetaDataProvider::items() const { return m_fileItems; diff --git a/kio/kfile/kfilemetadataprovider_p.h b/kio/kfile/kfilemetadataprovider_p.h index 447ed72a..32b4c873 100644 --- a/kio/kfile/kfilemetadataprovider_p.h +++ b/kio/kfile/kfilemetadataprovider_p.h @@ -51,12 +51,6 @@ public: void setItems(const KFileItemList& items); KFileItemList items() const; - /** - * @return Translated string for the label of the meta data represented - * by \p metaDataUri. - */ - QString label(const QString& metaDataUri) const; - /** * @return Meta data for the items that have been set by * KFileMetaDataProvider::setItems(). The method should diff --git a/kio/kfile/kfilemetadatawidget.cpp b/kio/kfile/kfilemetadatawidget.cpp index 3781638f..f387ede0 100644 --- a/kio/kfile/kfilemetadatawidget.cpp +++ b/kio/kfile/kfilemetadatawidget.cpp @@ -191,7 +191,7 @@ void KFileMetaDataWidget::Private::slotLoadingFinished() if (value.isEmpty()) { continue; } - QString itemLabel = m_provider->label(key); + QString itemLabel = KFileMetaInfo::name(key); itemLabel.append(QLatin1Char(':')); // Create label