From 4f8022888b076a371efd19b141e4f2faa041e6e9 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sun, 27 Jan 2019 07:09:02 +0100 Subject: AnsiEscapeCodeHandler: Modernize Change-Id: Ib604ebd070ebd5a555cd63580bd881cbf1634305 Reviewed-by: Orgad Shaneh --- src/libs/utils/ansiescapecodehandler.cpp | 13 ++++--------- src/libs/utils/ansiescapecodehandler.h | 3 +-- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'src/libs/utils') diff --git a/src/libs/utils/ansiescapecodehandler.cpp b/src/libs/utils/ansiescapecodehandler.cpp index 486279d393..24f66af0d7 100644 --- a/src/libs/utils/ansiescapecodehandler.cpp +++ b/src/libs/utils/ansiescapecodehandler.cpp @@ -51,11 +51,6 @@ namespace Utils { \endlist */ -AnsiEscapeCodeHandler::AnsiEscapeCodeHandler() : - m_previousFormatClosed(true) -{ -} - static QColor ansiColor(uint code) { QTC_ASSERT(code < 8, return QColor()); @@ -81,10 +76,10 @@ QList AnsiEscapeCodeHandler::parseText(const FormattedText &input DefaultBackgroundColor = 49 }; - const QString escape = QLatin1String("\x1b["); - const QChar semicolon = QLatin1Char(';'); - const QChar colorTerminator = QLatin1Char('m'); - const QChar eraseToEol = QLatin1Char('K'); + const QString escape = "\x1b["; + const QChar semicolon = ';'; + const QChar colorTerminator = 'm'; + const QChar eraseToEol = 'K'; QList outputData; QTextCharFormat charFormat = m_previousFormatClosed ? input.format : m_previousFormat; diff --git a/src/libs/utils/ansiescapecodehandler.h b/src/libs/utils/ansiescapecodehandler.h index b2e848f845..dec9cd39af 100644 --- a/src/libs/utils/ansiescapecodehandler.h +++ b/src/libs/utils/ansiescapecodehandler.h @@ -46,14 +46,13 @@ public: class QTCREATOR_UTILS_EXPORT AnsiEscapeCodeHandler { public: - AnsiEscapeCodeHandler(); QList parseText(const FormattedText &input); void endFormatScope(); private: void setFormatScope(const QTextCharFormat &charFormat); - bool m_previousFormatClosed; + bool m_previousFormatClosed = true; QTextCharFormat m_previousFormat; QString m_pendingText; }; -- cgit v1.2.3