Improved formatting, fixed mistakenly-added local variable

PrismLauncher · Apr 23, 2024 · ab7db2b · ab7db2b
1 parent 835cc29
commit ab7db2b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
@@ -237,7 +237,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
           { { "s", "server" }, "Join the specified server on launch (only valid in combination with --launch)", "address" },
           { { "a", "profile" }, "Use the account specified by its profile name (only valid in combination with --launch)", "profile" },
           { { "o", "offline" }, "Launch offline (only valid in combination with --launch)", "offline" },
-          { { "n", "name" }, "When launching offline, use specified name (only makes sense in combination with --launch and --offline)", "name" },
+          { { "n", "name" },
+            "When launching offline, use specified name (only makes sense in combination with --launch and --offline)",
+            "name" },
           { "alive", "Write a small '" + liveCheckFile + "' file after the launcher starts" },
           { { "I", "import" }, "Import instance or resource from specified local path or URL", "url" },
           { "show", "Opens the window for the specified instance (by instance ID)", "show" } });
@@ -270,7 +272,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     }
 
     // error if --launch is missing with --server or --profile
-    if ((!m_serverToJoin.isEmpty() || !m_profileToUse.isEmpty() || m_offline || !m_offlineName.isEmpty()) && m_instanceIdToLaunch.isEmpty()) {
+    if ((!m_serverToJoin.isEmpty() || !m_profileToUse.isEmpty() || m_offline || !m_offlineName.isEmpty()) &&
+        m_instanceIdToLaunch.isEmpty()) {
         std::cerr << "--server, --profile, --offline and --name can only be used in combination with --launch!" << std::endl;
         m_status = Application::Failed;
         return;

diff --git a/launcher/Application.h b/launcher/Application.h
@@ -203,7 +203,7 @@ class Application : public QApplication {
                 bool demo = false,
                 MinecraftServerTargetPtr serverToJoin = nullptr,
                 MinecraftAccountPtr accountToUse = nullptr,
-                const QString &offlineName = QString());
+                const QString& offlineName = QString());
     bool kill(InstancePtr instance);
     void closeCurrentWindow();
 

diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp
@@ -188,9 +188,9 @@ void LaunchController::login()
                     }
 
                     QString usedname;
-                    if(m_offlineName.isEmpty()) {
+                    if (m_offlineName.isEmpty()) {
                         QString lastOfflinePlayerName = APPLICATION->settings()->get("LastOfflinePlayerName").toString();
-                        QString usedname = lastOfflinePlayerName.isEmpty() ? m_session->player_name : lastOfflinePlayerName;
+                        usedname = lastOfflinePlayerName.isEmpty() ? m_session->player_name : lastOfflinePlayerName;
                         QString name = QInputDialog::getText(m_parentWidget, tr("Player name"), message, QLineEdit::Normal, usedname, &ok);
                         if (!ok) {
                             tryagain = false;
@@ -200,8 +200,7 @@ void LaunchController::login()
                             usedname = name;
                             APPLICATION->settings()->set("LastOfflinePlayerName", usedname);
                         }
-                    }
-                    else {
+                    } else {
                         usedname = m_offlineName;
                     }
                     m_session->MakeOffline(usedname);

diff --git a/launcher/LaunchController.h b/launcher/LaunchController.h
@@ -48,15 +48,15 @@ class LaunchController : public Task {
     void executeTask() override;
 
     LaunchController(QObject* parent = nullptr);
-    virtual ~LaunchController(){};
+    virtual ~LaunchController() {};
 
     void setInstance(InstancePtr instance) { m_instance = instance; }
 
     InstancePtr instance() { return m_instance; }
 
     void setOnline(bool online) { m_online = online; }
 
-    void setOfflineName(const QString &offlineName) { m_offlineName = offlineName; }
+    void setOfflineName(const QString& offlineName) { m_offlineName = offlineName; }
 
     void setDemo(bool demo) { m_demo = demo; }