refactor: more net cleanup

This runs clang-tidy on some other files in launcher/net/.

This also makes use of some JSON wrappers in HttpMetaCache, instead of
using the Qt stuff directly.

Lastly, this removes useless null checks (crashes don't occur because of
this, but because of concurrent usage / free of the QByteArray pointer),
and fix a fixme in Download.h

1 files changed, 25 insertions, 34 deletions

diff --git a/launcher/net/Download.h b/launcher/net/Download.h
index 231ad6a7..9fb67127 100644
--- a/launcher/net/Download.h
+++ b/launcher/net/Download.h
@@ -15,63 +15,54 @@
 
 #pragma once
 
-#include "NetAction.h"
 #include "HttpMetaCache.h"
-#include "Validator.h"
+#include "NetAction.h"
 #include "Sink.h"
+#include "Validator.h"
 
 #include "QObjectPtr.h"
 
 namespace Net {
-class Download : public NetAction
-{
+class Download : public NetAction {
     Q_OBJECT
 
-public:
-    typedef shared_qobject_ptr<class Download> Ptr;
-    enum class Option
-    {
-        NoOptions = 0,
-        AcceptLocalFiles = 1
-    };
+   public:
+    using Ptr = shared_qobject_ptr<class Download>;
+    enum class Option { NoOptions = 0, AcceptLocalFiles = 1 };
     Q_DECLARE_FLAGS(Options, Option)
 
-protected:
+   protected:
     explicit Download();
-public:
-    virtual ~Download(){};
-    static Download::Ptr makeCached(QUrl url, MetaEntryPtr entry, Options options = Option::NoOptions);
-    static Download::Ptr makeByteArray(QUrl url, QByteArray *output, Options options = Option::NoOptions);
-    static Download::Ptr makeFile(QUrl url, QString path, Options options = Option::NoOptions);
 
-public:
-    QString getTargetFilepath()
-    {
-        return m_target_path;
-    }
-    void addValidator(Validator * v);
-    bool abort() override;
-    bool canAbort() const override { return true; };
+   public:
+    ~Download() override = default;
+
+    static auto makeCached(QUrl url, MetaEntryPtr entry, Options options = Option::NoOptions) -> Download::Ptr;
+    static auto makeByteArray(QUrl url, QByteArray* output, Options options = Option::NoOptions) -> Download::Ptr;
+    static auto makeFile(QUrl url, QString path, Options options = Option::NoOptions) -> Download::Ptr;
+
+   public:
+    void addValidator(Validator* v);
+    auto abort() -> bool override;
+    auto canAbort() const -> bool override { return true; };
 
-private:
-    bool handleRedirect();
+   private:
+    auto handleRedirect() -> bool;
 
-protected slots:
+   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);
     void downloadFinished() override;
     void downloadReadyRead() override;
 
-public slots:
+   public slots:
     void executeTask() override;
 
-private:
-    // FIXME: remove this, it has no business being here.
-    QString m_target_path;
+   private:
     std::unique_ptr<Sink> m_sink;
     Options m_options;
 };
-}
+}  // namespace Net
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Net::Download::Options)