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.
This commit is contained in:
@ -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);
|
||||
};
|
||||
|
@ -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();
|
||||
|
@ -6,8 +6,8 @@
|
||||
|
||||
#include "modplatform/ModIndex.h"
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include "BaseInstance.h"
|
||||
#include <QNetworkAccessManager>
|
||||
|
||||
namespace FlameMod {
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
void NetworkModAPI::searchMods(CallerType* caller, SearchArgs&& args) const
|
||||
{
|
||||
auto netJob = new NetJob(QString("Modrinth::Search"), APPLICATION->network());
|
||||
auto netJob = new NetJob(QString("%1::Search").arg(caller->debugName()), APPLICATION->network());
|
||||
auto searchUrl = getModSearchURL(args);
|
||||
|
||||
auto response = new QByteArray();
|
||||
@ -16,7 +16,7 @@ void NetworkModAPI::searchMods(CallerType* caller, SearchArgs&& args) const
|
||||
QObject::connect(netJob, &NetJob::started, caller, [caller, netJob] { caller->setActiveJob(netJob); });
|
||||
QObject::connect(netJob, &NetJob::failed, caller, &CallerType::searchRequestFailed);
|
||||
QObject::connect(netJob, &NetJob::succeeded, caller, [caller, response] {
|
||||
QJsonParseError parse_error;
|
||||
QJsonParseError parse_error{};
|
||||
QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
|
||||
if (parse_error.error != QJsonParseError::NoError) {
|
||||
qWarning() << "Error while parsing JSON response from " << caller->debugName() << " at " << parse_error.offset
|
||||
@ -39,7 +39,7 @@ void NetworkModAPI::getVersions(CallerType* caller, const QString& addonId) cons
|
||||
netJob->addNetAction(Net::Download::makeByteArray(getVersionsURL(addonId), response));
|
||||
|
||||
QObject::connect(netJob, &NetJob::succeeded, caller, [response, caller, addonId] {
|
||||
QJsonParseError parse_error;
|
||||
QJsonParseError parse_error{};
|
||||
QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
|
||||
if (parse_error.error != QJsonParseError::NoError) {
|
||||
qWarning() << "Error while parsing JSON response from " << caller->debugName() << " at " << parse_error.offset
|
||||
|
@ -8,6 +8,6 @@ class NetworkModAPI : public ModAPI {
|
||||
void getVersions(CallerType* caller, const QString& addonId) const override;
|
||||
|
||||
protected:
|
||||
virtual QString getModSearchURL(SearchArgs& args) const = 0;
|
||||
virtual QString getVersionsURL(const QString& addonId) const = 0;
|
||||
virtual auto getModSearchURL(SearchArgs& args) const -> QString = 0;
|
||||
virtual auto getVersionsURL(const QString& addonId) const -> QString = 0;
|
||||
};
|
||||
|
@ -6,10 +6,10 @@
|
||||
|
||||
class ModrinthAPI : public NetworkModAPI {
|
||||
public:
|
||||
inline QString getAuthorURL(const QString& name) const { return "https://modrinth.com/user/" + name; };
|
||||
inline auto getAuthorURL(const QString& name) const -> QString { return "https://modrinth.com/user/" + name; };
|
||||
|
||||
private:
|
||||
inline QString getModSearchURL(SearchArgs& args) const override
|
||||
inline auto getModSearchURL(SearchArgs& args) const -> QString override
|
||||
{
|
||||
if (!validateModLoader(args.mod_loader)) {
|
||||
qWarning() << "Modrinth only have Forge and Fabric-compatible mods!";
|
||||
@ -30,12 +30,12 @@ class ModrinthAPI : public NetworkModAPI {
|
||||
.arg(args.version);
|
||||
};
|
||||
|
||||
inline QString getVersionsURL(const QString& addonId) const override
|
||||
inline auto getVersionsURL(const QString& addonId) const -> QString override
|
||||
{
|
||||
return QString("https://api.modrinth.com/v2/project/%1/version").arg(addonId);
|
||||
};
|
||||
|
||||
inline QString getModLoaderString(ModLoaderType modLoader) const
|
||||
inline auto getModLoaderString(ModLoaderType modLoader) const -> QString
|
||||
{
|
||||
switch (modLoader) {
|
||||
case Any:
|
||||
@ -49,7 +49,7 @@ class ModrinthAPI : public NetworkModAPI {
|
||||
}
|
||||
}
|
||||
|
||||
inline bool validateModLoader(ModLoaderType modLoader) const
|
||||
inline auto validateModLoader(ModLoaderType modLoader) const -> bool
|
||||
{
|
||||
return modLoader == Any || modLoader == Forge || modLoader == Fabric;
|
||||
}
|
||||
|
@ -30,8 +30,8 @@ void Modrinth::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 = !(static_cast<MinecraftInstance*>(inst))->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
|
||||
QString mcVersion = (static_cast<MinecraftInstance*>(inst))->getPackProfile()->getComponentVersion("net.minecraft");
|
||||
|
||||
for (auto versionIter : arr) {
|
||||
auto obj = versionIter.toObject();
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
#include "modplatform/ModIndex.h"
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include "BaseInstance.h"
|
||||
#include <QNetworkAccessManager>
|
||||
|
||||
namespace Modrinth {
|
||||
|
||||
|
Reference in New Issue
Block a user