diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-07-31 18:32:38 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-12-10 02:48:04 +0100 |
| commit | 0e5ee7473e7fe37107130e151499e97521c14356 (patch) | |
| tree | 5b01bc8827f96cb70738338cadecf560539e2dd5 | |
| parent | IconManager restore (diff) | |
| download | rekonq-0e5ee7473e7fe37107130e151499e97521c14356.tar.xz | |
Fix places where IconManager was needed...
| -rw-r--r-- | src/bookmarks/bookmarkmanager.cpp | 6 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 3 | ||||
| -rw-r--r-- | src/history/historymodels.cpp | 4 |
3 files changed, 6 insertions, 7 deletions
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 <KActionCollection> @@ -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; } diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp index 76c00a52..9ffc2643 100644 --- a/src/history/historymodels.cpp +++ b/src/history/historymodels.cpp @@ -35,7 +35,7 @@ // Local Includes #include "historymanager.h" -// #include "iconmanager.h" +#include "iconmanager.h" // KDE Includes #include <KStandardDirs> @@ -141,7 +141,7 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const case Qt::DecorationRole: if (index.column() == 0) { - return QIcon(); //FIXME rApp->iconManager()->iconForUrl(item.url); + return IconManager::self()->iconForUrl(item.url); } case Qt::ToolTipRole: QString tooltip = ""; |