From 8409aa2571d57f015a634a220107d199e88ba2fd Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Tue, 8 Mar 2022 11:12:35 -0300
Subject: tidy: Fix clang-tidy issues on files changed in this PR

The checks used are roughly the same as the ones proposed in the
clang-tidy PR (except perhaps that I used modernize-* instead of listing
them individually,though I don't think this caused any readability
detriments).

In ModrinthModel.cpp and FlameModModel.cpp I ignored the
modernize-avoid-c-arrays one, mostly because making the sorts array an
std::array would most likely increase the code complexity because of the
virtual function. Aside from that, the static_cast warning from
Application.h was not dealt with, since it's not in this PR's scope.
---
 launcher/modplatform/flame/FlameAPI.h        | 4 ++--
 launcher/modplatform/flame/FlameModIndex.cpp | 4 ++--
 launcher/modplatform/flame/FlameModIndex.h   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index f7f993d7..62accfa4 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -4,7 +4,7 @@
 
 class FlameAPI : public NetworkModAPI {
    private:
-    inline QString getModSearchURL(SearchArgs& args) const
+    inline auto getModSearchURL(SearchArgs& args) const -> QString override
     {
         return QString(
                    "https://addons-ecs.forgesvc.net/api/v2/addon/search?"
@@ -25,7 +25,7 @@ class FlameAPI : public NetworkModAPI {
             .arg(args.version);
     };
 
-    inline QString getVersionsURL(const QString& addonId) const
+    inline auto getVersionsURL(const QString& addonId) const -> QString override
     {
         return QString("https://addons-ecs.forgesvc.net/api/v2/addon/%1/files").arg(addonId);
     };
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 61cb534c..2c3adee4 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -43,8 +43,8 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
                                        BaseInstance* inst)
 {
     QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    bool hasFabric = !((MinecraftInstance*)inst)->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
-    QString mcVersion = ((MinecraftInstance*)inst)->getPackProfile()->getComponentVersion("net.minecraft");
+    bool hasFabric = !(dynamic_cast<MinecraftInstance*>(inst))->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
+    QString mcVersion = (dynamic_cast<MinecraftInstance*>(inst))->getPackProfile()->getComponentVersion("net.minecraft");
 
     for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
diff --git a/launcher/modplatform/flame/FlameModIndex.h b/launcher/modplatform/flame/FlameModIndex.h
index 34f71498..d3171d94 100644
--- a/launcher/modplatform/flame/FlameModIndex.h
+++ b/launcher/modplatform/flame/FlameModIndex.h
@@ -6,8 +6,8 @@
 
 #include "modplatform/ModIndex.h"
 
-#include <QNetworkAccessManager>
 #include "BaseInstance.h"
+#include <QNetworkAccessManager>
 
 namespace FlameMod {
 
-- 
cgit