diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2018-06-14 20:57:35 +0200 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2018-06-15 05:59:14 +0000 |
commit | d7a0750a7f4ff70644e7cb101d1391159333d572 (patch) | |
tree | 16ba0cdd979b9889be1cf2c353ba9c3e7c9fee8d /src/plugins/projectexplorer/outputparser_test.cpp | |
parent | 3b9dfa2b96f2cfe74e45d86dee31f3986e1499fc (diff) |
OutputParserTester: Modernize
Change-Id: Ifa8cd265d32f7fb9f875ede2b05ffb3616fcca62
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/projectexplorer/outputparser_test.cpp')
-rw-r--r-- | src/plugins/projectexplorer/outputparser_test.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp index 4b84a080a9..d785106722 100644 --- a/src/plugins/projectexplorer/outputparser_test.cpp +++ b/src/plugins/projectexplorer/outputparser_test.cpp @@ -34,13 +34,11 @@ namespace ProjectExplorer { static inline QByteArray msgFileComparisonFail(const Utils::FileName &f1, const Utils::FileName &f2) { - const QString result = QLatin1Char('"') + f1.toUserOutput() - + QLatin1String("\" != \"") + f2.toUserOutput() + QLatin1Char('"'); + const QString result = '"' + f1.toUserOutput() + "\" != \"" + f2.toUserOutput() + '"'; return result.toLocal8Bit(); } -OutputParserTester::OutputParserTester() : - m_debug(false) +OutputParserTester::OutputParserTester() { } // test functions: @@ -54,28 +52,28 @@ void OutputParserTester::testParsing(const QString &lines, reset(); Q_ASSERT(childParser()); - QStringList inputLines = lines.split(QLatin1Char('\n')); - foreach (const QString &input, inputLines) { + const QStringList inputLines = lines.split('\n'); + for (const QString &input : inputLines) { if (inputChannel == STDOUT) - childParser()->stdOutput(input + QLatin1Char('\n')); + childParser()->stdOutput(input + '\n'); else - childParser()->stdError(input + QLatin1Char('\n')); + childParser()->stdError(input + '\n'); } childParser()->flush(); // first disconnect ourselves from the end of the parser chain again - IOutputParser * parser = this; + IOutputParser *parser = this; while ( (parser = parser->childParser()) ) { if (parser->childParser() == this) { childParser()->takeOutputParserChain(); break; } } - parser = 0; + parser = nullptr; emit aboutToDeleteParser(); // then delete the parser(s) to test - setChildParser(0); + setChildParser(nullptr); QCOMPARE(m_receivedOutput, outputLines); QCOMPARE(m_receivedStdErrChildLine, childStdErrLines); @@ -142,7 +140,7 @@ void OutputParserTester::outputAdded(const QString &line, BuildStep::OutputForma { Q_UNUSED(format); if (!m_receivedOutput.isEmpty()) - m_receivedOutput.append(QLatin1Char('\n')); + m_receivedOutput.append('\n'); m_receivedOutput.append(line); } @@ -167,13 +165,13 @@ TestTerminator::TestTerminator(OutputParserTester *t) : void TestTerminator::stdOutput(const QString &line) { - QVERIFY(line.endsWith(QLatin1Char('\n'))); + QVERIFY(line.endsWith('\n')); m_tester->m_receivedStdOutChildLine.append(line); } void TestTerminator::stdError(const QString &line) { - QVERIFY(line.endsWith(QLatin1Char('\n'))); + QVERIFY(line.endsWith('\n')); m_tester->m_receivedStdErrChildLine.append(line); } |