diff options
author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
---|---|---|
committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
commit | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch) | |
tree | 7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /application/LaunchController.h | |
parent | 5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff) | |
download | MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip |
merged from 0.6.7 codebase
Diffstat (limited to 'application/LaunchController.h')
-rw-r--r-- | application/LaunchController.h | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/application/LaunchController.h b/application/LaunchController.h index 84c65743..1d879028 100644 --- a/application/LaunchController.h +++ b/application/LaunchController.h @@ -6,56 +6,56 @@ class InstanceWindow; class LaunchController: public Task { - Q_OBJECT + Q_OBJECT public: - void executeTask() override; + void executeTask() override; - LaunchController(QObject * parent = nullptr); - virtual ~LaunchController(){}; + LaunchController(QObject * parent = nullptr); + virtual ~LaunchController(){}; - void setInstance(InstancePtr instance) - { - m_instance = instance; - } - InstancePtr instance() - { - return m_instance; - } - void setOnline(bool online) - { - m_online = online; - } - void setProfiler(BaseProfilerFactory *profiler) - { - m_profiler = profiler; - } - void setParentWidget(QWidget * widget) - { - m_parentWidget = widget; - } - QString id() - { - return m_instance->id(); - } - bool abort() override; + void setInstance(InstancePtr instance) + { + m_instance = instance; + } + InstancePtr instance() + { + return m_instance; + } + void setOnline(bool online) + { + m_online = online; + } + void setProfiler(BaseProfilerFactory *profiler) + { + m_profiler = profiler; + } + void setParentWidget(QWidget * widget) + { + m_parentWidget = widget; + } + QString id() + { + return m_instance->id(); + } + bool abort() override; private: - void login(); - void launchInstance(); + void login(); + void launchInstance(); private slots: - void readyForLaunch(); + void readyForLaunch(); - void onSucceeded(); - void onFailed(QString reason); - void onProgressRequested(Task *task); + void onSucceeded(); + void onFailed(QString reason); + void onProgressRequested(Task *task); private: - BaseProfilerFactory *m_profiler = nullptr; - bool m_online = true; - InstancePtr m_instance; - QWidget * m_parentWidget = nullptr; - InstanceWindow *m_console = nullptr; - AuthSessionPtr m_session; - std::shared_ptr <LaunchTask> m_launcher; + BaseProfilerFactory *m_profiler = nullptr; + bool m_online = true; + InstancePtr m_instance; + QWidget * m_parentWidget = nullptr; + InstanceWindow *m_console = nullptr; + AuthSessionPtr m_session; + shared_qobject_ptr<LaunchTask> m_launcher; }; |