libs: replace FavIconsModule::startDownload() with its body

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/libs/konq/favicons/favicons.cpp b/libs/konq/favicons/favicons.cpp
index beece7e..836e4d3 100644 (file)
--- 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 32976b8..0f0c3cf 100644 (file)
--- 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);