summaryrefslogtreecommitdiff
path: root/src/history
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-08-28 19:24:19 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-08-28 19:24:19 +0200
commitf0c11eadaa4b77a4e36130b014b62cd6200c8211 (patch)
tree556625dc98766a444ea2b916e76446c2cb379357 /src/history
parentMerge commit 'refs/merge-requests/192' of git://gitorious.org/rekonq/mainline (diff)
downloadrekonq-f0c11eadaa4b77a4e36130b014b62cd6200c8211.tar.xz
Switching to "KDE" icon cache. While this "brute force" change can be dangerous,
it seems let everything work as expected (at least here). It also lets us to retrieve icons when sites are not visited (eg: search engines or old bookmarks) It also contains fixes & improvements for icons management in History & Bookmarks classes. More code to maintain, but more things working.Let's see what'll happen...
Diffstat (limited to 'src/history')
-rw-r--r--src/history/historymodels.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 9da755c5..a820db0f 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -35,6 +35,7 @@
// Local Includes
#include "application.h"
+#include "iconmanager.h"
// KDE Includes
#include <KStandardDirs>
@@ -144,7 +145,7 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
case Qt::DecorationRole:
if (index.column() == 0)
{
- return Application::icon(item.url);
+ return Application::iconManager()->iconForUrl(item.url);
}
case Qt::ToolTipRole:
QString tooltip = "";