Merge branch 'develop' into better-launch

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

1 files changed, 17 insertions, 35 deletions

diff --git a/launcher/meta/JsonFormat.h b/launcher/meta/JsonFormat.h
index 63128a4e..d474bcc3 100644
--- a/launcher/meta/JsonFormat.h
+++ b/launcher/meta/JsonFormat.h
@@ -18,43 +18,25 @@
 #include <QJsonObject>
 #include <memory>
 
+#include <set>
 #include "Exception.h"
 #include "meta/BaseEntity.h"
-#include <set>
 
-namespace Meta
-{
+namespace Meta {
 class Index;
 class Version;
 class VersionList;
 
-enum class MetadataVersion
-{
-    Invalid = -1,
-    InitialRelease = 1
-};
+enum class MetadataVersion { Invalid = -1, InitialRelease = 1 };
 
-class ParseException : public Exception
-{
-public:
+class ParseException : public Exception {
+   public:
     using Exception::Exception;
 };
-struct Require
-{
-    bool operator==(const Require & rhs) const
-    {
-        return uid == rhs.uid;
-    }
-    bool operator<(const Require & rhs) const
-    {
-        return uid < rhs.uid;
-    }
-    bool deepEquals(const Require & rhs) const
-    {
-        return uid == rhs.uid
-            && equalsVersion == rhs.equalsVersion
-            && suggests == rhs.suggests;
-    }
+struct Require {
+    bool operator==(const Require& rhs) const { return uid == rhs.uid; }
+    bool operator<(const Require& rhs) const { return uid < rhs.uid; }
+    bool deepEquals(const Require& rhs) const { return uid == rhs.uid && equalsVersion == rhs.equalsVersion && suggests == rhs.suggests; }
     QString uid;
     QString equalsVersion;
     QString suggests;
@@ -62,17 +44,17 @@ struct Require
 
 using RequireSet = std::set<Require>;
 
-void parseIndex(const QJsonObject &obj, Index *ptr);
-void parseVersion(const QJsonObject &obj, Version *ptr);
-void parseVersionList(const QJsonObject &obj, VersionList *ptr);
+void parseIndex(const QJsonObject& obj, Index* ptr);
+void parseVersion(const QJsonObject& obj, Version* ptr);
+void parseVersionList(const QJsonObject& obj, VersionList* ptr);
 
-MetadataVersion parseFormatVersion(const QJsonObject &obj, bool required = true);
-void serializeFormatVersion(QJsonObject &obj, MetadataVersion version);
+MetadataVersion parseFormatVersion(const QJsonObject& obj, bool required = true);
+void serializeFormatVersion(QJsonObject& obj, MetadataVersion version);
 
 // FIXME: this has a different shape than the others...FIX IT!?
-void parseRequires(const QJsonObject &obj, RequireSet * ptr, const char * keyName = "requires");
-void serializeRequires(QJsonObject & objOut, RequireSet* ptr, const char * keyName = "requires");
+void parseRequires(const QJsonObject& obj, RequireSet* ptr, const char* keyName = "requires");
+void serializeRequires(QJsonObject& objOut, RequireSet* ptr, const char* keyName = "requires");
 MetadataVersion currentFormatVersion();
-}
+}  // namespace Meta
 
 Q_DECLARE_METATYPE(std::set<Meta::Require>)