renamed enum type

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

3 files changed, 30 insertions, 41 deletions

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 04fd42a7..17edcdb5 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -24,30 +24,32 @@
 
 namespace ModPlatform {
 
-static const QMap<QString, IndexedVersionType::Enum> s_indexed_version_type_names = { { "release", IndexedVersionType::Enum::Release },
-                                                                                      { "beta", IndexedVersionType::Enum::Beta },
-                                                                                      { "alpha", IndexedVersionType::Enum::Alpha } };
+static const QMap<QString, IndexedVersionType::VersionType> s_indexed_version_type_names = {
+    { "release", IndexedVersionType::VersionType::Release },
+    { "beta", IndexedVersionType::VersionType::Beta },
+    { "alpha", IndexedVersionType::VersionType::Alpha }
+};
 
 IndexedVersionType::IndexedVersionType(const QString& type) : IndexedVersionType(enumFromString(type)) {}
 
-IndexedVersionType::IndexedVersionType(int type)
+IndexedVersionType::IndexedVersionType(int flame_type)
 {
-    switch (type) {
+    switch (flame_type) {
         case 1:
-            m_type = IndexedVersionType::Enum::Release;
+            m_type = IndexedVersionType::VersionType::Release;
             break;
         case 2:
-            m_type = IndexedVersionType::Enum::Beta;
+            m_type = IndexedVersionType::VersionType::Beta;
             break;
         case 3:
-            m_type = IndexedVersionType::Enum::Alpha;
+            m_type = IndexedVersionType::VersionType::Alpha;
             break;
         default:
-            m_type = IndexedVersionType::Enum::UNKNOWN;
+            m_type = IndexedVersionType::VersionType::Unknown;
     }
 }
 
-IndexedVersionType::IndexedVersionType(const IndexedVersionType::Enum& type)
+IndexedVersionType::IndexedVersionType(const IndexedVersionType::VersionType& type)
 {
     m_type = type;
 }
@@ -63,24 +65,14 @@ IndexedVersionType& IndexedVersionType::operator=(const IndexedVersionType& othe
     return *this;
 }
 
-const QString IndexedVersionType::toString(const IndexedVersionType::Enum& type)
+const QString IndexedVersionType::toString(const IndexedVersionType::VersionType& type)
 {
-    switch (type) {
-        case IndexedVersionType::Enum::Release:
-            return "release";
-        case IndexedVersionType::Enum::Beta:
-            return "beta";
-        case IndexedVersionType::Enum::Alpha:
-            return "alpha";
-        case IndexedVersionType::Enum::UNKNOWN:
-        default:
-            return "unknown";
-    }
+    return s_indexed_version_type_names.key(type, "unknown");
 }
 
-IndexedVersionType::Enum IndexedVersionType::enumFromString(const QString& type)
+IndexedVersionType::VersionType IndexedVersionType::enumFromString(const QString& type)
 {
-    return s_indexed_version_type_names.value(type, IndexedVersionType::Enum::UNKNOWN);
+    return s_indexed_version_type_names.value(type, IndexedVersionType::VersionType::Unknown);
 }
 
 auto ProviderCapabilities::name(ResourceProvider p) -> const char*
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index e430f2b0..e56c282a 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -57,32 +57,32 @@ struct DonationData {
 };
 
 struct IndexedVersionType {
-    enum class Enum { Release = 1, Beta, Alpha, UNKNOWN };
+    enum class VersionType { Release = 1, Beta, Alpha, Unknown };
     IndexedVersionType(const QString& type);
-    IndexedVersionType(int type);
-    IndexedVersionType(const IndexedVersionType::Enum& type);
+    IndexedVersionType(int flame_type);
+    IndexedVersionType(const IndexedVersionType::VersionType& type);
     IndexedVersionType(const IndexedVersionType& type);
-    IndexedVersionType() : IndexedVersionType(IndexedVersionType::Enum::UNKNOWN) {}
-    static const QString toString(const IndexedVersionType::Enum& type);
-    static IndexedVersionType::Enum enumFromString(const QString& type);
-    bool isValid() const { return m_type != IndexedVersionType::Enum::UNKNOWN; }
+    IndexedVersionType() : IndexedVersionType(IndexedVersionType::VersionType::Unknown) {}
+    static const QString toString(const IndexedVersionType::VersionType& type);
+    static IndexedVersionType::VersionType enumFromString(const QString& type);
+    bool isValid() const { return m_type != IndexedVersionType::VersionType::Unknown; }
     IndexedVersionType& operator=(const IndexedVersionType& other);
     bool operator==(const IndexedVersionType& other) const { return m_type == other.m_type; }
-    bool operator==(const IndexedVersionType::Enum& type) const { return m_type == type; }
+    bool operator==(const IndexedVersionType::VersionType& type) const { return m_type == type; }
     bool operator!=(const IndexedVersionType& other) const { return m_type != other.m_type; }
-    bool operator!=(const IndexedVersionType::Enum& type) const { return m_type != type; }
+    bool operator!=(const IndexedVersionType::VersionType& type) const { return m_type != type; }
     bool operator<(const IndexedVersionType& other) const { return m_type < other.m_type; }
-    bool operator<(const IndexedVersionType::Enum& type) const { return m_type < type; }
+    bool operator<(const IndexedVersionType::VersionType& type) const { return m_type < type; }
     bool operator<=(const IndexedVersionType& other) const { return m_type <= other.m_type; }
-    bool operator<=(const IndexedVersionType::Enum& type) const { return m_type <= type; }
+    bool operator<=(const IndexedVersionType::VersionType& type) const { return m_type <= type; }
     bool operator>(const IndexedVersionType& other) const { return m_type > other.m_type; }
-    bool operator>(const IndexedVersionType::Enum& type) const { return m_type > type; }
+    bool operator>(const IndexedVersionType::VersionType& type) const { return m_type > type; }
     bool operator>=(const IndexedVersionType& other) const { return m_type >= other.m_type; }
-    bool operator>=(const IndexedVersionType::Enum& type) const { return m_type >= type; }
+    bool operator>=(const IndexedVersionType::VersionType& type) const { return m_type >= type; }
 
     QString toString() const { return toString(m_type); }
 
-    IndexedVersionType::Enum m_type;
+    IndexedVersionType::VersionType m_type;
 };
 
 struct Dependency {
@@ -159,7 +159,6 @@ struct IndexedPack {
         return std::any_of(versions.constBegin(), versions.constEnd(), [](auto const& v) { return v.is_currently_selected; });
     }
 };
-QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
 struct OverrideDep {
     QString quilt;
diff --git a/launcher/modplatform/flame/FlamePackIndex.h b/launcher/modplatform/flame/FlamePackIndex.h
index 5f642ace..b2a12a67 100644
--- a/launcher/modplatform/flame/FlamePackIndex.h
+++ b/launcher/modplatform/flame/FlamePackIndex.h
@@ -6,8 +6,6 @@
 #include <QVector>
 #include "modplatform/ModIndex.h"
 
-#include "modplatform/ModIndex.h"
-
 namespace Flame {
 
 struct ModpackAuthor {