Fix: signal/slot macro -> func pointer & network fixes

- convert qt connect calls to use function pointers instead of the signal/slot macros wherever practical (UI classes were mostly left alone, target was tasks and processes)
- give signals an explicit receivers to use the static method over the instance method wherever practical
- ensure networks tasks are using the `errorOccured` signal added in Qt5.15 over the deprecated `error` signal
- ensure all networks tasks have an sslErrors signal connected
- add seemingly missing `MinecraftAccount::authSucceeded` connection for `MSAInteractive` login flow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

6 files changed, 24 insertions, 9 deletions

diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index e8a1d0b0..30c1953f 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -129,10 +129,10 @@ void Download::executeTask()
     m_reply.reset(rep);
     connect(rep, &QNetworkReply::downloadProgress, this, &Download::downloadProgress);
     connect(rep, &QNetworkReply::finished, this, &Download::downloadFinished);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    connect(rep, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
+    connect(rep, &QNetworkReply::errorOccurred, this, &Download::downloadError);
 #else
-    connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
+    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &Download::downloadError);
 #endif
     connect(rep, &QNetworkReply::sslErrors, this, &Download::sslErrors);
     connect(rep, &QNetworkReply::readyRead, this, &Download::downloadReadyRead);
diff --git a/launcher/net/Download.h b/launcher/net/Download.h
index 7e1df322..01ec46db 100644
--- a/launcher/net/Download.h
+++ b/launcher/net/Download.h
@@ -70,7 +70,7 @@ class Download : public NetAction {
    protected slots:
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
     void downloadError(QNetworkReply::NetworkError error) override;
-    void sslErrors(const QList<QSslError>& errors);
+    void sslErrors(const QList<QSslError>& errors) override;
     void downloadFinished() override;
     void downloadReadyRead() override;
 
diff --git a/launcher/net/HttpMetaCache.cpp b/launcher/net/HttpMetaCache.cpp
index 0d7ca769..0ec82251 100644
--- a/launcher/net/HttpMetaCache.cpp
+++ b/launcher/net/HttpMetaCache.cpp
@@ -55,7 +55,7 @@ HttpMetaCache::HttpMetaCache(QString path) : QObject(), m_index_file(path)
     saveBatchingTimer.setSingleShot(true);
     saveBatchingTimer.setTimerType(Qt::VeryCoarseTimer);
 
-    connect(&saveBatchingTimer, SIGNAL(timeout()), SLOT(SaveNow()));
+    connect(&saveBatchingTimer, &QTimer::timeout, this, &HttpMetaCache::SaveNow);
 }
 
 HttpMetaCache::~HttpMetaCache()
diff --git a/launcher/net/NetAction.h b/launcher/net/NetAction.h
index 38fe058b..1ff8f601 100644
--- a/launcher/net/NetAction.h
+++ b/launcher/net/NetAction.h
@@ -61,6 +61,17 @@ class NetAction : public Task {
     virtual void downloadFinished() = 0;
     virtual void downloadReadyRead() = 0;
 
+    virtual void sslErrors(const QList<QSslError>& errors) {
+        int i = 1;
+        for (auto error : errors) {
+            qCritical() << "Network SSL Error #" << i << " : " << error.errorString();
+            auto cert = error.certificate();
+            qCritical() << "Certificate in question:\n" << cert.toText();
+            i++;
+        }
+
+    };
+
    public slots:
     void startAction(shared_qobject_ptr<QNetworkAccessManager> network)
     {
diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index ccf43c2d..f3cdb786 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -232,9 +232,13 @@ namespace Net {
         QNetworkReply* rep = m_network->post(request, m_post_data);
 
         m_reply.reset(rep);
-        connect(rep, SIGNAL(downloadProgress(qint64, qint64)), SLOT(downloadProgress(qint64, qint64)));
-        connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
-        connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
+        connect(rep, &QNetworkReply::downloadProgress, this,  &Upload::downloadProgress);
+        connect(rep, &QNetworkReply::finished, this, &Upload::downloadFinished);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
+        connect(rep, &QNetworkReply::errorOccurred, this, &Upload::downloadError);
+#else
+        connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &Upload::downloadError);
+#endif
         connect(rep, &QNetworkReply::sslErrors, this, &Upload::sslErrors);
         connect(rep, &QNetworkReply::readyRead, this, &Upload::downloadReadyRead);
     }
diff --git a/launcher/net/Upload.h b/launcher/net/Upload.h
index 5a0b2e74..f58b746a 100644
--- a/launcher/net/Upload.h
+++ b/launcher/net/Upload.h
@@ -54,7 +54,7 @@ namespace Net {
     protected slots:
         void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
         void downloadError(QNetworkReply::NetworkError error) override;
-        void sslErrors(const QList<QSslError> & errors);
+        void sslErrors(const QList<QSslError> & errors) override;
         void downloadFinished() override;
         void downloadReadyRead() override;