CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "NOISSUE rework of minecraft log"

Browse Source 
This reverts commit fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a.
This commit is contained in:
Petr Mrázek
2016-08-10 08:41:58 +02:00
parent c60db13af7
commit e2f3652a0f
8 changed files with 195 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/logic/launch/LaunchTask.h
View File

@ -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;