diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-08-18 21:31:37 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-08-19 08:05:43 +0200 |
| commit | 67eca08b2260f19ff296c0b6cb73eb3b0479e4b2 (patch) | |
| tree | 96027e6397b24ee87d8d116448387c959a7e197b /api/logic/launch/LaunchTask.h | |
| parent | 9aff21c1810f366f599fc5d35dfd3d7bc216f759 (diff) | |
| download | PrismLauncher-67eca08b2260f19ff296c0b6cb73eb3b0479e4b2.tar.gz PrismLauncher-67eca08b2260f19ff296c0b6cb73eb3b0479e4b2.tar.bz2 PrismLauncher-67eca08b2260f19ff296c0b6cb73eb3b0479e4b2.zip | |
NOISSUE use model/view for Minecraft log data
Diffstat (limited to 'api/logic/launch/LaunchTask.h')
| -rw-r--r-- | api/logic/launch/LaunchTask.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/api/logic/launch/LaunchTask.h b/api/logic/launch/LaunchTask.h index 447445ca..f2fb3a2c 100644 --- a/api/logic/launch/LaunchTask.h +++ b/api/logic/launch/LaunchTask.h @@ -17,6 +17,8 @@ #pragma once #include <QProcess> +#include <QObjectPtr.h> +#include "LogModel.h" #include "BaseInstance.h" #include "MessageLevel.h" #include "LoggedProcess.h" @@ -80,6 +82,8 @@ public: /* methods */ */ virtual bool abort() override; + shared_qobject_ptr<LogModel> getLogModel(); + public: QString substituteVariables(const QString &cmd) const; QString censorPrivateInfo(QString in); @@ -98,13 +102,6 @@ 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); @@ -114,6 +111,7 @@ 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; |