From a321348dfaa10a9b8f038179f574b14157d1195c Mon Sep 17 00:00:00 2001
From: Brian Moran <brian@trucentive.com>
Date: Fri, 17 Mar 2023 07:52:03 -0700
Subject: [PATCH] conditional compilation of error handler based on QT version

---
 Network/FileDownload.cpp | 13 +++++++++++--
 Network/FileDownload.hpp |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Network/FileDownload.cpp b/Network/FileDownload.cpp
index 6283efd89..3ab2a7c6c 100644
--- a/Network/FileDownload.cpp
+++ b/Network/FileDownload.cpp
@@ -20,7 +20,7 @@ FileDownload::FileDownload() : QObject(nullptr)
 FileDownload::~FileDownload()
 {
 }
-
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
 void FileDownload::errorOccurred(QNetworkReply::NetworkError code)
 {
   LOG_INFO(QString{"FileDownload [%1]: errorOccurred %2 -> %3"}.arg(user_agent_).arg(code).arg(reply_->errorString()));
@@ -28,6 +28,15 @@ void FileDownload::errorOccurred(QNetworkReply::NetworkError code)
   destfile_.cancelWriting ();
   destfile_.commit ();
 }
+#else
+void FileDownload::obsoleteError()
+{
+  LOG_INFO(QString{"FileDownload [%1]: error -> %3"}.arg(user_agent_).arg(reply_->errorString()));
+  Q_EMIT error (reply_->errorString ());
+  destfile_.cancelWriting ();
+  destfile_.commit ();
+}
+#endif
 
 void FileDownload::configure(QNetworkAccessManager *network_manager, const QString &source_url, const QString &destination_path, const QString &user_agent)
 {
@@ -181,7 +190,7 @@ void FileDownload::download(QUrl qurl)
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
   QObject::connect(reply_, &QNetworkReply::errorOccurred,this, &FileDownload::errorOccurred, Qt::UniqueConnection);
 #else
-  QObject::connect(reply_, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &FileDownload::errorOccurred, Qt::UniqueConnection);
+  QObject::connect(reply_, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &FileDownload::obsoleteError, Qt::UniqueConnection);
 #endif
   QObject::connect(reply_, &QNetworkReply::readyRead, this, &FileDownload::store, Qt::UniqueConnection);
 
diff --git a/Network/FileDownload.hpp b/Network/FileDownload.hpp
index 03f31074e..c32948dd7 100644
--- a/Network/FileDownload.hpp
+++ b/Network/FileDownload.hpp
@@ -43,7 +43,11 @@ public slots:
     void abort();
     void downloadComplete(QNetworkReply* data);
     void downloadProgress(qint64 recieved, qint64 total);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     void errorOccurred(QNetworkReply::NetworkError code);
+#else
+    void obsoleteError();
+#endif
     void replyComplete();
 };