From 8c8eabf7ac1920b47792b26790f3646cb6693ec0 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Thu, 21 Apr 2022 22:12:14 -0300
Subject: refactor: organize a little more the code in launcher/net/

This also reduces some code duplication by using some Task logic in
NetAction.
---
 launcher/tasks/Task.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'launcher/tasks')

diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index 344a024e..61855160 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -52,6 +52,8 @@ class Task : public QObject {
 
     virtual bool canAbort() const { return false; }
 
+    auto getState() const -> State { return m_state; }
+
     QString getStatus() { return m_status; }
     virtual auto getStepStatus() const -> QString { return m_status; }
 
@@ -90,7 +92,7 @@ class Task : public QObject {
     void setStatus(const QString& status);
     void setProgress(qint64 current, qint64 total);
 
-   private:
+   protected:
     State m_state = State::Inactive;
     QStringList m_Warnings;
     QString m_failReason = "";
-- 
cgit 


From efa3fbff39bf0dabebdf1c6330090ee320895a4d Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Tue, 26 Apr 2022 21:25:42 -0300
Subject: refactor: remove some superfluous signals

Since now we're inheriting from Task, some signals can be reused.
---
 launcher/net/Download.cpp                   | 21 ++++++++++-----------
 launcher/net/NetAction.h                    | 10 ++--------
 launcher/net/NetJob.cpp                     | 14 +++++++-------
 launcher/screenshots/ImgurAlbumCreation.cpp | 10 +++++-----
 launcher/screenshots/ImgurUpload.cpp        | 12 ++++++------
 launcher/tasks/Task.cpp                     |  3 +--
 launcher/tasks/Task.h                       |  3 ++-
 7 files changed, 33 insertions(+), 40 deletions(-)

(limited to 'launcher/tasks')

diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index 5b5a04db..5e5d64fa 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -72,7 +72,7 @@ void Download::executeTask()
 {
     if (getState() == Task::State::AbortedByUser) {
         qWarning() << "Attempt to start an aborted Download:" << m_url.toString();
-        emit aborted(m_index_within_job);
+        emitAborted();
         return;
     }
 
@@ -80,7 +80,7 @@ void Download::executeTask()
     m_state = m_sink->init(request);
     switch (m_state) {
         case State::Succeeded:
-            emit succeeded(m_index_within_job);
+            emit succeeded();
             qDebug() << "Download cache hit " << m_url.toString();
             return;
         case State::Running:
@@ -88,7 +88,7 @@ void Download::executeTask()
             break;
         case State::Inactive:
         case State::Failed:
-            emit failed(m_index_within_job);
+            emitFailed();
             return;
         case State::AbortedByUser:
             return;
@@ -102,8 +102,8 @@ void Download::executeTask()
     QNetworkReply* rep = m_network->get(request);
 
     m_reply.reset(rep);
-    connect(rep, SIGNAL(downloadProgress(qint64, qint64)), SLOT(downloadProgress(qint64, qint64)));
-    connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
+    connect(rep, &QNetworkReply::downloadProgress, this, &Download::downloadProgress);
+    connect(rep, &QNetworkReply::finished, this, &Download::downloadFinished);
     connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
     connect(rep, &QNetworkReply::sslErrors, this, &Download::sslErrors);
     connect(rep, &QNetworkReply::readyRead, this, &Download::downloadReadyRead);
@@ -112,7 +112,6 @@ void Download::executeTask()
 void Download::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
     setProgress(bytesReceived, bytesTotal);
-    emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
 }
 
 void Download::downloadError(QNetworkReply::NetworkError error)
@@ -212,19 +211,19 @@ void Download::downloadFinished()
         qDebug() << "Download failed but we are allowed to proceed:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emit succeeded(m_index_within_job);
+        emit succeeded();
         return;
     } else if (m_state == State::Failed) {
         qDebug() << "Download failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emit failed(m_index_within_job);
+        emitFailed();
         return;
     } else if (m_state == State::AbortedByUser) {
         qDebug() << "Download aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emit aborted(m_index_within_job);
+        emitAborted();
         return;
     }
 
@@ -241,12 +240,12 @@ void Download::downloadFinished()
         qDebug() << "Download failed to finalize:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emit failed(m_index_within_job);
+        emitFailed();
         return;
     }
     m_reply.reset();
     qDebug() << "Download succeeded:" << m_url.toString();
-    emit succeeded(m_index_within_job);
+    emit succeeded();
 }
 
 void Download::downloadReadyRead()
diff --git a/launcher/net/NetAction.h b/launcher/net/NetAction.h
index e15716f6..86a37ee6 100644
--- a/launcher/net/NetAction.h
+++ b/launcher/net/NetAction.h
@@ -43,7 +43,7 @@
 class NetAction : public Task {
     Q_OBJECT
    protected:
-    explicit NetAction() : Task(nullptr) {};
+    explicit NetAction() : Task() {};
 
    public:
     using Ptr = shared_qobject_ptr<NetAction>;
@@ -51,13 +51,7 @@ class NetAction : public Task {
     virtual ~NetAction() = default;
 
     QUrl url() { return m_url; }
-
-   signals:
-    void started(int index);
-    void netActionProgress(int index, qint64 current, qint64 total);
-    void succeeded(int index);
-    void failed(int index);
-    void aborted(int index);
+    auto index() -> int { return m_index_within_job; }
 
    protected slots:
     virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) = 0;
diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp
index d08d6c4d..a9f89da4 100644
--- a/launcher/net/NetJob.cpp
+++ b/launcher/net/NetJob.cpp
@@ -45,9 +45,9 @@ auto NetJob::addNetAction(NetAction::Ptr action) -> bool
     partProgress(m_parts_progress.count() - 1, action->getProgress(), action->getTotalProgress());
 
     if (action->isRunning()) {
-        connect(action.get(), &NetAction::succeeded, this, &NetJob::partSucceeded);
-        connect(action.get(), &NetAction::failed, this, &NetJob::partFailed);
-        connect(action.get(), &NetAction::netActionProgress, this, &NetJob::partProgress);
+        connect(action.get(), &NetAction::succeeded, [this, action]{ partSucceeded(action->index()); });
+        connect(action.get(), &NetAction::failed, [this, action](QString){ partFailed(action->index()); });
+        connect(action.get(), &NetAction::progress, [this, action](qint64 done, qint64 total) { partProgress(action->index(), done, total); });
     } else {
         m_todo.append(m_parts_progress.size() - 1);
     }
@@ -218,10 +218,10 @@ void NetJob::startMoreParts()
         auto part = m_downloads[doThis];
 
         // connect signals :D
-        connect(part.get(), &NetAction::succeeded, this, &NetJob::partSucceeded);
-        connect(part.get(), &NetAction::failed, this, &NetJob::partFailed);
-        connect(part.get(), &NetAction::aborted, this, &NetJob::partAborted);
-        connect(part.get(), &NetAction::netActionProgress, this, &NetJob::partProgress);
+        connect(part.get(), &NetAction::succeeded, this, [this, part]{ partSucceeded(part->index()); });
+        connect(part.get(), &NetAction::failed, this, [this, part](QString){ partFailed(part->index()); });
+        connect(part.get(), &NetAction::aborted, this, [this, part]{ partAborted(part->index()); });
+        connect(part.get(), &NetAction::progress, this, [this, part](qint64 done, qint64 total) { partProgress(part->index(), done, total); });
 
         part->startAction(m_network);
     }
diff --git a/launcher/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp
index 81fac929..f94527c8 100644
--- a/launcher/screenshots/ImgurAlbumCreation.cpp
+++ b/launcher/screenshots/ImgurAlbumCreation.cpp
@@ -56,32 +56,32 @@ void ImgurAlbumCreation::downloadFinished()
         if (jsonError.error != QJsonParseError::NoError)
         {
             qDebug() << jsonError.errorString();
-            emit failed(m_index_within_job);
+            emitFailed();
             return;
         }
         auto object = doc.object();
         if (!object.value("success").toBool())
         {
             qDebug() << doc.toJson();
-            emit failed(m_index_within_job);
+            emitFailed();
             return;
         }
         m_deleteHash = object.value("data").toObject().value("deletehash").toString();
         m_id = object.value("data").toObject().value("id").toString();
         m_state = State::Succeeded;
-        emit succeeded(m_index_within_job);
+        emit succeeded();
         return;
     }
     else
     {
         qDebug() << m_reply->readAll();
         m_reply.reset();
-        emit failed(m_index_within_job);
+        emitFailed();
         return;
     }
 }
 void ImgurAlbumCreation::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
     setProgress(bytesReceived, bytesTotal);
-    emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
+    emit progress(bytesReceived, bytesTotal);
 }
diff --git a/launcher/screenshots/ImgurUpload.cpp b/launcher/screenshots/ImgurUpload.cpp
index 0f0fd79c..05314de7 100644
--- a/launcher/screenshots/ImgurUpload.cpp
+++ b/launcher/screenshots/ImgurUpload.cpp
@@ -28,7 +28,7 @@ void ImgurUpload::executeTask()
     QFile f(m_shot->m_file.absoluteFilePath());
     if (!f.open(QFile::ReadOnly))
     {
-        emit failed(m_index_within_job);
+        emitFailed();
         return;
     }
 
@@ -66,7 +66,7 @@ void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
     m_state = Task::State::Failed;
     finished = true;
     m_reply.reset();
-    emit failed(m_index_within_job);
+    emitFailed();
 }
 void ImgurUpload::downloadFinished()
 {
@@ -84,7 +84,7 @@ void ImgurUpload::downloadFinished()
         qDebug() << "imgur server did not reply with JSON" << jsonError.errorString();
         finished = true;
         m_reply.reset();
-        emit failed(m_index_within_job);
+        emitFailed();
         return;
     }
     auto object = doc.object();
@@ -93,7 +93,7 @@ void ImgurUpload::downloadFinished()
         qDebug() << "Screenshot upload not successful:" << doc.toJson();
         finished = true;
         m_reply.reset();
-        emit failed(m_index_within_job);
+        emitFailed();
         return;
     }
     m_shot->m_imgurId = object.value("data").toObject().value("id").toString();
@@ -101,11 +101,11 @@ void ImgurUpload::downloadFinished()
     m_shot->m_imgurDeleteHash = object.value("data").toObject().value("deletehash").toString();
     m_state = Task::State::Succeeded;
     finished = true;
-    emit succeeded(m_index_within_job);
+    emit succeeded();
     return;
 }
 void ImgurUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
     setProgress(bytesReceived, bytesTotal);
-    emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
+    emit progress(bytesReceived, bytesTotal);
 }
diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index 57307b43..68e0e8a7 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -99,8 +99,7 @@ void Task::emitAborted()
     m_state = State::AbortedByUser;
     m_failReason = "Aborted.";
     qDebug() << "Task" << describe() << "aborted.";
-    emit failed(m_failReason);
-    emit finished();
+    emit aborted();
 }
 
 void Task::emitSucceeded()
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index 61855160..e09c57ae 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -73,6 +73,7 @@ class Task : public QObject {
     virtual void progress(qint64 current, qint64 total);
     void finished();
     void succeeded();
+    void aborted();
     void failed(QString reason);
     void status(QString status);
 
@@ -86,7 +87,7 @@ class Task : public QObject {
    protected slots:
     virtual void emitSucceeded();
     virtual void emitAborted();
-    virtual void emitFailed(QString reason);
+    virtual void emitFailed(QString reason = "");
 
    public slots:
     void setStatus(const QString& status);
-- 
cgit 


From 57d65177c8ebb5463c88dd8e26f1e0a33f648bed Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Sun, 1 May 2022 11:05:31 -0300
Subject: fix: abort and fail logic in tasks

Also sets up correctly the status connections
---
 launcher/net/Download.cpp | 9 ++++++---
 launcher/net/NetJob.cpp   | 3 +++
 launcher/tasks/Task.cpp   | 1 +
 launcher/tasks/Task.h     | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'launcher/tasks')

diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index 3d6ca338..9c01fa8d 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -69,6 +69,8 @@ void Download::addValidator(Validator* v)
 
 void Download::executeTask()
 {
+    setStatus(tr("Downloading %1").arg(m_url.toString()));
+
     if (getState() == Task::State::AbortedByUser) {
         qWarning() << "Attempt to start an aborted Download:" << m_url.toString();
         emitAborted();
@@ -90,6 +92,7 @@ void Download::executeTask()
             emitFailed();
             return;
         case State::AbortedByUser:
+            emitAborted();
             return;
     }
 
@@ -216,13 +219,13 @@ void Download::downloadFinished()
         qDebug() << "Download failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitFailed();
+        emit failed("");
         return;
     } else if (m_state == State::AbortedByUser) {
         qDebug() << "Download aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitAborted();
+        emit aborted();
         return;
     }
 
@@ -239,7 +242,7 @@ void Download::downloadFinished()
         qDebug() << "Download failed to finalize:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitFailed();
+        emit failed("");
         return;
     }
 
diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp
index a9f89da4..906a735f 100644
--- a/launcher/net/NetJob.cpp
+++ b/launcher/net/NetJob.cpp
@@ -47,7 +47,9 @@ auto NetJob::addNetAction(NetAction::Ptr action) -> bool
     if (action->isRunning()) {
         connect(action.get(), &NetAction::succeeded, [this, action]{ partSucceeded(action->index()); });
         connect(action.get(), &NetAction::failed, [this, action](QString){ partFailed(action->index()); });
+        connect(action.get(), &NetAction::aborted, [this, action](){ partAborted(action->index()); });
         connect(action.get(), &NetAction::progress, [this, action](qint64 done, qint64 total) { partProgress(action->index(), done, total); });
+        connect(action.get(), &NetAction::status, this, &NetJob::status);
     } else {
         m_todo.append(m_parts_progress.size() - 1);
     }
@@ -222,6 +224,7 @@ void NetJob::startMoreParts()
         connect(part.get(), &NetAction::failed, this, [this, part](QString){ partFailed(part->index()); });
         connect(part.get(), &NetAction::aborted, this, [this, part]{ partAborted(part->index()); });
         connect(part.get(), &NetAction::progress, this, [this, part](qint64 done, qint64 total) { partProgress(part->index(), done, total); });
+        connect(part.get(), &NetAction::status, this, &NetJob::status);
 
         part->startAction(m_network);
     }
diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index 68e0e8a7..d2d62c9e 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -100,6 +100,7 @@ void Task::emitAborted()
     m_failReason = "Aborted.";
     qDebug() << "Task" << describe() << "aborted.";
     emit aborted();
+    emit finished();
 }
 
 void Task::emitSucceeded()
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index e09c57ae..0ca37e02 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -79,7 +79,7 @@ class Task : public QObject {
 
    public slots:
     virtual void start();
-    virtual bool abort() { return false; };
+    virtual bool abort() { if(canAbort()) emitAborted(); return canAbort(); };
 
    protected:
     virtual void executeTask() = 0;
-- 
cgit 


From dd2b324d8f7081f52decd90210ce11ef37625315 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Mon, 2 May 2022 14:33:21 -0300
Subject: chore: add license header to remaining files

Also remove some unused imports
---
 launcher/InstanceImportTask.cpp             | 40 +++++++++++++++++++-------
 launcher/minecraft/AssetsUtils.cpp          | 40 +++++++++++++++++++-------
 launcher/screenshots/ImgurAlbumCreation.cpp | 35 +++++++++++++++++++++++
 launcher/screenshots/ImgurAlbumCreation.h   | 37 +++++++++++++++++++++++-
 launcher/screenshots/ImgurUpload.cpp        | 35 +++++++++++++++++++++++
 launcher/screenshots/ImgurUpload.h          | 37 +++++++++++++++++++++++-
 launcher/tasks/Task.cpp                     | 40 +++++++++++++++++++-------
 launcher/tasks/Task.h                       | 44 ++++++++++++++++++++---------
 launcher/translations/TranslationsModel.cpp | 35 +++++++++++++++++++++++
 9 files changed, 297 insertions(+), 46 deletions(-)

(limited to 'launcher/tasks')

diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index fc3432c1..ca7e0590 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -1,16 +1,36 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #include "InstanceImportTask.h"
diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp
index 281f730f..15062c2b 100644
--- a/launcher/minecraft/AssetsUtils.cpp
+++ b/launcher/minecraft/AssetsUtils.cpp
@@ -1,16 +1,36 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *          http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #include <QFileInfo>
diff --git a/launcher/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp
index f94527c8..7afdc5cc 100644
--- a/launcher/screenshots/ImgurAlbumCreation.cpp
+++ b/launcher/screenshots/ImgurAlbumCreation.cpp
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #include "ImgurAlbumCreation.h"
 
 #include <QNetworkRequest>
diff --git a/launcher/screenshots/ImgurAlbumCreation.h b/launcher/screenshots/ImgurAlbumCreation.h
index 4cb0ed5d..0228b6e4 100644
--- a/launcher/screenshots/ImgurAlbumCreation.h
+++ b/launcher/screenshots/ImgurAlbumCreation.h
@@ -1,7 +1,42 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #pragma once
+
 #include "net/NetAction.h"
 #include "Screenshot.h"
-#include "QObjectPtr.h"
 
 typedef shared_qobject_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;
 class ImgurAlbumCreation : public NetAction
diff --git a/launcher/screenshots/ImgurUpload.cpp b/launcher/screenshots/ImgurUpload.cpp
index 05314de7..fbcfb95f 100644
--- a/launcher/screenshots/ImgurUpload.cpp
+++ b/launcher/screenshots/ImgurUpload.cpp
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #include "ImgurUpload.h"
 #include "BuildConfig.h"
 
diff --git a/launcher/screenshots/ImgurUpload.h b/launcher/screenshots/ImgurUpload.h
index a1040551..404dc876 100644
--- a/launcher/screenshots/ImgurUpload.h
+++ b/launcher/screenshots/ImgurUpload.h
@@ -1,5 +1,40 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #pragma once
-#include "QObjectPtr.h"
+
 #include "net/NetAction.h"
 #include "Screenshot.h"
 
diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index d2d62c9e..bb71b98c 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -1,16 +1,36 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #include "Task.h"
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index 0ca37e02..f0e6e402 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -1,24 +1,40 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #pragma once
 
-#include <QObject>
-#include <QString>
-#include <QStringList>
-
 #include "QObjectPtr.h"
 
 class Task : public QObject {
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
index fbd17060..53722d69 100644
--- a/launcher/translations/TranslationsModel.cpp
+++ b/launcher/translations/TranslationsModel.cpp
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #include "TranslationsModel.h"
 
 #include <QCoreApplication>
-- 
cgit 


From 17bbfe8d8951ddc7acca0222c6d2e38fb29eef25 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 17 May 2022 06:47:00 -0300
Subject: fix: virtual signal in Task.h

---
 launcher/tasks/Task.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/tasks')

diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index f0e6e402..f7765c3d 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -86,7 +86,7 @@ class Task : public QObject {
 
    signals:
     void started();
-    virtual void progress(qint64 current, qint64 total);
+    void progress(qint64 current, qint64 total);
     void finished();
     void succeeded();
     void aborted();
-- 
cgit