Adapt Dolphin Nepomuk support to namespace changes.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7cd886c31144f7c892869e3bc72944f5bc7104d..04b4b9bd743216a49aa9b5c5d4e000f634024e80 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -86,15 +86,15 @@ qt4_add_dbus_adaptor(dolphin_SRCS
    dolphinmainwindow.h DolphinMainWindow)
 kde4_add_executable(dolphin ${dolphin_SRCS})
 
    dolphinmainwindow.h DolphinMainWindow)
 kde4_add_executable(dolphin ${dolphin_SRCS})
 

-find_package(KMetaData)
-macro_bool_to_01(KMetaData_FOUND HAVE_KMETADATA)
+find_package(Nepomuk)
+macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK)

 
 

-configure_file(config-kmetadata.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmetadata.h )
+configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )

 target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate)
 
 target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate)
 

-if (KMetaData_FOUND)
-  target_link_libraries(dolphin ${KMETADATA_LIBRARIES})
-endif (KMetaData_FOUND)
+if (Nepomuk_FOUND)
+  target_link_libraries(dolphin ${NEPOMUK_LIBRARIES})
+endif (Nepomuk_FOUND)

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

diff --git a/src/config-kmetadata.h.cmake b/src/config-kmetadata.h.cmake
deleted file mode 100644 (file)
index bb046d5..0000000
--- a/src/config-kmetadata.h.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#cmakedefine HAVE_KMETADATA 

diff --git a/src/config-nepomuk.h.cmake b/src/config-nepomuk.h.cmake
new file mode 100644 (file)
index 0000000..fe7364f
--- /dev/null
+++ b/src/config-nepomuk.h.cmake
@@ -0,0 +1 @@
+#cmakedefine HAVE_NEPOMUK

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 8467a545a07791fee858aa2d029ed07f637568bc..0dc26b63b3bb99dbbdaf8b0fac735429a3cedd40 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 

-#include <config-kmetadata.h>
+#include "config-nepomuk.h"

 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"


@@ -1000,7 +1000,7 @@ void DolphinMainWindow::init()
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }

-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK

     if (!MetaDataWidget::metaDataAvailable())
         activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
 #endif
     if (!MetaDataWidget::metaDataAvailable())
         activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
 #endif

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 7d7545ccd2e13d6f321e4b0690fae77e566725c2..caced0d171ea6cd64b6aec1e33618bbf500b758b 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -19,7 +19,7 @@
 
 #include "infosidebarpage.h"
 
 
 #include "infosidebarpage.h"
 

-#include <config-kmetadata.h>
+#include "config-nepomuk.h"

 
 #include <kfileplacesmodel.h>
 #include <klocale.h>
 
 #include <kfileplacesmodel.h>
 #include <klocale.h>

diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index b95d6deadf1910dc257789e8a9c597944a423ae3..c8fe1e438d18f5483ed792e5898b3da2d5270965 100644 (file)
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -19,7 +19,7 @@
 
 #include "metadatawidget.h"
 
 
 #include "metadatawidget.h"
 

-#include <config-kmetadata.h>
+#include <config-nepomuk.h>

 
 #include <klocale.h>
 
 
 #include <klocale.h>
 


@@ -27,23 +27,20 @@
 #include <QtGui/QGridLayout>
 #include <QtGui/QTextEdit>
 
 #include <QtGui/QGridLayout>
 #include <QtGui/QTextEdit>
 

-#ifdef HAVE_KMETADATA
-#include <kmetadata/kmetadatatagwidget.h>
-#include <kmetadata/resourcemanager.h>
-#include <kmetadata/resource.h>
-#include <kmetadata/variant.h>
-#include <kmetadata/kratingwidget.h>
+#ifdef HAVE_NEPOMUK
+#include <nepomuk/kmetadatatagwidget.h>
+#include <nepomuk/resourcemanager.h>
+#include <nepomuk/resource.h>
+#include <nepomuk/variant.h>
+#include <nepomuk/kratingwidget.h>
+#include <nepomuk/global.h>

 #endif
 
 #endif
 

-// FIXME: these should be replaced by using KMetaData::File once it is available again
-static const char* s_nfoFile = "http://ont.semanticdesktop.org/2007/03/22/nfo#File";
-static const char* s_nfoFileUrl = "http://ont.semanticdesktop.org/2007/03/22/nfo#fileUrl";
-

 
 bool MetaDataWidget::metaDataAvailable()
 {
 
 bool MetaDataWidget::metaDataAvailable()
 {

-#ifdef HAVE_KMETADATA
-    return !Nepomuk::KMetaData::ResourceManager::instance()->init();
+#ifdef HAVE_NEPOMUK
+    return !Nepomuk::ResourceManager::instance()->init();

 #else
     return false;
 #endif
 #else
     return false;
 #endif


@@ -53,18 +50,18 @@ bool MetaDataWidget::metaDataAvailable()
 class MetaDataWidget::Private
 {
 public:
 class MetaDataWidget::Private
 {
 public:

-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK

     void loadComment(const QString& comment);
 
     void loadComment(const QString& comment);
 

-    QMap<KUrl, Nepomuk::KMetaData::Resource> files;
+    QMap<KUrl, Nepomuk::Resource> files;

 
     QTextEdit* editComment;
     KRatingWidget* ratingWidget;
 
     QTextEdit* editComment;
     KRatingWidget* ratingWidget;

-    Nepomuk::KMetaData::TagWidget* tagWidget;
+    Nepomuk::TagWidget* tagWidget;

 #endif
 };
 
 #endif
 };
 

-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK

 void MetaDataWidget::Private::loadComment(const QString& comment)
 {
     editComment->blockSignals(true);
 void MetaDataWidget::Private::loadComment(const QString& comment)
 {
     editComment->blockSignals(true);


@@ -83,11 +80,11 @@ void MetaDataWidget::Private::loadComment(const QString& comment)
 MetaDataWidget::MetaDataWidget(QWidget* parent) :
     QWidget(parent)
 {
 MetaDataWidget::MetaDataWidget(QWidget* parent) :
     QWidget(parent)
 {

-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK

     d = new Private;
     d->editComment = new QTextEdit(this);
     d->ratingWidget = new KRatingWidget(this);
     d = new Private;
     d->editComment = new QTextEdit(this);
     d->ratingWidget = new KRatingWidget(this);

-    d->tagWidget = new Nepomuk::KMetaData::TagWidget(this);
+    d->tagWidget = new Nepomuk::TagWidget(this);

     connect(d->ratingWidget, SIGNAL(ratingChanged(unsigned int)), this, SLOT(slotRatingChanged(unsigned int)));
     connect(d->editComment, SIGNAL(textChanged()), this, SLOT(slotCommentChanged()));
 
     connect(d->ratingWidget, SIGNAL(ratingChanged(unsigned int)), this, SLOT(slotRatingChanged(unsigned int)));
     connect(d->editComment, SIGNAL(textChanged()), this, SLOT(slotCommentChanged()));
 


@@ -128,13 +125,13 @@ void MetaDataWidget::setFile(const KUrl& url)
 
 void MetaDataWidget::setFiles(const KUrl::List& urls)
 {
 
 void MetaDataWidget::setFiles(const KUrl::List& urls)
 {

-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK

     // FIXME: replace with KMetaData::File once we have it again
     d->files.clear();
     bool first = true;
     // FIXME: replace with KMetaData::File once we have it again
     d->files.clear();
     bool first = true;

-    QList<Nepomuk::KMetaData::Resource> fileRes;
+    QList<Nepomuk::Resource> fileRes;

     Q_FOREACH( KUrl url, urls ) {
     Q_FOREACH( KUrl url, urls ) {

-        Nepomuk::KMetaData::Resource file( url.url(), s_nfoFile );
+        Nepomuk::Resource file( url.url(), Nepomuk::NFO::File() );

 //    file.setLocation(url.url());
         d->files.insert( url, file );
         fileRes.append( file );
 //    file.setLocation(url.url());
         d->files.insert( url, file );
         fileRes.append( file );


@@ -163,8 +160,8 @@ void MetaDataWidget::setFiles(const KUrl::List& urls)
 
 void MetaDataWidget::slotCommentChanged()
 {
 
 void MetaDataWidget::slotCommentChanged()
 {

-#ifdef HAVE_KMETADATA
-    for ( QMap<KUrl, Nepomuk::KMetaData::Resource>::iterator it = d->files.begin();
+#ifdef HAVE_NEPOMUK
+    for ( QMap<KUrl, Nepomuk::Resource>::iterator it = d->files.begin();

           it != d->files.end(); ++it ) {
         it.value().setDescription(d->editComment->toPlainText());
     }
           it != d->files.end(); ++it ) {
         it.value().setDescription(d->editComment->toPlainText());
     }


@@ -174,8 +171,8 @@ void MetaDataWidget::slotCommentChanged()
 
 void MetaDataWidget::slotRatingChanged(unsigned int rating)
 {
 
 void MetaDataWidget::slotRatingChanged(unsigned int rating)
 {

-#ifdef HAVE_KMETADATA
-    for ( QMap<KUrl, Nepomuk::KMetaData::Resource>::iterator it = d->files.begin();
+#ifdef HAVE_NEPOMUK
+    for ( QMap<KUrl, Nepomuk::Resource>::iterator it = d->files.begin();

           it != d->files.end(); ++it ) {
         it.value().setRating(rating);
     }
           it != d->files.end(); ++it ) {
         it.value().setRating(rating);
     }


@@ -185,7 +182,7 @@ void MetaDataWidget::slotRatingChanged(unsigned int rating)
 
 bool MetaDataWidget::eventFilter(QObject* obj, QEvent* event)
 {
 
 bool MetaDataWidget::eventFilter(QObject* obj, QEvent* event)
 {

-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK

     if (obj == d->editComment->viewport() || obj == d->editComment) {
         if (event->type() == QEvent::FocusOut) {
             // make sure the info text is displayed again
     if (obj == d->editComment->viewport() || obj == d->editComment) {
         if (event->type() == QEvent::FocusOut) {
             // make sure the info text is displayed again