diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 38d5494f887..707ccccfa3e 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -387,7 +387,7 @@ void ClangToolRunControl::analyzeNextFile() void ClangToolRunControl::onRunnerFinishedWithSuccess(const QString &filePath) { - const QString logFilePath = qobject_cast(sender())->actualLogFile(); + const QString logFilePath = qobject_cast(sender())->logFilePath(); qCDebug(LOG) << "onRunnerFinishedWithSuccess:" << logFilePath; QString errorMessage; @@ -415,7 +415,7 @@ void ClangToolRunControl::onRunnerFinishedWithFailure(const QString &errorMessag << errorMessage << '\n' << errorDetails; // Even in the error case the log file was created, so clean it up here, too. - QFile::remove(qobject_cast(sender())->actualLogFile()); + QFile::remove(qobject_cast(sender())->logFilePath()); ++m_filesNotAnalyzed; m_success = false; diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp index 61646d18722..f66f14a23e7 100644 --- a/src/plugins/clangtools/clangtoolrunner.cpp +++ b/src/plugins/clangtools/clangtoolrunner.cpp @@ -105,11 +105,6 @@ bool ClangToolRunner::run(const QString &filePath, const QStringList &compilerOp return true; } -QString ClangToolRunner::filePath() const -{ - return m_filePath; -} - void ClangToolRunner::onProcessStarted() { emit started(); @@ -171,15 +166,5 @@ QString ClangToolRunner::processCommandlineAndOutput() const QString::fromLocal8Bit(m_processOutput))); } -QString ClangToolRunner::actualLogFile() const -{ - if (QFileInfo(m_logFile).size() == 0) { - // Current clang-cl ignores -o, always putting the log file into the working directory. - return m_clangLogFileDir + QLatin1Char('/') + QFileInfo(m_filePath).completeBaseName() - + QLatin1String(".plist"); - } - return m_logFile; -} - } // namespace Internal } // namespace ClangTools diff --git a/src/plugins/clangtools/clangtoolrunner.h b/src/plugins/clangtools/clangtoolrunner.h index 04865dc3465..01585a8ca77 100644 --- a/src/plugins/clangtools/clangtoolrunner.h +++ b/src/plugins/clangtools/clangtoolrunner.h @@ -52,8 +52,8 @@ public: // (2) -o output-file bool run(const QString &filePath, const QStringList &compilerOptions = QStringList()); - QString filePath() const; - QString actualLogFile() const; + QString filePath() const { return m_filePath; } + QString logFilePath() const { return m_logFile; } signals: void started();