From 6d2519d373350b5e904fb421d688a665dd42c0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= Date: Mon, 7 Jan 2013 12:30:23 -0500 Subject: Rekonq Migration to Nepomuk2 Ran the Nepomuk migration script and added a directory with code that has not yet been ported to Nepomuk2. Also did some CMake changes to be able to drop the config-nepomuk.h.cmake file. REVIEW: 108152 --- src/bookmarks/bookmarkowner.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/bookmarks/bookmarkowner.cpp') diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index ba2d8f63..329fd0bc 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -52,8 +52,8 @@ #include "resourcelinkdialog.h" // Nepomuk Includes -#include -#include +#include +#include #endif @@ -221,9 +221,9 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) { parent = BookmarkManager::self()->rootGroup(); #ifdef HAVE_NEPOMUK - Nepomuk::Resource nfoResource; + Nepomuk2::Resource nfoResource; nfoResource = ((QUrl)currentUrl()); - nfoResource.addType(Nepomuk::Vocabulary::NFO::Website()); + nfoResource.addType(Nepomuk2::Vocabulary::NFO::Website()); nfoResource.setLabel(currentTitle()); #endif } @@ -327,9 +327,9 @@ void BookmarkOwner::editBookmark(KBookmark bookmark) #ifdef HAVE_NEPOMUK void BookmarkOwner::fancyBookmark(KBookmark bookmark) { - Nepomuk::Resource nfoResource = (KUrl)bookmark.url(); + Nepomuk2::Resource nfoResource = (KUrl)bookmark.url(); - QPointer r = new Nepomuk::ResourceLinkDialog(nfoResource); + QPointer r = new Nepomuk2::ResourceLinkDialog(nfoResource); r->exec(); r->deleteLater(); @@ -373,7 +373,7 @@ bool BookmarkOwner::deleteBookmark(const KBookmark &bookmark) bmg.deleteBookmark(bookmark); #ifdef HAVE_NEPOMUK - Nepomuk::Resource nfoResource(bookmark.url()); + Nepomuk2::Resource nfoResource(bookmark.url()); nfoResource.remove(); #endif m_manager->emitChanged(bmg); -- cgit v1.2.1