summaryrefslogtreecommitdiff
path: root/src/application.h
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/application.h
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/application.h')
-rw-r--r--src/application.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/application.h b/src/application.h
index a08d883c..26f5cf74 100644
--- a/src/application.h
+++ b/src/application.h
@@ -52,6 +52,7 @@ class HistoryManager;
class MainWindow;
class SessionManager;
class AdBlockManager;
+class IconManager;
class WebView;
@@ -107,14 +108,13 @@ public:
MainWindow *newMainWindow(bool withTab = true);
MainWindowList mainWindowList();
- static KIcon icon(const KUrl &url);
-
static HistoryManager *historyManager();
static BookmarkProvider *bookmarkProvider();
static SessionManager *sessionManager();
static AdBlockManager *adblockManager();
static OpenSearchManager *opensearchManager();
-
+ static IconManager *iconManager();
+
// DOWNLOADS MANAGEMENT METHODS
void addDownload(const QString &srcUrl, const QString &destUrl);
DownloadList downloads();
@@ -152,7 +152,8 @@ private:
static QWeakPointer<SessionManager> s_sessionManager;
static QWeakPointer<AdBlockManager> s_adblockManager;
static QWeakPointer<OpenSearchManager> s_opensearchManager;
-
+ static QWeakPointer<IconManager> s_iconManager;
+
MainWindowList m_mainWindows;
};