From 0e5ee7473e7fe37107130e151499e97521c14356 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 31 Jul 2012 18:32:38 +0200 Subject: Fix places where IconManager was needed... --- src/bookmarks/bookmarkmanager.cpp | 6 ++---- src/bookmarks/bookmarkstoolbar.cpp | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/bookmarks') diff --git a/src/bookmarks/bookmarkmanager.cpp b/src/bookmarks/bookmarkmanager.cpp index 25c78044..5075820d 100644 --- a/src/bookmarks/bookmarkmanager.cpp +++ b/src/bookmarks/bookmarkmanager.cpp @@ -35,9 +35,7 @@ #include "application.h" #include "bookmarkstoolbar.h" #include "bookmarkowner.h" -// #include "iconmanager.h" -// #include "mainwindow.h" -// #include "webtab.h" +#include "iconmanager.h" // KDE Includes #include @@ -201,7 +199,7 @@ void BookmarkManager::fillBookmarkBar(BookmarkToolBar *toolBar) else { KBookmarkAction *action = new KBookmarkAction(bookmark, m_owner, this); -// FIXME action->setIcon(rApp->iconManager()->iconForUrl(KUrl(bookmark.url()))); + action->setIcon(IconManager::self()->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 cb3fe382..27ccaec4 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -34,6 +34,7 @@ #include "bookmarkmanager.h" #include "bookmarkowner.h" +#include "iconmanager.h" #include "webwindow.h" // Qt Includes @@ -92,7 +93,7 @@ QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark) else { KBookmarkAction *action = new KBookmarkAction(bookmark, owner(), this); -// FIXME action->setIcon(rApp->iconManager()->iconForUrl(KUrl(bookmark.url()))); + action->setIcon(IconManager::self()->iconForUrl(KUrl(bookmark.url()))); connect(action, SIGNAL(hovered()), this, SLOT(actionHovered())); return action; } -- cgit v1.2.1