From 93c503fa30bbbedac1247b8b01875dff7fba5b28 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 14 Sep 2022 13:58:30 +0200 Subject: [PATCH] Squish: Remove unused code Change-Id: I245a37cbf5671a31ea9e627221c3f4cf8a94d59d Reviewed-by: David Schulz --- src/plugins/squish/squishtools.cpp | 9 ++------- src/plugins/squish/squishtools.h | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/plugins/squish/squishtools.cpp b/src/plugins/squish/squishtools.cpp index 72df5508b3c..e303d98cd43 100644 --- a/src/plugins/squish/squishtools.cpp +++ b/src/plugins/squish/squishtools.cpp @@ -215,9 +215,7 @@ struct SquishToolsSettings static SquishToolsSettings toolsSettings; void SquishTools::runTestCases(const QString &suitePath, - const QStringList &testCases, - const QStringList &additionalServerArgs, - const QStringList &additionalRunnerArgs) + const QStringList &testCases) { if (m_shutdownInitiated) return; @@ -240,12 +238,11 @@ void SquishTools::runTestCases(const QString &suitePath, m_suitePath = suitePath; m_testCases = testCases; m_reportFiles.clear(); - m_additionalServerArguments = additionalServerArgs; const QString dateTimeString = QDateTime::currentDateTime().toString("yyyy-MM-ddTHH-mm-ss"); m_currentResultsDirectory = QFileInfo(QDir(resultsDirectory), dateTimeString).absoluteFilePath(); - m_additionalRunnerArguments = additionalRunnerArgs; + m_additionalRunnerArguments.clear(); m_additionalRunnerArguments << "--interactive" << "--resultdir" << QDir::toNativeSeparators(m_currentResultsDirectory); @@ -513,7 +510,6 @@ void SquishTools::setIdle() m_currentTestCasePath.clear(); m_reportFiles.clear(); m_additionalRunnerArguments.clear(); - m_additionalServerArguments.clear(); m_perspective.setPerspectiveMode(SquishPerspective::NoMode); m_currentResultsDirectory.clear(); m_lastTopLevelWindows.clear(); @@ -1267,7 +1263,6 @@ QStringList SquishTools::serverArgumentsFromSettings() const QStringList SquishTools::runnerArgumentsFromSettings() { QStringList arguments; - arguments << m_additionalServerArguments; if (!toolsSettings.isLocalServer) arguments << "--host" << toolsSettings.serverHost; arguments << "--port" << QString::number(m_serverPort); diff --git a/src/plugins/squish/squishtools.h b/src/plugins/squish/squishtools.h index 543ca805b60..fbb663d3c65 100644 --- a/src/plugins/squish/squishtools.h +++ b/src/plugins/squish/squishtools.h @@ -62,9 +62,7 @@ public: State state() const { return m_state; } void runTestCases(const QString &suitePath, - const QStringList &testCases = QStringList(), - const QStringList &additionalServerArgs = QStringList(), - const QStringList &additionalRunnerArgs = QStringList()); + const QStringList &testCases = QStringList()); void recordTestCase(const QString &suitePath, const QString &testCaseName, const SuiteConf &suiteConf); void queryServerSettings(); @@ -155,7 +153,6 @@ private: Utils::FilePath m_currentRecorderSnippetFile; QFile *m_currentResultsXML = nullptr; QFileSystemWatcher *m_resultsFileWatcher = nullptr; - QStringList m_additionalServerArguments; QStringList m_additionalRunnerArguments; QList m_serverConfigChanges; QWindowList m_lastTopLevelWindows;