diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-11 12:11:42 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-11 12:11:42 +0200 |
| commit | e8f6b6380347f29e0981c1c92834fbf9b1a98696 (patch) | |
| tree | e0e4760237cfc40fcf9c639cf98d47493a0d2183 /src/bookmarks | |
| parent | Fix includes, as pointed out by Krazy (diff) | |
| parent | This commit aims to fix all troubles with favicons retrieving. (diff) | |
| download | rekonq-e8f6b6380347f29e0981c1c92834fbf9b1a98696.tar.xz | |
Merge branch 'iconFixes2'
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/bookmarkowner.cpp | 3 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkprovider.cpp | 2 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 8a05d646..e1b9a567 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -195,8 +195,7 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) else parent = selected.parentGroup(); - newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl()), - Application::iconManager()->iconForUrl(currentUrl()).name()); + newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl()) ); parent.moveBookmark(newBk, selected); } else diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index 7cd48825..3e2d2814 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -237,7 +237,7 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar) { KBookmarkAction *action = new KBookmarkAction(bookmark, m_owner, this); action->setIconText(action->iconText().replace('&', "&&")); - action->setIcon(Application::iconManager()->iconForUrl(bookmark.url())); + action->setIcon(Application::iconManager()->iconForUrl( KUrl(bookmark.url()) )); connect(action, SIGNAL(hovered()), toolBar, SLOT(actionHovered())); toolBar->toolBar()->addAction(action); toolBar->toolBar()->widgetForAction(action)->installEventFilter(toolBar); diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 77bff7e6..4eff2e52 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -91,7 +91,7 @@ QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark) else { KBookmarkAction *action = new KBookmarkAction(bookmark, owner(), this); - action->setIcon(Application::iconManager()->iconForUrl(bookmark.url())); + action->setIcon(Application::iconManager()->iconForUrl( KUrl(bookmark.url()) )); connect(action, SIGNAL(hovered()), this, SLOT(actionHovered())); return action; } |