diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-02-27 22:59:51 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-03-11 06:21:36 +0000 |
| commit | f658dcb0893e7869cc0c029bfe0be82838af4bb8 (patch) | |
| tree | cbb120c511ffb5ac2591cbd6d463e5e73083a847 /src/core/favicon_manager.h | |
| parent | a35cf1f491b69e3aba4f9cd95dd37eff8c0a34b1 (diff) | |
Clean up FaviconManager and fix icon url in NavigationEntry
Change-Id: I56a109c9071ef581c6a51b5b7b8ce5a2464c6a76
Task-number: QTBUG-51179
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/favicon_manager.h')
| -rw-r--r-- | src/core/favicon_manager.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/core/favicon_manager.h b/src/core/favicon_manager.h index ff5c76a9b..dc702a0da 100644 --- a/src/core/favicon_manager.h +++ b/src/core/favicon_manager.h @@ -73,7 +73,7 @@ public: QUrl url; FaviconType type; - // Stores the size of the highest quality in case of multi-size icon + // Stores the largest size in case of multi-size icon QSize size; bool candidate; bool multiSize; @@ -88,25 +88,17 @@ public: QIcon getIcon(const QUrl &) const; FaviconInfo getFaviconInfo(const QUrl &) const; QList<FaviconInfo> getFaviconInfoList(bool) const; - void downloadIcon(const QUrl &url, FaviconInfo::FaviconType iconType = FaviconInfo::Favicon); - void removeIcon(const QUrl &); - -Q_SIGNALS: - void iconDownloaded(const QUrl &url); private: FaviconManager(FaviconManagerPrivate *); - bool hasAvailableCandidateIcon() const; void update(const QList<FaviconInfo> &); void updateCandidates(const QList<FaviconInfo> &); void resetCandidates(); - - FaviconInfo getProposedFaviconInfo() const; - FaviconInfo getFirstFaviconInfo() const; + bool hasCandidate() const; QMap<QUrl, FaviconInfo> m_faviconInfoMap; - bool m_hasDownloadedIcon; + bool m_hasCandidate; Q_DISABLE_COPY(FaviconManager) Q_DECLARE_PRIVATE(FaviconManager) |