dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: make shared_qobject_ptr ctor explicit

Browse source 
This turns issues like creating two shared ptrs from a single raw ptr
from popping up at runtime, instead making them a compile error.

Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2023-01-24 16:52:09 -03:00
parent 5186ad95d3
commit 29f7ea752f
No known key found for this signature in database
GPG key ID: 8D0F221F0A59F469
63 changed files with 301 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

8
launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
View file

@ -72,14 +72,14 @@ void ModFolderLoadTask::executeTask()
delete mod;
}
else {
m_result->mods[mod->internal_id()] = mod;
m_result->mods[mod->internal_id()].reset(std::move(mod));
m_result->mods[mod->internal_id()]->setStatus(ModStatus::NoMetadata);
}
}
else {
QString chopped_id = mod->internal_id().chopped(9);
if (m_result->mods.contains(chopped_id)) {
m_result->mods[mod->internal_id()] = mod;
m_result->mods[mod->internal_id()].reset(std::move(mod));
auto metadata = m_result->mods[chopped_id]->metadata();
if (metadata) {
@ -90,7 +90,7 @@ void ModFolderLoadTask::executeTask()
}
}
else {
m_result->mods[mod->internal_id()] = mod;
m_result->mods[mod->internal_id()].reset(std::move(mod));
m_result->mods[mod->internal_id()]->setStatus(ModStatus::NoMetadata);
}
}
@ -130,6 +130,6 @@ void ModFolderLoadTask::getFromMetadata()
auto* mod = new Mod(m_mods_dir, metadata);
mod->setStatus(ModStatus::NotInstalled);
m_result->mods[mod->internal_id()] = mod;
m_result->mods[mod->internal_id()].reset(std::move(mod));
}
}