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/bookmarkprovider.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/bookmarkprovider.h')
| -rw-r--r-- | src/bookmarks/bookmarkprovider.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bookmarks/bookmarkprovider.h b/src/bookmarks/bookmarkprovider.h index 6f2d8b8e..3f7a5c52 100644 --- a/src/bookmarks/bookmarkprovider.h +++ b/src/bookmarks/bookmarkprovider.h @@ -54,6 +54,7 @@ class KUrl; class QAction; class QPoint; + /** * This class represent the interface to rekonq bookmarks system. * All rekonq needs (Bookmarks Menu, Bookmarks Toolbar) is provided @@ -123,11 +124,10 @@ public Q_SLOTS: * @param caller caller that modified the bookmarks * @see KBookmarkManager::changed */ - void slotBookmarksChanged(const QString &groupAddress, const QString &caller); + void slotBookmarksChanged(); void fillBookmarkBar(BookmarkToolBar *toolBar); private Q_SLOTS: - void slotAddBookmark(); void slotPanelChanged(); Q_SIGNALS: |