1 files changed, 60 insertions, 50 deletions

diff --git a/launcher/net/NetJob.h b/launcher/net/NetJob.h
index fdea710f..63c1cf51 100644
--- a/launcher/net/NetJob.h
+++ b/launcher/net/NetJob.h
@@ -1,88 +1,98 @@
-/* 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 <QtNetwork>
+
+#include <QObject>
 #include "NetAction.h"
-#include "Download.h"
-#include "HttpMetaCache.h"
 #include "tasks/Task.h"
-#include "QObjectPtr.h"
 
-class NetJob;
+// Those are included so that they are also included by anyone using NetJob
+#include "net/Download.h"
+#include "net/HttpMetaCache.h"
 
-class NetJob : public Task
-{
+class NetJob : public Task {
     Q_OBJECT
-public:
+
+   public:
     using Ptr = shared_qobject_ptr<NetJob>;
 
     explicit NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network) : Task(), m_network(network)
     {
         setObjectName(job_name);
     }
-    virtual ~NetJob();
+    virtual ~NetJob() = default;
 
-    bool addNetAction(NetAction::Ptr action);
+    void executeTask() override;
 
-    NetAction::Ptr operator[](int index)
-    {
-        return downloads[index];
-    }
-    const NetAction::Ptr at(const int index)
-    {
-        return downloads.at(index);
-    }
-    NetAction::Ptr first()
-    {
-        if (downloads.size())
-            return downloads[0];
-        return NetAction::Ptr();
-    }
-    int size() const
-    {
-        return downloads.size();
-    }
-    QStringList getFailedFiles();
+    auto canAbort() const -> bool override;
 
-    bool canAbort() const override;
+    auto addNetAction(NetAction::Ptr action) -> bool;
 
-private slots:
-    void startMoreParts();
+    auto operator[](int index) -> NetAction::Ptr { return m_downloads[index]; }
+    auto at(int index) -> const NetAction::Ptr { return m_downloads.at(index); }
+    auto size() const -> int { return m_downloads.size(); }
+    auto first() -> NetAction::Ptr { return m_downloads.size() != 0 ? m_downloads[0] : NetAction::Ptr{}; }
 
-public slots:
-    virtual void executeTask() override;
-    virtual bool abort() override;
+    auto getFailedFiles() -> QStringList;
+
+   public slots:
+    // Qt can't handle auto at the start for some reason?
+    bool abort() override;
+
+   private slots:
+    void startMoreParts();
 
-private slots:
     void partProgress(int index, qint64 bytesReceived, qint64 bytesTotal);
     void partSucceeded(int index);
     void partFailed(int index);
     void partAborted(int index);
 
-private:
+   private:
     shared_qobject_ptr<QNetworkAccessManager> m_network;
 
-    struct part_info
-    {
+    struct part_info {
         qint64 current_progress = 0;
         qint64 total_progress = 1;
         int failures = 0;
     };
-    QList<NetAction::Ptr> downloads;
-    QList<part_info> parts_progress;
+
+    QList<NetAction::Ptr> m_downloads;
+    QList<part_info> m_parts_progress;
     QQueue<int> m_todo;
     QSet<int> m_doing;
     QSet<int> m_done;