diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-07-28 00:16:59 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-14 19:39:47 +0200 |
commit | 1ed00f9949c9507768db0973c61b9648a8a58575 (patch) | |
tree | d34878e8368219ff90e97a8a72b1c62a4789fab8 /src/bookmarks/bookmarksmanager.h | |
parent | Fixed focus regression. (diff) | |
download | rekonq-1ed00f9949c9507768db0973c61b9648a8a58575.tar.xz |
Manually importing Yoann merge 2260
PLease, check if I did something wrong..
Diffstat (limited to 'src/bookmarks/bookmarksmanager.h')
-rw-r--r-- | src/bookmarks/bookmarksmanager.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h index 72ea1c3c..eeb5391d 100644 --- a/src/bookmarks/bookmarksmanager.h +++ b/src/bookmarks/bookmarksmanager.h @@ -271,6 +271,8 @@ public: void registerBookmarkPanel(BookmarksPanel *panel); void removeBookmarkPanel(BookmarksPanel *panel); + KBookmark bookmarkForUrl(const KUrl &url); + signals: /** * @short This signal is emitted when an url has to be loaded @@ -305,6 +307,9 @@ private slots: private: QList<KBookmark> find(QList<KBookmark> list, const KBookmark &bookmark, QString text); + QString titleForBookmarkUrl(const KBookmark &bookmark, const QString &url); + KBookmark bookmarkForUrl(const KBookmark &bookmark, const KUrl &url); + KBookmarkManager *m_manager; BookmarkOwner *m_owner; KActionCollection *m_actionCollection; |