diff --git a/src/plugins/autotest/boost/boosttestconfiguration.cpp b/src/plugins/autotest/boost/boosttestconfiguration.cpp index c3cffb5b863..5a9bd6beaab 100644 --- a/src/plugins/autotest/boost/boosttestconfiguration.cpp +++ b/src/plugins/autotest/boost/boosttestconfiguration.cpp @@ -16,8 +16,8 @@ namespace Autotest { namespace Internal { -TestOutputReader *BoostTestConfiguration::outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const +TestOutputReader *BoostTestConfiguration::createOutputReader( + const QFutureInterface &fi, Utils::QtcProcess *app) const { auto settings = static_cast(framework()->testSettings()); return new BoostTestOutputReader(fi, app, buildDirectory(), projectFile(), diff --git a/src/plugins/autotest/boost/boosttestconfiguration.h b/src/plugins/autotest/boost/boosttestconfiguration.h index c2537c2cc61..e1cf2f1d56f 100644 --- a/src/plugins/autotest/boost/boosttestconfiguration.h +++ b/src/plugins/autotest/boost/boosttestconfiguration.h @@ -13,8 +13,8 @@ class BoostTestConfiguration : public DebuggableTestConfiguration public: explicit BoostTestConfiguration(ITestFramework *framework) : DebuggableTestConfiguration(framework) {} - TestOutputReader *outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const override; + TestOutputReader *createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; }; diff --git a/src/plugins/autotest/catch/catchconfiguration.cpp b/src/plugins/autotest/catch/catchconfiguration.cpp index 0a9f8aee94a..7f82aa629eb 100644 --- a/src/plugins/autotest/catch/catchconfiguration.cpp +++ b/src/plugins/autotest/catch/catchconfiguration.cpp @@ -14,8 +14,8 @@ namespace Autotest { namespace Internal { -TestOutputReader *CatchConfiguration::outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const +TestOutputReader *CatchConfiguration::createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const { return new CatchOutputReader(fi, app, buildDirectory(), projectFile()); } diff --git a/src/plugins/autotest/catch/catchconfiguration.h b/src/plugins/autotest/catch/catchconfiguration.h index 91a5cd78bd0..422cf7af4fb 100644 --- a/src/plugins/autotest/catch/catchconfiguration.h +++ b/src/plugins/autotest/catch/catchconfiguration.h @@ -12,8 +12,8 @@ class CatchConfiguration : public DebuggableTestConfiguration { public: CatchConfiguration(ITestFramework *framework) : DebuggableTestConfiguration(framework) {} - TestOutputReader *outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const override; + TestOutputReader *createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; }; diff --git a/src/plugins/autotest/ctest/ctestconfiguration.cpp b/src/plugins/autotest/ctest/ctestconfiguration.cpp index fd45091cc7f..ed54b7028f4 100644 --- a/src/plugins/autotest/ctest/ctestconfiguration.cpp +++ b/src/plugins/autotest/ctest/ctestconfiguration.cpp @@ -13,8 +13,8 @@ CTestConfiguration::CTestConfiguration(ITestBase *testBase) setDisplayName("CTest"); } -TestOutputReader *CTestConfiguration::outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const +TestOutputReader *CTestConfiguration::createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const { return new CTestOutputReader(fi, app, workingDirectory()); } diff --git a/src/plugins/autotest/ctest/ctestconfiguration.h b/src/plugins/autotest/ctest/ctestconfiguration.h index e140c17e84c..b19bf8d6981 100644 --- a/src/plugins/autotest/ctest/ctestconfiguration.h +++ b/src/plugins/autotest/ctest/ctestconfiguration.h @@ -13,8 +13,8 @@ class CTestConfiguration final : public Autotest::TestToolConfiguration public: explicit CTestConfiguration(ITestBase *testBase); - TestOutputReader *outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const final; + TestOutputReader *createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const final; }; } // namespace Internal diff --git a/src/plugins/autotest/gtest/gtestconfiguration.cpp b/src/plugins/autotest/gtest/gtestconfiguration.cpp index 6e4dfa0b413..c78c09c5d31 100644 --- a/src/plugins/autotest/gtest/gtestconfiguration.cpp +++ b/src/plugins/autotest/gtest/gtestconfiguration.cpp @@ -15,8 +15,8 @@ namespace Autotest { namespace Internal { -TestOutputReader *GTestConfiguration::outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const +TestOutputReader *GTestConfiguration::createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const { return new GTestOutputReader(fi, app, buildDirectory(), projectFile()); } diff --git a/src/plugins/autotest/gtest/gtestconfiguration.h b/src/plugins/autotest/gtest/gtestconfiguration.h index d39d907ea2b..786df2467d4 100644 --- a/src/plugins/autotest/gtest/gtestconfiguration.h +++ b/src/plugins/autotest/gtest/gtestconfiguration.h @@ -14,8 +14,8 @@ public: explicit GTestConfiguration(ITestFramework *framework) : DebuggableTestConfiguration(framework) {} - TestOutputReader *outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const override; + TestOutputReader *createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; }; diff --git a/src/plugins/autotest/qtest/qttestconfiguration.cpp b/src/plugins/autotest/qtest/qttestconfiguration.cpp index 7c7ebeecaa6..98f010187a2 100644 --- a/src/plugins/autotest/qtest/qttestconfiguration.cpp +++ b/src/plugins/autotest/qtest/qttestconfiguration.cpp @@ -26,8 +26,8 @@ static QStringList quoteIfNeeded(const QStringList &testCases, bool debugMode) }); } -TestOutputReader *QtTestConfiguration::outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const +TestOutputReader *QtTestConfiguration::createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const { auto qtSettings = static_cast(framework()->testSettings()); const QtTestOutputReader::OutputMode mode = qtSettings && qtSettings->useXMLOutput.value() diff --git a/src/plugins/autotest/qtest/qttestconfiguration.h b/src/plugins/autotest/qtest/qttestconfiguration.h index ad023983ec7..b9800684c9b 100644 --- a/src/plugins/autotest/qtest/qttestconfiguration.h +++ b/src/plugins/autotest/qtest/qttestconfiguration.h @@ -13,8 +13,8 @@ class QtTestConfiguration : public DebuggableTestConfiguration public: explicit QtTestConfiguration(ITestFramework *framework) : DebuggableTestConfiguration(framework) {} - TestOutputReader *outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const override; + TestOutputReader *createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; }; diff --git a/src/plugins/autotest/quick/quicktestconfiguration.cpp b/src/plugins/autotest/quick/quicktestconfiguration.cpp index 6dd3403162b..ffeecec99e6 100644 --- a/src/plugins/autotest/quick/quicktestconfiguration.cpp +++ b/src/plugins/autotest/quick/quicktestconfiguration.cpp @@ -21,8 +21,8 @@ QuickTestConfiguration::QuickTestConfiguration(ITestFramework *framework) setMixedDebugging(true); } -TestOutputReader *QuickTestConfiguration::outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const +TestOutputReader *QuickTestConfiguration::createOutputReader( + const QFutureInterface &fi, Utils::QtcProcess *app) const { auto qtSettings = static_cast(framework()->testSettings()); const QtTestOutputReader::OutputMode mode = qtSettings && qtSettings->useXMLOutput.value() diff --git a/src/plugins/autotest/quick/quicktestconfiguration.h b/src/plugins/autotest/quick/quicktestconfiguration.h index 2640a24b25a..1b1eff7cb42 100644 --- a/src/plugins/autotest/quick/quicktestconfiguration.h +++ b/src/plugins/autotest/quick/quicktestconfiguration.h @@ -12,8 +12,8 @@ class QuickTestConfiguration : public DebuggableTestConfiguration { public: explicit QuickTestConfiguration(ITestFramework *framework); - TestOutputReader *outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const override; + TestOutputReader *createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; }; diff --git a/src/plugins/autotest/testconfiguration.h b/src/plugins/autotest/testconfiguration.h index 5f92baef406..8df0ea10553 100644 --- a/src/plugins/autotest/testconfiguration.h +++ b/src/plugins/autotest/testconfiguration.h @@ -41,8 +41,8 @@ public: bool hasExecutable() const; Utils::FilePath executableFilePath() const; - virtual TestOutputReader *outputReader(const QFutureInterface &fi, - Utils::QtcProcess *app) const = 0; + virtual TestOutputReader *createOutputReader(const QFutureInterface &fi, + Utils::QtcProcess *app) const = 0; virtual Utils::Environment filteredEnvironment(const Utils::Environment &original) const; ITestBase *testBase() const { return m_testBase; } diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index d9a7f22a9b3..2fad3e2199f 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -247,7 +247,7 @@ void TestRunner::scheduleNext() setUpProcess(); QTC_ASSERT(m_currentProcess, onProcessDone(); return); QTC_ASSERT(!m_currentOutputReader, delete m_currentOutputReader); - m_currentOutputReader = m_currentConfig->outputReader(*m_fakeFutureInterface, m_currentProcess); + m_currentOutputReader = m_currentConfig->createOutputReader(*m_fakeFutureInterface, m_currentProcess); QTC_ASSERT(m_currentOutputReader, onProcessDone();return); connect(m_currentOutputReader, &TestOutputReader::newOutputLineAvailable, @@ -661,7 +661,7 @@ void TestRunner::debugTests() m_futureWatcher.setFuture(futureInterface->future()); if (useOutputProcessor) { - TestOutputReader *outputreader = config->outputReader(*futureInterface, nullptr); + TestOutputReader *outputreader = config->createOutputReader(*futureInterface, nullptr); outputreader->setId(inferior.command.executable().toString()); connect(outputreader, &TestOutputReader::newOutputLineAvailable, TestResultsPane::instance(), &TestResultsPane::addOutputLine);