diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:32:28 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:32:28 +0200 |
| commit | a4c70a0ffdba0c84664944645b12778f5142320b (patch) | |
| tree | 3087d9447698506dfa61d4f5b6b190f1b15f5616 /src/bookmarks/bookmarkowner.h | |
| parent | Code Review. (diff) | |
| parent | Fix compile again ... (diff) | |
| download | rekonq-a4c70a0ffdba0c84664944645b12778f5142320b.tar.xz | |
Merge commit 'refs/merge-requests/197' of git://gitorious.org/rekonq/mainline into m197
Conflicts:
src/bookmarks/bookmarkprovider.h
I also changed a iconmanager header inclusion :)
Diffstat (limited to 'src/bookmarks/bookmarkowner.h')
| -rw-r--r-- | src/bookmarks/bookmarkowner.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h index 795ccbf0..febff3b0 100644 --- a/src/bookmarks/bookmarkowner.h +++ b/src/bookmarks/bookmarkowner.h @@ -114,14 +114,15 @@ public: public Q_SLOTS: void setCurrentBookmark(const KBookmark &bookmark); + void unsetCurrentBookmark(); void openBookmark(const KBookmark &bookmark = KBookmark()); void openBookmarkInNewTab(const KBookmark &bookmark = KBookmark()); void openBookmarkInNewWindow(const KBookmark &bookmark = KBookmark()); void openBookmarkFolder(const KBookmark &bookmark = KBookmark()); - void bookmarkCurrentPage(const KBookmark &bookmark = KBookmark()); - void newBookmarkFolder(const KBookmark &bookmark = KBookmark()); - void newSeparator(const KBookmark &bookmark = KBookmark()); + KBookmark bookmarkCurrentPage(const KBookmark &bookmark = KBookmark()); + KBookmarkGroup newBookmarkFolder(const KBookmark &bookmark = KBookmark()); + KBookmark newSeparator(const KBookmark &bookmark = KBookmark()); void copyLink(const KBookmark &bookmark = KBookmark()); void editBookmark(KBookmark bookmark = KBookmark()); bool deleteBookmark(KBookmark bookmark = KBookmark()); |