Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 13 insertions, 19 deletions

diff --git a/launcher/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp
index ab425f1a..d548c89a 100644
--- a/launcher/screenshots/ImgurAlbumCreation.cpp
+++ b/launcher/screenshots/ImgurAlbumCreation.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
@@ -36,15 +36,15 @@
 
 #include "ImgurAlbumCreation.h"
 
-#include <QNetworkRequest>
+#include <QDebug>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QUrl>
+#include <QNetworkRequest>
 #include <QStringList>
-#include <QDebug>
+#include <QUrl>
 
-#include "BuildConfig.h"
 #include "Application.h"
+#include "BuildConfig.h"
 
 ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenShot::Ptr> screenshots) : NetAction(), m_screenshots(screenshots)
 {
@@ -62,19 +62,18 @@ void ImgurAlbumCreation::executeTask()
     request.setRawHeader("Accept", "application/json");
 
     QStringList hashes;
-    for (auto shot : m_screenshots)
-    {
+    for (auto shot : m_screenshots) {
         hashes.append(shot->m_imgurDeleteHash);
     }
 
     const QByteArray data = "deletehashes=" + hashes.join(',').toUtf8() + "&title=Minecraft%20Screenshots&privacy=hidden";
 
-    QNetworkReply *rep = APPLICATION->network()->post(request, data);
+    QNetworkReply* rep = APPLICATION->network()->post(request, data);
 
     m_reply.reset(rep);
     connect(rep, &QNetworkReply::uploadProgress, this, &ImgurAlbumCreation::downloadProgress);
     connect(rep, &QNetworkReply::finished, this, &ImgurAlbumCreation::downloadFinished);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
     connect(rep, &QNetworkReply::errorOccurred, this, &ImgurAlbumCreation::downloadError);
 #else
     connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &ImgurAlbumCreation::downloadError);
@@ -82,7 +81,7 @@ void ImgurAlbumCreation::executeTask()
     connect(rep, &QNetworkReply::sslErrors, this, &ImgurAlbumCreation::sslErrors);
 }
 
-void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error)
+void ImgurAlbumCreation::downloadError([[maybe_unused]] QNetworkReply::NetworkError error)
 {
     qDebug() << m_reply->errorString();
     m_state = State::Failed;
@@ -90,21 +89,18 @@ void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error)
 
 void ImgurAlbumCreation::downloadFinished()
 {
-    if (m_state != State::Failed)
-    {
+    if (m_state != State::Failed) {
         QByteArray data = m_reply->readAll();
         m_reply.reset();
         QJsonParseError jsonError;
         QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-        if (jsonError.error != QJsonParseError::NoError)
-        {
+        if (jsonError.error != QJsonParseError::NoError) {
             qDebug() << jsonError.errorString();
             emitFailed();
             return;
         }
         auto object = doc.object();
-        if (!object.value("success").toBool())
-        {
+        if (!object.value("success").toBool()) {
             qDebug() << doc.toJson();
             emitFailed();
             return;
@@ -114,9 +110,7 @@ void ImgurAlbumCreation::downloadFinished()
         m_state = State::Succeeded;
         emit succeeded();
         return;
-    }
-    else
-    {
+    } else {
         qDebug() << m_reply->readAll();
         m_reply.reset();
         emitFailed();