aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheLastRar <TheLastRar@users.noreply.github.com>2022-11-01 14:04:14 +0000
committerTheLastRar <TheLastRar@users.noreply.github.com>2022-11-04 18:11:39 +0000
commite29259cd5511f25a4559ff1f8a4e9473ad81ee4e (patch)
treef89438ba679e97f8c94b846761ce0f8406014161
parent79a728d7d2a379799a2813b83a418ece1ff1aa3c (diff)
downloadPrismLauncher-e29259cd5511f25a4559ff1f8a4e9473ad81ee4e.tar.gz
PrismLauncher-e29259cd5511f25a4559ff1f8a4e9473ad81ee4e.tar.bz2
PrismLauncher-e29259cd5511f25a4559ff1f8a4e9473ad81ee4e.zip
Fix: Resolve ambiguous overload errors
Clang-cl fails to select the correct function and instead errors Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
-rw-r--r--launcher/modplatform/modrinth/ModrinthPackManifest.cpp2
-rw-r--r--launcher/net/HttpMetaCache.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
index a4620df9..96f54067 100644
--- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
@@ -140,7 +140,7 @@ auto loadIndexedVersion(QJsonObject &obj) -> ModpackVersion
for (auto file_iter : files) {
File indexed_file;
auto parent = Json::requireObject(file_iter);
- auto is_primary = Json::ensureBoolean(parent, "primary", false);
+ auto is_primary = Json::ensureBoolean(parent, (const QString)QStringLiteral("primary"), false);
if (!is_primary) {
auto filename = Json::ensureString(parent, "filename");
// Checking suffix here is fine because it's the response from Modrinth,
diff --git a/launcher/net/HttpMetaCache.cpp b/launcher/net/HttpMetaCache.cpp
index 42198b71..e242dcf4 100644
--- a/launcher/net/HttpMetaCache.cpp
+++ b/launcher/net/HttpMetaCache.cpp
@@ -242,7 +242,7 @@ void HttpMetaCache::Load()
foo->local_changed_timestamp = Json::ensureDouble(element_obj, "last_changed_timestamp");
foo->remote_changed_timestamp = Json::ensureString(element_obj, "remote_changed_timestamp");
- foo->makeEternal(Json::ensureBoolean(element_obj, "eternal", false));
+ foo->makeEternal(Json::ensureBoolean(element_obj, (const QString)QStringLiteral("eternal"), false));
if (!foo->isEternal()) {
foo->current_age = Json::ensureDouble(element_obj, "current_age");
foo->max_age = Json::ensureDouble(element_obj, "max_age");