┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron J. Seigo <[email protected]>2007-02-22 18:49:26 +0000
committerAaron J. Seigo <[email protected]>2007-02-22 18:49:26 +0000
commit571e40b057c8fef7da6c5be70683898b349708bb (patch)
tree9e325da3e0352bb343475bcde23c3cb8e1a53b14 /src
parentcefcbf0ef0e960db68021715d1c600b901be8501 (diff)
make nepomuk support optional, mostly through a bunch of non-existent ifdef's =)
svn path=/trunk/KDE/kdebase/apps/; revision=636289
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/metadataloader.cpp11
2 files changed, 13 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c39fa1d9..6411a719e 100644
--- 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})
-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})
diff --git a/src/metadataloader.cpp b/src/metadataloader.cpp
index f43220a69..61c809feb 100644
--- a/src/metadataloader.cpp
+++ b/src/metadataloader.cpp
@@ -20,18 +20,25 @@
#include "metadataloader.h"
+#ifdef HAVE_NEPOMUK
#include <kmetadata/kmetadata.h>
+#endif
+
#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;
}
+#else
+ m_up = true;
+#endif
}
MetadataLoader::~MetadataLoader()
@@ -44,15 +51,19 @@ bool MetadataLoader::storageUp() {
QString MetadataLoader::getAnnotation(const KUrl& file)
{
+#ifdef HAVE_NEPOMUK
if(m_up)
return Nepomuk::KMetaData::File(file.url()).getAnnotation();
else
+#endif
return QString();
}
void MetadataLoader::setAnnotation(const KUrl& file, const QString& annotation)
{
+#ifdef HAVE_NEPOMUK
if(m_up)
Nepomuk::KMetaData::File(file.url()).setAnnotation(annotation);
+#endif
}