diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-05-18 19:07:01 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-05-18 19:07:01 +0200 |
commit | 911ac19a56fa1a5f8dd4798385022813cd0b9d07 (patch) | |
tree | 607971d32b1c6e18bb5d6570800fa7e3bd11878d /logic/MinecraftProcess.h | |
parent | 7f2a16917e347db2ffcdd5a148feda71f6f3a47e (diff) | |
download | MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.gz MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.lz MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.xz MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.zip |
Screenshot upload dialog(s) now have the console window as parent.
Diffstat (limited to 'logic/MinecraftProcess.h')
-rw-r--r-- | logic/MinecraftProcess.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/logic/MinecraftProcess.h b/logic/MinecraftProcess.h index d47a6cd2..b61ef380 100644 --- a/logic/MinecraftProcess.h +++ b/logic/MinecraftProcess.h @@ -52,8 +52,13 @@ public: * @brief MinecraftProcess constructor * @param inst the Instance pointer to launch */ - MinecraftProcess(BaseInstance *inst); + MinecraftProcess(InstancePtr inst); + virtual ~MinecraftProcess() + { + + }; + /** * @brief start the launcher part with the provided launch script */ @@ -69,7 +74,7 @@ public: */ void abort(); - BaseInstance *instance() + InstancePtr instance() { return m_instance; } @@ -97,22 +102,22 @@ signals: /** * @brief emitted when Minecraft immediately fails to run */ - void launch_failed(BaseInstance *); + void launch_failed(InstancePtr); /** * @brief emitted when the PreLaunchCommand fails */ - void prelaunch_failed(BaseInstance *, int code, QProcess::ExitStatus status); + void prelaunch_failed(InstancePtr, int code, QProcess::ExitStatus status); /** * @brief emitted when the PostLaunchCommand fails */ - void postlaunch_failed(BaseInstance *, int code, QProcess::ExitStatus status); + void postlaunch_failed(InstancePtr, int code, QProcess::ExitStatus status); /** * @brief emitted when mc has finished and the PostLaunchCommand was run */ - void ended(BaseInstance *, int code, QProcess::ExitStatus status); + void ended(InstancePtr, int code, QProcess::ExitStatus status); /** * @brief emitted when we want to log something @@ -122,7 +127,7 @@ signals: void log(QString text, MessageLevel::Enum level = MessageLevel::MultiMC); protected: - BaseInstance *m_instance = nullptr; + InstancePtr m_instance; QString m_err_leftover; QString m_out_leftover; QProcess m_prepostlaunchprocess; |