diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2013-01-23 19:04:05 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2013-01-23 19:04:05 +0100 |
commit | facc2f92fe73d4e925510fcb2936483798efba6a (patch) | |
tree | 6e01c451eb3c84a6b6b0978c7a870c7df0bbb966 /src/icons | |
parent | Remove double "rekonq - rekonq" from title (diff) | |
download | rekonq-facc2f92fe73d4e925510fcb2936483798efba6a.tar.xz |
Improve icon management code
In the 1.x way, IconManager notified all the tabs about icons changed.
This way, just the interested tab is :)
Diffstat (limited to 'src/icons')
-rw-r--r-- | src/icons/iconmanager.cpp | 14 | ||||
-rw-r--r-- | src/icons/iconmanager.h | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/icons/iconmanager.cpp b/src/icons/iconmanager.cpp index 49d637ad..e0408577 100644 --- a/src/icons/iconmanager.cpp +++ b/src/icons/iconmanager.cpp @@ -115,27 +115,15 @@ void IconManager::provideIcon(QWebFrame *mFrame, const KUrl &url, bool notify) { // provide icons just for http/https sites if (!url.scheme().startsWith(QL1S("http"))) - { - if (notify) - emit iconChanged(); return; - } // do not load new icons in private browsing.. if (mFrame->page()->settings()->testAttribute(QWebSettings::PrivateBrowsingEnabled)) - { - if (notify) - emit iconChanged(); return; - } // check if icon exists if (!favIconForUrl(url).isEmpty()) - { - if (notify) - emit iconChanged(); return; - } // the simplest way.. const QString rootUrlString = url.scheme() + QL1S("://") + url.host(); @@ -165,7 +153,7 @@ void IconManager::provideIcon(QWebFrame *mFrame, const KUrl &url, bool notify) IconDownloader *id = new IconDownloader(faviconUrl, destUrl, this); if (notify) - connect(id, SIGNAL(iconReady()), this, SIGNAL(iconChanged())); + connect(id, SIGNAL(iconReady()), mFrame, SIGNAL(iconChanged())); } diff --git a/src/icons/iconmanager.h b/src/icons/iconmanager.h index 02ae6763..9f39f965 100644 --- a/src/icons/iconmanager.h +++ b/src/icons/iconmanager.h @@ -64,9 +64,6 @@ public: void saveDesktopIconForUrl(const KUrl &u); -Q_SIGNALS: - void iconChanged(); - private: IconManager(QObject *parent = 0); |