From 766de43e33ce1f81d7cee4741b82a6708ddc70c3 Mon Sep 17 00:00:00 2001 From: Octol1ttle Date: Wed, 21 Jan 2026 11:46:31 +0500 Subject: [PATCH] refactor: use variables for string literals Signed-off-by: Octol1ttle (cherry picked from commit 2842defe7fc336e5cb94959b5f7844479f58e5f5) --- launcher/minecraft/MinecraftInstance.cpp | 39 +++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 4411996d5..c71f819dd 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -890,9 +890,13 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftT QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin) { + constexpr auto indent = " "; + constexpr auto emptyLine = ""; + QStringList out; - out << "Main Class:" << " " + getMainClass() << ""; - out << "Native path:" << " " + getNativePath() << ""; + + out << "Main Class:" << indent + getMainClass() << emptyLine; + out << "Native path:" << indent + getNativePath() << emptyLine; auto profile = m_components->getProfile(); @@ -901,9 +905,9 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr if (alltraits.size()) { out << "Traits:"; for (auto trait : alltraits) { - out << "traits " + trait; + out << indent + trait; } - out << ""; + out << emptyLine; } // native libraries @@ -915,7 +919,7 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr out << "Using system OpenAL."; if (nativeGLFW) out << "Using system GLFW."; - out << ""; + out << emptyLine; } // libraries and class path. @@ -924,14 +928,14 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr QStringList jars, nativeJars; profile->getLibraryFiles(runtimeContext(), jars, nativeJars, getLocalLibraryPath(), binRoot()); for (auto file : jars) { - out << " " + file; + out << indent + file; } - out << ""; + out << emptyLine; out << "Native libraries:"; for (auto file : nativeJars) { - out << " " + file; + out << indent + file; } - out << ""; + out << emptyLine; } // mods and core mods @@ -956,7 +960,7 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr out << u8" [✘] " + mod->fileinfo().completeBaseName() + " (disabled)"; } } - out << ""; + out << emptyLine; } }; @@ -971,19 +975,19 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr auto displayname = jarmod->displayName(runtimeContext()); auto realname = jarmod->filename(runtimeContext()); if (displayname != realname) { - out << " " + displayname + " (" + realname + ")"; + out << indent + displayname + " (" + realname + ")"; } else { - out << " " + realname; + out << indent + realname; } } - out << ""; + out << emptyLine; } // minecraft arguments auto params = processMinecraftArgs(nullptr, targetToJoin); out << "Params:"; - out << " " + params.join(' '); - out << ""; + out << indent + params.join(' '); + out << emptyLine; // window size QString windowParams; @@ -994,9 +998,10 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr auto height = settings->get("MinecraftWinHeight").toInt(); out << "Window size: " + QString::number(width) + " x " + QString::number(height); } - out << ""; + out << emptyLine; + out << "Launcher: " + getLauncher(); - out << ""; + out << emptyLine; return out; }