From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 api/logic/meta/JsonFormat.h | 46 ++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'api/logic/meta/JsonFormat.h')

diff --git a/api/logic/meta/JsonFormat.h b/api/logic/meta/JsonFormat.h
index 762a36f6..06732ffd 100644
--- a/api/logic/meta/JsonFormat.h
+++ b/api/logic/meta/JsonFormat.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2018 MultiMC Contributors
+/* Copyright 2015-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,39 +30,39 @@ class VersionList;
 
 enum class MetadataVersion
 {
-	Invalid = -1,
-	InitialRelease = 1
+    Invalid = -1,
+    InitialRelease = 1
 };
 
 class ParseException : public Exception
 {
 public:
-	using Exception::Exception;
+    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;
-	}
-	QString uid;
-	QString equalsVersion;
-	QString suggests;
+    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;
 };
 
 inline Q_DECL_PURE_FUNCTION uint qHash(const Require &key, uint seed = 0) Q_DECL_NOTHROW
 {
-	return qHash(key.uid, seed);
+    return qHash(key.uid, seed);
 }
 
 using RequireSet = std::set<Require>;
@@ -80,4 +80,4 @@ void serializeRequires(QJsonObject & objOut, RequireSet* ptr, const char * keyNa
 MetadataVersion currentFormatVersion();
 }
 
-Q_DECLARE_METATYPE(std::set<Meta::Require>);
\ No newline at end of file
+Q_DECLARE_METATYPE(std::set<Meta::Require>)
-- 
cgit v1.2.3