refactor(MessageLevel): move and rename 'FromLine*' functions
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
@@ -44,7 +44,7 @@ MessageLevel MessageLevel::fromQtMsgType(const QtMsgType& type)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Get message level from a line. Line is modified if it was successful. */
|
/* Get message level from a line. Line is modified if it was successful. */
|
||||||
MessageLevel messageLevelFromLine(QString& line)
|
MessageLevel MessageLevel::takeFromLine(QString& line)
|
||||||
{
|
{
|
||||||
// Level prefix
|
// Level prefix
|
||||||
int endmark = line.indexOf("]!");
|
int endmark = line.indexOf("]!");
|
||||||
@@ -57,7 +57,7 @@ MessageLevel messageLevelFromLine(QString& line)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Get message level from a line from the launcher log. Line is modified if it was successful. */
|
/* Get message level from a line from the launcher log. Line is modified if it was successful. */
|
||||||
MessageLevel messageLevelFromLauncherLine(QString& line)
|
MessageLevel MessageLevel::takeFromLauncherLine(QString& line)
|
||||||
{
|
{
|
||||||
// Level prefix
|
// Level prefix
|
||||||
int startMark = 0;
|
int startMark = 0;
|
||||||
|
|||||||
@@ -33,12 +33,12 @@ struct MessageLevel {
|
|||||||
explicit operator int() const { return static_cast<int>(m_type); }
|
explicit operator int() const { return static_cast<int>(m_type); }
|
||||||
explicit operator MessageLevel::Enum() { return m_type; }
|
explicit operator MessageLevel::Enum() { return m_type; }
|
||||||
|
|
||||||
|
/* Get message level from a line. Line is modified if it was successful. */
|
||||||
|
static MessageLevel takeFromLine(QString& line);
|
||||||
|
|
||||||
|
/* Get message level from a line from the launcher log. Line is modified if it was successful. */
|
||||||
|
static MessageLevel takeFromLauncherLine(QString& line);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Enum m_type;
|
Enum m_type;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Get message level from a line. Line is modified if it was successful. */
|
|
||||||
MessageLevel messageLevelFromLine(QString& line);
|
|
||||||
|
|
||||||
/* Get message level from a line from the launcher log. Line is modified if it was successful. */
|
|
||||||
MessageLevel messageLevelFromLauncherLine(QString& line);
|
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel level)
|
|||||||
} else if (std::holds_alternative<LogParser::PlainText>(item)) {
|
} else if (std::holds_alternative<LogParser::PlainText>(item)) {
|
||||||
auto msg = std::get<LogParser::PlainText>(item).message;
|
auto msg = std::get<LogParser::PlainText>(item).message;
|
||||||
|
|
||||||
MessageLevel newLevel = messageLevelFromLine(msg);
|
MessageLevel newLevel = MessageLevel::takeFromLine(msg);
|
||||||
|
|
||||||
if (newLevel == MessageLevel::Unknown)
|
if (newLevel == MessageLevel::Unknown)
|
||||||
newLevel = LogParser::guessLevel(line, model->previousLevel());
|
newLevel = LogParser::guessLevel(line, model->previousLevel());
|
||||||
|
|||||||
@@ -285,7 +285,7 @@ void OtherLogsPage::reload()
|
|||||||
|
|
||||||
QString lineTemp = line; // don't edit out the time and level for clarity
|
QString lineTemp = line; // don't edit out the time and level for clarity
|
||||||
if (!m_instance) {
|
if (!m_instance) {
|
||||||
level = messageLevelFromLauncherLine(lineTemp);
|
level = MessageLevel::takeFromLauncherLine(lineTemp);
|
||||||
} else {
|
} else {
|
||||||
level = LogParser::guessLevel(line, last);
|
level = LogParser::guessLevel(line, last);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user