diff --git a/launcher/SysInfo.h b/launcher/SysInfo.h index f3688d60d..f6c04d702 100644 --- a/launcher/SysInfo.h +++ b/launcher/SysInfo.h @@ -1,3 +1,4 @@ +#pragma once #include namespace SysInfo { diff --git a/launcher/logs/LogParser.h b/launcher/logs/LogParser.h index 1a1d86dd1..aaf21e397 100644 --- a/launcher/logs/LogParser.h +++ b/launcher/logs/LogParser.h @@ -16,7 +16,7 @@ * along with this program. If not, see . * */ - +#pragma once #include #include #include diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp index 4406d9b34..083924dc6 100644 --- a/launcher/minecraft/AssetsUtils.cpp +++ b/launcher/minecraft/AssetsUtils.cpp @@ -159,7 +159,7 @@ bool loadAssetsIndexJson(const QString& assetsId, const QString& path, AssetsInd if (key == "hash") { object.hash = value.toString(); } else if (key == "size") { - object.size = value.toDouble(); + object.size = value.toLongLong(); } } diff --git a/launcher/minecraft/Component.cpp b/launcher/minecraft/Component.cpp index ad7ef545c..5f114e942 100644 --- a/launcher/minecraft/Component.cpp +++ b/launcher/minecraft/Component.cpp @@ -462,7 +462,7 @@ void Component::waitLoadMeta() } } -void Component::setUpdateAction(UpdateAction action) +void Component::setUpdateAction(const UpdateAction& action) { m_updateAction = action; } diff --git a/launcher/minecraft/Component.h b/launcher/minecraft/Component.h index 203cc2241..eafdb8ed7 100644 --- a/launcher/minecraft/Component.h +++ b/launcher/minecraft/Component.h @@ -106,7 +106,7 @@ class Component : public QObject, public ProblemProvider { void waitLoadMeta(); - void setUpdateAction(UpdateAction action); + void setUpdateAction(const UpdateAction& action); void clearUpdateAction(); UpdateAction getUpdateAction(); diff --git a/launcher/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp index 36a07ee72..c77ed248d 100644 --- a/launcher/minecraft/ComponentUpdateTask.cpp +++ b/launcher/minecraft/ComponentUpdateTask.cpp @@ -570,7 +570,7 @@ void ComponentUpdateTask::performUpdateActions() component->setVersion(cv.targetVersion); component->waitLoadMeta(); }, - [&component, &instance](const UpdateActionLatestRecommendedCompatible lrc) { + [&component, &instance](const UpdateActionLatestRecommendedCompatible& lrc) { qCDebug(instanceProfileResolveC) << instance->name() << "|" << "UpdateActionLatestRecommendedCompatible" << component->getID() << ":" << component->getVersion() diff --git a/launcher/minecraft/auth/AccountData.cpp b/launcher/minecraft/auth/AccountData.cpp index 9dbe7ffc0..161fd968c 100644 --- a/launcher/minecraft/auth/AccountData.cpp +++ b/launcher/minecraft/auth/AccountData.cpp @@ -41,7 +41,7 @@ #include namespace { -void tokenToJSONV3(QJsonObject& parent, Token t, const char* tokenName) +void tokenToJSONV3(QJsonObject& parent, const Token& t, const char* tokenName) { if (!t.persistent) { return; diff --git a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp index af00c3b9a..21e7c5a2a 100644 --- a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp +++ b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp @@ -87,7 +87,7 @@ ModPlatform::Dependency GetModDependenciesTask::getOverride(const ModPlatform::D { if (auto isQuilt = m_loaderType & ModPlatform::Quilt; isQuilt || m_loaderType & ModPlatform::Fabric) { auto overide = ModPlatform::getOverrideDeps(); - auto over = std::find_if(overide.cbegin(), overide.cend(), [dep, providerName, isQuilt](auto o) { + auto over = std::find_if(overide.cbegin(), overide.cend(), [dep, providerName, isQuilt](const auto& o) { return o.provider == providerName && dep.addonId == (isQuilt ? o.fabric : o.quilt); }); if (over != overide.cend()) { @@ -207,8 +207,9 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen if (!pDep->version.addonId.isValid()) { if (m_loaderType & ModPlatform::Quilt) { // falback for quilt auto overide = ModPlatform::getOverrideDeps(); - auto over = std::find_if(overide.cbegin(), overide.cend(), - [dep, provider](auto o) { return o.provider == provider.name && dep.addonId == o.quilt; }); + auto over = std::find_if(overide.cbegin(), overide.cend(), [dep, provider](const auto& o) { + return o.provider == provider.name && dep.addonId == o.quilt; + }); if (over != overide.cend()) { removePack(dep.addonId); addTask(prepareDependencyTask({ over->fabric, dep.type }, provider.name, level)); diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp index 042214c84..4f2cca80f 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp @@ -391,7 +391,7 @@ QString PackInstallTask::getVersionForLoader(QString uid) return m_version.loader.version; } -QString PackInstallTask::detectLibrary(VersionLibrary library) +QString PackInstallTask::detectLibrary(const VersionLibrary& library) { // Try to detect what the library is if (!library.server.isEmpty() && library.server.split("/").length() >= 3) { diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h index ce8bb636d..8024286e8 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h @@ -105,7 +105,7 @@ class PackInstallTask : public InstanceTask { private: QString getDirForModType(ModType type, QString raw); QString getVersionForLoader(QString uid); - QString detectLibrary(VersionLibrary library); + QString detectLibrary(const VersionLibrary& library); bool createLibrariesComponent(QString instanceRoot, std::shared_ptr profile); bool createPackComponent(QString instanceRoot, std::shared_ptr profile); diff --git a/launcher/ui/pages/instance/McClient.h b/launcher/ui/pages/instance/McClient.h index 832b70d40..633e7aaed 100644 --- a/launcher/ui/pages/instance/McClient.h +++ b/launcher/ui/pages/instance/McClient.h @@ -1,3 +1,4 @@ +#pragma once #include #include #include