diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-01-08 16:49:31 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-01-08 16:49:31 +0100 |
| commit | 14299bca34712251a215a7d20feecab44426632b (patch) | |
| tree | c5786687daf755bb488ca9dbaa156ca45eefe8a5 /src/bookmarks | |
| parent | Restore Tab Windows when Restoring the Session (diff) | |
| download | rekonq-14299bca34712251a215a7d20feecab44426632b.tar.xz | |
Revert "Rekonq Migration to Nepomuk2"
This reverts commit 6d2519d373350b5e904fb421d688a665dd42c0c1.
This let rekonq compile again. Nepomuk2 will be added back
when KDE 4.10 will be released.
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, 13 insertions, 7 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 329fd0bc..ba2d8f63 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -52,8 +52,8 @@ #include "resourcelinkdialog.h" // Nepomuk Includes -#include <Nepomuk2/Resource> -#include <Nepomuk2/Vocabulary/NFO> +#include <Nepomuk/Resource> +#include <Nepomuk/Vocabulary/NFO> #endif @@ -221,9 +221,9 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) { parent = BookmarkManager::self()->rootGroup(); #ifdef HAVE_NEPOMUK - Nepomuk2::Resource nfoResource; + Nepomuk::Resource nfoResource; nfoResource = ((QUrl)currentUrl()); - nfoResource.addType(Nepomuk2::Vocabulary::NFO::Website()); + nfoResource.addType(Nepomuk::Vocabulary::NFO::Website()); nfoResource.setLabel(currentTitle()); #endif } @@ -327,9 +327,9 @@ void BookmarkOwner::editBookmark(KBookmark bookmark) #ifdef HAVE_NEPOMUK void BookmarkOwner::fancyBookmark(KBookmark bookmark) { - Nepomuk2::Resource nfoResource = (KUrl)bookmark.url(); + Nepomuk::Resource nfoResource = (KUrl)bookmark.url(); - QPointer<Nepomuk2::ResourceLinkDialog> r = new Nepomuk2::ResourceLinkDialog(nfoResource); + QPointer<Nepomuk::ResourceLinkDialog> r = new Nepomuk::ResourceLinkDialog(nfoResource); r->exec(); r->deleteLater(); @@ -373,7 +373,7 @@ bool BookmarkOwner::deleteBookmark(const KBookmark &bookmark) bmg.deleteBookmark(bookmark); #ifdef HAVE_NEPOMUK - Nepomuk2::Resource nfoResource(bookmark.url()); + Nepomuk::Resource nfoResource(bookmark.url()); nfoResource.remove(); #endif m_manager->emitChanged(bmg); diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h index 5be30853..6a18c237 100644 --- a/src/bookmarks/bookmarkowner.h +++ b/src/bookmarks/bookmarkowner.h @@ -34,6 +34,9 @@ // 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 2ae74b5c..69cde758 100644 --- a/src/bookmarks/bookmarkscontextmenu.cpp +++ b/src/bookmarks/bookmarkscontextmenu.cpp @@ -28,6 +28,9 @@ // Self Includes #include "bookmarkscontextmenu.h" +// Nepomuk config include +#include <config-nepomuk.h> + // Local Includes #include "bookmarkowner.h" #include "bookmarkmanager.h" |