make nepomuk support optional, mostly through a bunch of non-existent ifdef's =)

svn path=/trunk/KDE/kdebase/apps/; revision=636289

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c39fa1d97468f0d9fe208d1be85b682c395699c..6411a719ebccbbc1532595b8c9e76ed8bd201236 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -65,7 +65,8 @@ qt4_add_dbus_adaptor(dolphin_SRCS
    dolphinmainwindow.h DolphinMainWindow)
 kde4_add_executable(dolphin ${dolphin_SRCS})
 
    dolphinmainwindow.h DolphinMainWindow)
 kde4_add_executable(dolphin ${dolphin_SRCS})
 

-target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} konq kmetadata)
+#set(KDE4_KMETADATA kmetadata)
+target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KMETADATA} konq)

 
 install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 
 
 install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 

diff --git a/src/metadataloader.cpp b/src/metadataloader.cpp
index f43220a6977f8ccbb2ece0394bc53115fdf18325..61c809feb6d944f79b898e60b859181de28797ca 100644 (file)
--- a/src/metadataloader.cpp
+++ b/src/metadataloader.cpp
@@ -20,18 +20,25 @@
 
 #include "metadataloader.h"
 
 
 #include "metadataloader.h"
 

+#ifdef HAVE_NEPOMUK

 #include <kmetadata/kmetadata.h>
 #include <kmetadata/kmetadata.h>

+#endif
+

 #include <kurl.h>
 #include <QString>
 
 MetadataLoader::MetadataLoader()
 {
 #include <kurl.h>
 #include <QString>
 
 MetadataLoader::MetadataLoader()
 {

+#ifdef HAVE_NEPOMUK

     if (Nepomuk::KMetaData::ResourceManager::instance()->init()) {
         m_up = false;
         Nepomuk::KMetaData::ResourceManager::instance()->setAutoSync(false);
     } else {
         m_up = true;
     }
     if (Nepomuk::KMetaData::ResourceManager::instance()->init()) {
         m_up = false;
         Nepomuk::KMetaData::ResourceManager::instance()->setAutoSync(false);
     } else {
         m_up = true;
     }

+#else
+    m_up = true;
+#endif

 }
 
 MetadataLoader::~MetadataLoader()
 }
 
 MetadataLoader::~MetadataLoader()


@@ -44,15 +51,19 @@ bool MetadataLoader::storageUp() {
 
 QString MetadataLoader::getAnnotation(const KUrl& file)
 {
 
 QString MetadataLoader::getAnnotation(const KUrl& file)
 {

+#ifdef HAVE_NEPOMUK

     if(m_up)
         return Nepomuk::KMetaData::File(file.url()).getAnnotation();
     else
     if(m_up)
         return Nepomuk::KMetaData::File(file.url()).getAnnotation();
     else

+#endif

         return QString();
 }
 
 void MetadataLoader::setAnnotation(const KUrl& file, const QString& annotation)
 {
         return QString();
 }
 
 void MetadataLoader::setAnnotation(const KUrl& file, const QString& annotation)
 {

+#ifdef HAVE_NEPOMUK

     if(m_up)
         Nepomuk::KMetaData::File(file.url()).setAnnotation(annotation);
     if(m_up)
         Nepomuk::KMetaData::File(file.url()).setAnnotation(annotation);

+#endif

 }
 
 }