Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop

1 files changed, 5 insertions, 20 deletions

diff --git a/launcher/net/Upload.h b/launcher/net/Upload.h
index 0b0c9497..f920e556 100644
--- a/launcher/net/Upload.h
+++ b/launcher/net/Upload.h
@@ -37,36 +37,21 @@
 
 #pragma once
 
-#include "NetAction.h"
-#include "Sink.h"
+#include "net/NetRequest.h"
 
 namespace Net {
 
-class Upload : public NetAction {
+class Upload : public NetRequest {
     Q_OBJECT
-
    public:
     using Ptr = shared_qobject_ptr<Upload>;
+    explicit Upload() : NetRequest() { logCat = taskUploadLogC; };
 
     static Upload::Ptr makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data);
-    auto abort() -> bool override;
-    auto canAbort() const -> bool override { return true; };
-
-   protected slots:
-    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
-    void downloadError(QNetworkReply::NetworkError error) override;
-    void sslErrors(const QList<QSslError>& errors) override;
-    void downloadFinished() override;
-    void downloadReadyRead() override;
 
-   public slots:
-    void executeTask() override;
-
-   private:
-    std::unique_ptr<Sink> m_sink;
+   protected:
+    virtual QNetworkReply* getReply(QNetworkRequest&) override;
     QByteArray m_post_data;
-
-    bool handleRedirect();
 };
 
 }  // namespace Net