diff options
| author | Oscar Blumberg <[email protected]> | 2007-02-22 20:15:20 +0000 |
|---|---|---|
| committer | Oscar Blumberg <[email protected]> | 2007-02-22 20:15:20 +0000 |
| commit | 9c8e7f4e43d23c6d014ca4ffe2083ad8cc737753 (patch) | |
| tree | a3d8eda5adf69cd9cd6fd88cc0112e3192ab4eb1 /src/metadataloader.cpp | |
| parent | 571e40b057c8fef7da6c5be70683898b349708bb (diff) | |
Add libkmetadata detection and minor fixes
SVN_SILENT
svn path=/trunk/KDE/kdebase/apps/; revision=636328
Diffstat (limited to 'src/metadataloader.cpp')
| -rw-r--r-- | src/metadataloader.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/metadataloader.cpp b/src/metadataloader.cpp index 61c809feb..2269a4374 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,7 +31,7 @@ MetadataLoader::MetadataLoader() { -#ifdef HAVE_NEPOMUK +#ifdef HAVE_KMETADATA if (Nepomuk::KMetaData::ResourceManager::instance()->init()) { m_up = false; Nepomuk::KMetaData::ResourceManager::instance()->setAutoSync(false); @@ -37,7 +39,7 @@ MetadataLoader::MetadataLoader() m_up = true; } #else - m_up = true; + m_up = false; #endif } @@ -51,7 +53,7 @@ bool MetadataLoader::storageUp() { QString MetadataLoader::getAnnotation(const KUrl& file) { -#ifdef HAVE_NEPOMUK +#ifdef HAVE_KMETADATA if(m_up) return Nepomuk::KMetaData::File(file.url()).getAnnotation(); else @@ -61,7 +63,7 @@ QString MetadataLoader::getAnnotation(const KUrl& file) void MetadataLoader::setAnnotation(const KUrl& file, const QString& annotation) { -#ifdef HAVE_NEPOMUK +#ifdef HAVE_KMETADATA if(m_up) Nepomuk::KMetaData::File(file.url()).setAnnotation(annotation); #endif |