From 15838c25d7b6b562e58df2a3d7a0038f19f17d38 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 7 Jun 2023 21:15:39 +0300 Subject: [PATCH] libs: replace FavIconsModule::startDownload() with its body Signed-off-by: Ivailo Monev --- libs/konq/favicons/favicons.cpp | 25 +++++++++---------------- libs/konq/favicons/favicons.h | 1 - 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/libs/konq/favicons/favicons.cpp b/libs/konq/favicons/favicons.cpp index beece7e7..836e4d3a 100644 --- a/libs/konq/favicons/favicons.cpp +++ b/libs/konq/favicons/favicons.cpp @@ -124,22 +124,6 @@ void FavIconsModule::downloadUrlIcon(const QString &url) emit iconChanged(url, iconName); return; } - - startDownload(url, iconFile); -} - -void FavIconsModule::forceDownloadUrlIcon(const QString &url) -{ - d->failedDownloads.removeAll(url); // force a download to happen - const QString iconName = iconNameFromURL(url); - const QString iconFile = iconFilePath(iconName); - QFile::remove(iconFile); - downloadUrlIcon(url); -} - -void FavIconsModule::startDownload(const QString &url, const QString &iconFile) -{ - const QString iconName = iconNameFromURL(url); if (d->queuedDownloads.contains(iconName)) { kDebug() << "Icon download queued for" << url; return; @@ -155,6 +139,15 @@ void FavIconsModule::startDownload(const QString &url, const QString &iconFile) startJob(url, faviconUrl, iconFile); } +void FavIconsModule::forceDownloadUrlIcon(const QString &url) +{ + d->failedDownloads.removeAll(url); // force a download to happen + const QString iconName = iconNameFromURL(url); + const QString iconFile = iconFilePath(iconName); + QFile::remove(iconFile); + downloadUrlIcon(url); +} + void FavIconsModule::startJob(const QString &url, const QString &faviconUrl, const QString &iconFile) { kDebug() << "Downloading" << faviconUrl << "as" << iconFile; diff --git a/libs/konq/favicons/favicons.h b/libs/konq/favicons/favicons.h index 32976b81..0f0c3cf8 100644 --- a/libs/konq/favicons/favicons.h +++ b/libs/konq/favicons/favicons.h @@ -81,7 +81,6 @@ private Q_SLOTS: void slotFinished(KJob *kjob); private: - void startDownload(const QString &url, const QString &iconFile); void startJob(const QString &url, const QString &faviconUrl, const QString &iconFile); void downloadSuccess(const QString &url); void downloadError(const QString &url); -- 2.11.0