CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang_format and code cleanup

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers
2022-11-01 07:06:36 -07:00
parent 6010ce0dc5
commit 209a1650e4
3 changed files with 62 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -413,15 +413,14 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
/// @brief copy the matched blocked mods to the instance staging area
/// @param blocked_mods list of the blocked mods and their matched paths
void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods) {
void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
{
setStatus(tr("Copying Blocked Mods..."));
setAbortable(false);
int i = 0;
int total = blocked_mods.length();
setProgress(i, total);
for (auto &mod : blocked_mods) {
for (auto const& mod : blocked_mods) {
if (!mod.matched) {
qDebug() << mod.name << "was not matched to a local file, skipping copy";
continue;
@ -433,9 +432,9 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods) {
qDebug() << "Will try to copy" << mod.localPath << "to" << dest_path;
if (!FS::copy(mod.localPath, dest_path)()) {
if (!FS::copy(mod.localPath, dest_path)()) {
qDebug() << "Copy of" << mod.localPath << "to" << dest_path << "Failed";
}
}
i++;
setProgress(i, total);

24
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
View File

@ -353,31 +353,31 @@ void PackInstallTask::onModDownloadFailed(QString reason)
}
/// @brief copy the matched blocked mods to the instance staging area
void PackInstallTask::copyBlockedMods() {
void PackInstallTask::copyBlockedMods()
{
setStatus(tr("Copying Blocked Mods..."));
setAbortable(false);
int i = 0;
int total = m_blocked_mods.length();
setProgress(i, total);
for (auto mod = m_blocked_mods.begin(); mod != m_blocked_mods.end(); mod++, i++) {
if (!mod->matched) {
qDebug() << mod->name << "was not matched to a local file, skipping copy";
for (auto const& mod : m_blocked_mods) {
if (!mod.matched) {
qDebug() << mod.name << "was not matched to a local file, skipping copy";
continue;
}
auto dest_path = FS::PathCombine(m_stagingPath, ".minecraft", "mods", mod->name);
auto dest_path = FS::PathCombine(m_stagingPath, ".minecraft", "mods", mod.name);
setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));
qDebug() << "Will try to copy" << mod->localPath << "to" << dest_path;
qDebug() << "Will try to copy" << mod.localPath << "to" << dest_path;
if (!FS::copy(mod->localPath, dest_path)()) {
qDebug() << "Copy of" << mod->localPath << "to" << dest_path << "Failed";
}
if (!FS::copy(mod.localPath, dest_path)()) {
qDebug() << "Copy of" << mod.localPath << "to" << dest_path << "Failed";
}
setProgress(i+1, total);
i++;
setProgress(i, total);
}
setAbortable(true);