From 61eb23082bef1e8afb92d9e933a1ebfe2d713dcb Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 11 Sep 2013 10:16:03 +0300 Subject: [PATCH] ANSI: Simplify escape sequence MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0088a922af7723aabb6751ac80af39467d4cfb0b Reviewed-by: André Hartmann Reviewed-by: Petar Perisin --- src/libs/utils/ansiescapecodehandler.cpp | 2 +- .../tst_ansiescapecodehandler.cpp | 24 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/libs/utils/ansiescapecodehandler.cpp b/src/libs/utils/ansiescapecodehandler.cpp index bf9b4f29fcd..ecb2285dc5f 100644 --- a/src/libs/utils/ansiescapecodehandler.cpp +++ b/src/libs/utils/ansiescapecodehandler.cpp @@ -77,7 +77,7 @@ QList AnsiEscapeCodeHandler::parseText(const QString &text, QTextCharFormat charFormat = m_previousFormatClosed ? defaultFormat : m_previousFormat; - const QString escape = QChar::fromLatin1(27) + QLatin1Char('['); + const QString escape = QLatin1String("\x1b["); if (!text.contains(escape)) { outputData << StringFormatPair(text, charFormat); return outputData; diff --git a/tests/auto/utils/ansiescapecodehandler/tst_ansiescapecodehandler.cpp b/tests/auto/utils/ansiescapecodehandler/tst_ansiescapecodehandler.cpp index aea46de0f8d..2e15861ff1f 100644 --- a/tests/auto/utils/ansiescapecodehandler/tst_ansiescapecodehandler.cpp +++ b/tests/auto/utils/ansiescapecodehandler/tst_ansiescapecodehandler.cpp @@ -40,6 +40,11 @@ Q_DECLARE_METATYPE(QTextCharFormat); Q_DECLARE_METATYPE(StringFormatPair); Q_DECLARE_METATYPE(ResultList); +static QString ansiEscape(const QByteArray &sequence) +{ + return QString::fromLatin1("\x1b[" + sequence); +} + class tst_AnsiEscapeCodeHandler : public QObject { Q_OBJECT @@ -52,18 +57,17 @@ private Q_SLOTS: void testCase1_data(); private: - static const QString red; - static const QString bold; - static const QString normal; - static const QString normal1; + const QString red; + const QString bold; + const QString normal; + const QString normal1; }; -const QString tst_AnsiEscapeCodeHandler::red = QChar::fromLatin1(27) + "[31m"; -const QString tst_AnsiEscapeCodeHandler::bold = QChar::fromLatin1(27) + "[1m"; -const QString tst_AnsiEscapeCodeHandler::normal = QChar::fromLatin1(27) + "[0m"; -const QString tst_AnsiEscapeCodeHandler::normal1 = QChar::fromLatin1(27) + "[m"; - -tst_AnsiEscapeCodeHandler::tst_AnsiEscapeCodeHandler() +tst_AnsiEscapeCodeHandler::tst_AnsiEscapeCodeHandler() : + red(ansiEscape("31m")), + bold(ansiEscape("1m")), + normal(ansiEscape("0m")), + normal1(ansiEscape("m")) { }