From 929931b060435686d8d7a0d9a745f045a28b445b Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Mon, 10 Dec 2007 12:34:56 +0000 Subject: [PATCH] Use Xesam ontology instead of NIE. Since Strigi uses Xesam and we have no mapping yet this does make much more sense. svn path=/trunk/KDE/kdebase/apps/; revision=746846 --- src/CMakeLists.txt | 3 ++- src/dolphinmodel.cpp | 5 +++-- src/metadatawidget.cpp | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a07cdf255..7c73a7a3b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,13 +36,14 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS}) find_package(Nepomuk) +find_package(Soprano) macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES}) if (Nepomuk_FOUND) - target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES}) + target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES}) endif (Nepomuk_FOUND) diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp index 8a5b6c732..1b94e0339 100644 --- a/src/dolphinmodel.cpp +++ b/src/dolphinmodel.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #endif #include @@ -331,7 +332,7 @@ quint32 DolphinModel::ratingForIndex(const QModelIndex& index) const DolphinModel* dolphinModel = static_cast(index.model()); KFileItem item = dolphinModel->itemForIndex(index); if (!item.isNull()) { - const Nepomuk::Resource resource(item.url().url(), Nepomuk::NFO::File()); + const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File()); rating = resource.rating(); } return rating; @@ -349,7 +350,7 @@ QString DolphinModel::tagsForIndex(const QModelIndex& index) const DolphinModel* dolphinModel = static_cast(index.model()); KFileItem item = dolphinModel->itemForIndex(index); if (!item.isNull()) { - const Nepomuk::Resource resource(item.url().url(), Nepomuk::NFO::File()); + const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File()); const QList tags = resource.tags(); QStringList stringList; foreach (const Nepomuk::Tag& tag, tags) { diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp index 5c510f088..8db305e93 100644 --- a/src/metadatawidget.cpp +++ b/src/metadatawidget.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #endif @@ -132,7 +133,7 @@ void MetaDataWidget::setFiles(const KUrl::List& urls) bool first = true; QList fileRes; Q_FOREACH( KUrl url, urls ) { - Nepomuk::Resource file( url.url(), Nepomuk::NFO::File() ); + Nepomuk::Resource file( url.url(), Soprano::Vocabulary::Xesam::File() ); // file.setLocation(url.url()); d->files.insert( url, file ); fileRes.append( file ); -- 2.47.3