diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-08-10 08:41:58 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-08-10 08:41:58 +0200 |
| commit | e2f3652a0f5fc51736cbda7ac4e337a597f3aed1 (patch) | |
| tree | d7d25154db90d2db7724dfb6ee001ce0afee5e21 /api/logic/launch/LaunchTask.h | |
| parent | c60db13af73523c08353f819cc2a8441a7ddbada (diff) | |
| download | MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.tar MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.tar.gz MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.tar.lz MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.tar.xz MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.zip | |
Revert "NOISSUE rework of minecraft log"
This reverts commit fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a.
Diffstat (limited to 'api/logic/launch/LaunchTask.h')
| -rw-r--r-- | api/logic/launch/LaunchTask.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/api/logic/launch/LaunchTask.h b/api/logic/launch/LaunchTask.h index f2fb3a2c..447445ca 100644 --- a/api/logic/launch/LaunchTask.h +++ b/api/logic/launch/LaunchTask.h @@ -17,8 +17,6 @@ #pragma once #include <QProcess> -#include <QObjectPtr.h> -#include "LogModel.h" #include "BaseInstance.h" #include "MessageLevel.h" #include "LoggedProcess.h" @@ -82,8 +80,6 @@ public: /* methods */ */ virtual bool abort() override; - shared_qobject_ptr<LogModel> getLogModel(); - public: QString substituteVariables(const QString &cmd) const; QString censorPrivateInfo(QString in); @@ -102,6 +98,13 @@ signals: void requestLogging(); + /** + * @brief emitted when we want to log something + * @param text the text to log + * @param level the level to log at + */ + void log(QString text, MessageLevel::Enum level = MessageLevel::MultiMC); + public slots: void onLogLines(const QStringList& lines, MessageLevel::Enum defaultLevel = MessageLevel::MultiMC); void onLogLine(QString line, MessageLevel::Enum defaultLevel = MessageLevel::MultiMC); @@ -111,7 +114,6 @@ public slots: protected: /* data */ InstancePtr m_instance; - shared_qobject_ptr<LogModel> m_logModel; QList <std::shared_ptr<LaunchStep>> m_steps; QMap<QString, QString> m_censorFilter; int currentStep = -1; |