diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-02-10 10:10:45 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-02-10 10:10:45 +0100 |
| commit | 09983747f71fd7bd8f8dc0cece1fe3b4a996ef72 (patch) | |
| tree | 91e843d5e6242af8c4d7cee3722d4eddca97524a /src/bookmarks | |
| parent | SVN_SILENT made messages (.desktop file) (diff) | |
| download | rekonq-09983747f71fd7bd8f8dc0cece1fe3b4a996ef72.tar.xz | |
Restore rekonq migration to nepomuk2
Being kde 4.10 been released, we are ready to. I yet could not
understand if this compiles (without nepomuk) in 4.9.
CCMAIL:david.narvaez@computer.org
CCMAIL:me@vhanda.in
REVIEW: 108152
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/bookmarkowner.cpp | 14 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkowner.h | 3 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkscontextmenu.cpp | 3 |
3 files changed, 7 insertions, 13 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index f1f0aefb..11c3585d 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -52,8 +52,8 @@ #include "resourcelinkdialog.h" // Nepomuk Includes -#include <Nepomuk/Resource> -#include <Nepomuk/Vocabulary/NFO> +#include <Nepomuk2/Resource> +#include <Nepomuk2/Vocabulary/NFO> #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<Nepomuk::ResourceLinkDialog> r = new Nepomuk::ResourceLinkDialog(nfoResource); + QPointer<Nepomuk2::ResourceLinkDialog> 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); diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h index c149a6e1..5626373b 100644 --- a/src/bookmarks/bookmarkowner.h +++ b/src/bookmarks/bookmarkowner.h @@ -34,9 +34,6 @@ // Rekonq Includes #include "rekonq_defines.h" -// Nepomuk config include -#include <config-nepomuk.h> - // KDE Includes #include <KAction> #include <KBookmarkOwner> diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp index 69cde758..2ae74b5c 100644 --- a/src/bookmarks/bookmarkscontextmenu.cpp +++ b/src/bookmarks/bookmarkscontextmenu.cpp @@ -28,9 +28,6 @@ // Self Includes #include "bookmarkscontextmenu.h" -// Nepomuk config include -#include <config-nepomuk.h> - // Local Includes #include "bookmarkowner.h" #include "bookmarkmanager.h" |