X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/571e40b057c8fef7da6c5be70683898b349708bb..e8686083b9de4e83a448ddfd36ea57de7b9e2cd8:/src/metadataloader.cpp

diff --git a/src/metadataloader.cpp b/src/metadataloader.cpp
index 61c809feb..2914720a8 100644
--- a/src/metadataloader.cpp
+++ b/src/metadataloader.cpp
@@ -18,9 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+#include <config-kmetadata.h>
+
 #include "metadataloader.h"
 
-#ifdef HAVE_NEPOMUK
+#ifdef HAVE_KMETADATA
 #include <kmetadata/kmetadata.h>
 #endif
 
@@ -29,15 +31,16 @@
 
 MetadataLoader::MetadataLoader()
 {
-#ifdef HAVE_NEPOMUK
+#ifdef HAVE_KMETADATA
     if (Nepomuk::KMetaData::ResourceManager::instance()->init()) {
         m_up = false;
         Nepomuk::KMetaData::ResourceManager::instance()->setAutoSync(false);
-    } else {
+    }
+    else {
         m_up = true;
     }
 #else
-    m_up = true;
+    m_up = false;
 #endif
 }
 
@@ -49,11 +52,11 @@ bool MetadataLoader::storageUp() {
     return m_up;
 }
 
-QString MetadataLoader::getAnnotation(const KUrl& file)
+QString MetadataLoader::annotation(const KUrl& file)
 {
-#ifdef HAVE_NEPOMUK
+#ifdef HAVE_KMETADATA
     if(m_up)
-        return Nepomuk::KMetaData::File(file.url()).getAnnotation();
+        return Nepomuk::KMetaData::File(file.url()).getComment();
     else
 #endif
         return QString();
@@ -61,9 +64,10 @@ QString MetadataLoader::getAnnotation(const KUrl& file)
 
 void MetadataLoader::setAnnotation(const KUrl& file, const QString& annotation)
 {
-#ifdef HAVE_NEPOMUK
-    if(m_up)
-        Nepomuk::KMetaData::File(file.url()).setAnnotation(annotation);
+#ifdef HAVE_KMETADATA
+    if (m_up) {
+        Nepomuk::KMetaData::File(file.url()).setComment(annotation);
+    }
 #endif
 }