From 173b86b85d38da0707953aaeb74f62824173ae71 Mon Sep 17 00:00:00 2001
From: Bart De Vries <bart@mogwai.be>
Date: Sun, 2 May 2021 09:05:26 +0200
Subject: [PATCH] Get rid of downloadStatusChanged in Enclosure

Instead change the signature on statusChanged so it can pass on all
required information instead of needing two signals with separate
signatures.
---
 src/enclosure.cpp | 14 +++++---------
 src/enclosure.h   |  3 +--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/enclosure.cpp b/src/enclosure.cpp
index 1c3d728d..4d50503d 100644
--- a/src/enclosure.cpp
+++ b/src/enclosure.cpp
@@ -23,11 +23,7 @@ Enclosure::Enclosure(Entry *entry)
     : QObject(entry)
     , m_entry(entry)
 {
-    // Set up signals to make DownloadProgressModel aware of ongoing downloads
-    connect(this, &Enclosure::statusChanged, this, [this]() {
-        Q_EMIT downloadStatusChanged(m_entry, m_status);
-    });
-    connect(this, &Enclosure::downloadStatusChanged, &DownloadProgressModel::instance(), &DownloadProgressModel::monitorDownloadProgress);
+    connect(this, &Enclosure::statusChanged, &DownloadProgressModel::instance(), &DownloadProgressModel::monitorDownloadProgress);
     connect(this, &Enclosure::downloadError, &ErrorLogModel::instance(), &ErrorLogModel::monitorErrorMessages);
 
     QSqlQuery query;
@@ -111,13 +107,13 @@ void Enclosure::download()
             }
         }
         disconnect(this, &Enclosure::cancelDownload, this, nullptr);
-        Q_EMIT statusChanged();
+        Q_EMIT statusChanged(m_entry, m_status);
     });
 
     connect(this, &Enclosure::cancelDownload, this, [this, downloadJob]() {
         downloadJob->doKill();
         m_status = Downloadable;
-        Q_EMIT statusChanged();
+        Q_EMIT statusChanged(m_entry, m_status);
         Q_EMIT DataManager::instance().downloadCountChanged(m_entry->feed()->url());
         disconnect(this, &Enclosure::cancelDownload, this, nullptr);
     });
@@ -128,7 +124,7 @@ void Enclosure::download()
     });
 
     m_status = Downloading;
-    Q_EMIT statusChanged();
+    Q_EMIT statusChanged(m_entry, m_status);
 }
 
 void Enclosure::processDownloadedFile()
@@ -177,7 +173,7 @@ void Enclosure::deleteFile()
     query.bindValue(QStringLiteral(":id"), m_entry->id());
     query.bindValue(QStringLiteral(":downloaded"), false);
     Database::instance().execute(query);
-    Q_EMIT statusChanged();
+    Q_EMIT statusChanged(m_entry, m_status);
     Q_EMIT DataManager::instance().downloadCountChanged(m_entry->feed()->url());
 }
 
diff --git a/src/enclosure.h b/src/enclosure.h
index e74b248b..a9f9fc45 100644
--- a/src/enclosure.h
+++ b/src/enclosure.h
@@ -52,13 +52,12 @@ public:
     void setSize(const int &size);
 
 Q_SIGNALS:
-    void statusChanged();
+    void statusChanged(Entry *entry, Status status);
     void downloadProgressChanged();
     void cancelDownload();
     void playPositionChanged();
     void durationChanged();
     void sizeChanged();
-    void downloadStatusChanged(Entry *entry, Status status);
     void downloadError(const QString &url, const QString &id, const int errorId, const QString &errorString);
 
 private: