Merge branch 'develop' into icon-indexing

Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>

1 files changed, 13 insertions, 23 deletions

diff --git a/launcher/minecraft/launch/LauncherPartLaunch.h b/launcher/minecraft/launch/LauncherPartLaunch.h
index 6a7ee0e5..9f6ca1e7 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.h
+++ b/launcher/minecraft/launch/LauncherPartLaunch.h
@@ -15,41 +15,31 @@
 
 #pragma once
 
-#include <launch/LaunchStep.h>
 #include <LoggedProcess.h>
+#include <launch/LaunchStep.h>
 #include <minecraft/auth/AuthSession.h>
 
 #include "MinecraftServerTarget.h"
 
-class LauncherPartLaunch: public LaunchStep
-{
+class LauncherPartLaunch : public LaunchStep {
     Q_OBJECT
-public:
-    explicit LauncherPartLaunch(LaunchTask *parent);
-    virtual ~LauncherPartLaunch() {};
+   public:
+    explicit LauncherPartLaunch(LaunchTask* parent);
+    virtual ~LauncherPartLaunch(){};
 
     virtual void executeTask();
     virtual bool abort();
     virtual void proceed();
-    virtual bool canAbort() const
-    {
-        return true;
-    }
-    void setWorkingDirectory(const QString &wd);
-    void setAuthSession(AuthSessionPtr session)
-    {
-        m_session = session;
-    }
-
-    void setServerToJoin(MinecraftServerTargetPtr serverToJoin)
-    {
-        m_serverToJoin = std::move(serverToJoin);
-    }
-
-private slots:
+    virtual bool canAbort() const { return true; }
+    void setWorkingDirectory(const QString& wd);
+    void setAuthSession(AuthSessionPtr session) { m_session = session; }
+
+    void setServerToJoin(MinecraftServerTargetPtr serverToJoin) { m_serverToJoin = std::move(serverToJoin); }
+
+   private slots:
     void on_state(LoggedProcess::State state);
 
-private:
+   private:
     LoggedProcess m_process;
     QString m_command;
     AuthSessionPtr m_session;