aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages/modplatform/modrinth
diff options
context:
space:
mode:
authorflow <thiagodonato300@gmail.com>2022-03-08 11:12:35 -0300
committerflow <thiagodonato300@gmail.com>2022-03-14 17:43:36 -0300
commit8409aa2571d57f015a634a220107d199e88ba2fd (patch)
treee57a9be808be1f4a19b7ae31b1ba846ca53a111b /launcher/ui/pages/modplatform/modrinth
parentb3c2a56ece925bc6fe327b8824c50f194610b5b9 (diff)
downloadPrismLauncher-8409aa2571d57f015a634a220107d199e88ba2fd.tar.gz
PrismLauncher-8409aa2571d57f015a634a220107d199e88ba2fd.tar.bz2
PrismLauncher-8409aa2571d57f015a634a220107d199e88ba2fd.zip
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.
Diffstat (limited to 'launcher/ui/pages/modplatform/modrinth')
-rw-r--r--launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp3
-rw-r--r--launcher/ui/pages/modplatform/modrinth/ModrinthModel.h7
-rw-r--r--launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp4
-rw-r--r--launcher/ui/pages/modplatform/modrinth/ModrinthPage.h18
4 files changed, 17 insertions, 15 deletions
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index ac3c14f2..daa43e26 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -4,6 +4,7 @@
namespace Modrinth {
+// NOLINTNEXTLINE(modernize-avoid-c-arrays)
const char* ListModel::sorts[5]{ "relevance", "downloads", "follows", "updated", "newest" };
void ListModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj)
@@ -16,7 +17,7 @@ void ListModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray&
Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), m_parent->m_instance);
}
-QJsonArray ListModel::documentToArray(QJsonDocument& obj) const
+auto ListModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
{
return obj.object().value("hits").toArray();
}
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
index de73704c..45a6090a 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
@@ -9,16 +9,17 @@ class ListModel : public ModPlatform::ListModel {
public:
ListModel(ModrinthPage* parent) : ModPlatform::ListModel(parent){};
- virtual ~ListModel() = default;
+ ~ListModel() override = default;
private:
void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
- QJsonArray documentToArray(QJsonDocument& obj) const override;
+ auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
+ // NOLINTNEXTLINE(modernize-avoid-c-arrays)
static const char* sorts[5];
- inline const char** getSorts() const override { return sorts; };
+ inline auto getSorts() const -> const char** override { return sorts; };
};
} // namespace Modrinth
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index cf01506e..aebfee74 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -25,7 +25,7 @@ ModrinthPage::ModrinthPage(ModDownloadDialog* dialog, BaseInstance* instance)
connect(ui->modSelectionButton, &QPushButton::clicked, this, &ModrinthPage::onModSelected);
}
-bool ModrinthPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, QString loaderVer) const
+auto ModrinthPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, QString loaderVer) const -> bool
{
return ver.mcVersion.contains(mineVer) && ver.loaders.contains(loaderVer);
}
@@ -33,4 +33,4 @@ bool ModrinthPage::validateVersion(ModPlatform::IndexedVersion& ver, QString min
// I don't know why, but doing this on the parent class makes it so that
// other mod providers start loading before being selected, at least with
// my Qt, so we need to implement this in every derived class...
-bool ModrinthPage::shouldDisplay() const { return true; }
+auto ModrinthPage::shouldDisplay() const -> bool { return true; }
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
index 6f387708..6e911b83 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -9,17 +9,17 @@ class ModrinthPage : public ModPage {
public:
explicit ModrinthPage(ModDownloadDialog* dialog, BaseInstance* instance);
- virtual ~ModrinthPage() = default;
+ ~ModrinthPage() override = default;
- inline QString displayName() const override { return tr("Modrinth"); }
- inline QIcon icon() const override { return APPLICATION->getThemedIcon("modrinth"); }
- inline QString id() const override { return "modrinth"; }
- inline QString helpPage() const override { return "Modrinth-platform"; }
+ inline auto displayName() const -> QString override { return tr("Modrinth"); }
+ inline auto icon() const -> QIcon override { return APPLICATION->getThemedIcon("modrinth"); }
+ inline auto id() const -> QString override { return "modrinth"; }
+ inline auto helpPage() const -> QString override { return "Modrinth-platform"; }
- inline QString debugName() const override { return tr("Modrinth"); }
- inline QString metaEntryBase() const override { return "ModrinthPacks"; };
+ inline auto debugName() const -> QString override { return tr("Modrinth"); }
+ inline auto metaEntryBase() const -> QString override { return "ModrinthPacks"; };
- bool validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, QString loaderVer = "") const override;
+ auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, QString loaderVer = "") const -> bool override;
- bool shouldDisplay() const override;
+ auto shouldDisplay() const -> bool override;
};