aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages/modplatform/flame
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/flame
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/flame')
-rw-r--r--launcher/ui/pages/modplatform/flame/FlameModModel.cpp3
-rw-r--r--launcher/ui/pages/modplatform/flame/FlameModModel.h8
-rw-r--r--launcher/ui/pages/modplatform/flame/FlameModPage.cpp4
-rw-r--r--launcher/ui/pages/modplatform/flame/FlameModPage.h18
4 files changed, 17 insertions, 16 deletions
diff --git a/launcher/ui/pages/modplatform/flame/FlameModModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
index 8437f623..905fb2dd 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
@@ -4,6 +4,7 @@
namespace FlameMod {
+// NOLINTNEXTLINE(modernize-avoid-c-arrays)
const char* ListModel::sorts[6]{ "Featured", "Popularity", "LastUpdated", "Name", "Author", "TotalDownloads" };
void ListModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj)
@@ -16,7 +17,7 @@ void ListModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray&
FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), m_parent->m_instance);
}
-QJsonArray ListModel::documentToArray(QJsonDocument& obj) const
+auto ListModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
{
return obj.array();
}
diff --git a/launcher/ui/pages/modplatform/flame/FlameModModel.h b/launcher/ui/pages/modplatform/flame/FlameModModel.h
index cf3042ed..707c1bb1 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModModel.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModModel.h
@@ -9,17 +9,17 @@ class ListModel : public ModPlatform::ListModel {
public:
ListModel(FlameModPage* 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[6];
- inline const char** getSorts() const override { return sorts; };
+ inline auto getSorts() const -> const char** override { return sorts; };
};
} // namespace FlameMod
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp b/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
index 091e49c7..c409a5cb 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
@@ -26,7 +26,7 @@ FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance)
connect(ui->modSelectionButton, &QPushButton::clicked, this, &FlameModPage::onModSelected);
}
-bool FlameModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, QString loaderVer) const
+auto FlameModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, QString loaderVer) const -> bool
{
(void) loaderVer;
return ver.mcVersion.contains(mineVer);
@@ -35,4 +35,4 @@ bool FlameModPage::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 FlameModPage::shouldDisplay() const { return true; }
+auto FlameModPage::shouldDisplay() const -> bool { return true; }
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.h b/launcher/ui/pages/modplatform/flame/FlameModPage.h
index 90513ca5..b48216bb 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.h
@@ -9,17 +9,17 @@ class FlameModPage : public ModPage {
public:
explicit FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance);
- virtual ~FlameModPage() = default;
+ ~FlameModPage() override = default;
- inline QString displayName() const override { return tr("CurseForge"); }
- inline QIcon icon() const override { return APPLICATION->getThemedIcon("flame"); }
- inline QString id() const override { return "curseforge"; }
- inline QString helpPage() const override { return "Flame-platform"; }
+ inline auto displayName() const -> QString override { return tr("CurseForge"); }
+ inline auto icon() const -> QIcon override { return APPLICATION->getThemedIcon("flame"); }
+ inline auto id() const -> QString override { return "curseforge"; }
+ inline auto helpPage() const -> QString override { return "Flame-platform"; }
- inline QString debugName() const override { return tr("Flame"); }
- inline QString metaEntryBase() const override { return "FlameMods"; };
+ inline auto debugName() const -> QString override { return tr("Flame"); }
+ inline auto metaEntryBase() const -> QString override { return "FlameMods"; };
- 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;
};