From e2f3652a0f5fc51736cbda7ac4e337a597f3aed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 10 Aug 2016 08:41:58 +0200 Subject: Revert "NOISSUE rework of minecraft log" This reverts commit fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a. --- api/logic/launch/LaunchTask.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'api/logic/launch/LaunchTask.h') 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 -#include -#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 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 m_logModel; QList > m_steps; QMap m_censorFilter; int currentStep = -1; -- cgit v1.2.3