From 28d27d4f19ff9768d18ba096f0f4294c36325f40 Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu, 11 Dec 2025 04:41:29 -0700 Subject: [PATCH] refactor(MessageLevel): move and rename 'FromLine*' functions Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> --- launcher/MessageLevel.cpp | 4 ++-- launcher/MessageLevel.h | 12 ++++++------ launcher/launch/LaunchTask.cpp | 2 +- launcher/ui/pages/instance/OtherLogsPage.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/launcher/MessageLevel.cpp b/launcher/MessageLevel.cpp index 7f2b89339..e5f4eb19a 100644 --- a/launcher/MessageLevel.cpp +++ b/launcher/MessageLevel.cpp @@ -44,7 +44,7 @@ MessageLevel MessageLevel::fromQtMsgType(const QtMsgType& type) } /* Get message level from a line. Line is modified if it was successful. */ -MessageLevel messageLevelFromLine(QString& line) +MessageLevel MessageLevel::takeFromLine(QString& line) { // Level prefix 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. */ -MessageLevel messageLevelFromLauncherLine(QString& line) +MessageLevel MessageLevel::takeFromLauncherLine(QString& line) { // Level prefix int startMark = 0; diff --git a/launcher/MessageLevel.h b/launcher/MessageLevel.h index 6de96bc2e..006184780 100644 --- a/launcher/MessageLevel.h +++ b/launcher/MessageLevel.h @@ -33,12 +33,12 @@ struct MessageLevel { explicit operator int() const { return static_cast(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: 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); diff --git a/launcher/launch/LaunchTask.cpp b/launcher/launch/LaunchTask.cpp index 67227dcf2..9985e0f4f 100644 --- a/launcher/launch/LaunchTask.cpp +++ b/launcher/launch/LaunchTask.cpp @@ -254,7 +254,7 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel level) } else if (std::holds_alternative(item)) { auto msg = std::get(item).message; - MessageLevel newLevel = messageLevelFromLine(msg); + MessageLevel newLevel = MessageLevel::takeFromLine(msg); if (newLevel == MessageLevel::Unknown) newLevel = LogParser::guessLevel(line, model->previousLevel()); diff --git a/launcher/ui/pages/instance/OtherLogsPage.cpp b/launcher/ui/pages/instance/OtherLogsPage.cpp index ecdee653a..a3914832b 100644 --- a/launcher/ui/pages/instance/OtherLogsPage.cpp +++ b/launcher/ui/pages/instance/OtherLogsPage.cpp @@ -285,7 +285,7 @@ void OtherLogsPage::reload() QString lineTemp = line; // don't edit out the time and level for clarity if (!m_instance) { - level = messageLevelFromLauncherLine(lineTemp); + level = MessageLevel::takeFromLauncherLine(lineTemp); } else { level = LogParser::guessLevel(line, last); }