feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangTools: Sanitize parameter order

Browse Source 
The path to the serialized diagnostics log is the main parameter, so put
it first.

Change-Id: I8865aad302b0e5d3008dab606ab774167cebda3c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-07-23 10:50:50 +02:00
parent 3885807817
commit bf98bea4ad
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/clangtools/clangtoolslogfilereader.cpp
View File

@@ -182,9 +182,9 @@ static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic,
return diagnostic;
}
static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &filePath,
const QSet<Utils::FilePath> &projectFiles,
const Utils::FilePath &logFilePath)
static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &logFilePath,
const Utils::FilePath &mainFilePath,
const QSet<Utils::FilePath> &projectFiles)
{
Diagnostics list;
CXLoadDiag_Error error;
@@ -200,7 +200,7 @@ static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &fileP
clang_disposeDiagnosticSet(diagnostics);
});
const QString nativeFilePath = QDir::toNativeSeparators(filePath.toString());
const QString nativeFilePath = QDir::toNativeSeparators(mainFilePath.toString());
for (unsigned i = 0; i < clang_getNumDiagnosticsInSet(diagnostics); ++i) {
CXDiagnostic cxDiagnostic = clang_getDiagnosticInSet(diagnostics, i);
Utils::ExecuteOnDestruction cleanUpDiagnostic([&]() {
@@ -231,15 +231,15 @@ static bool checkFilePath(const Utils::FilePath &filePath, QString *errorMessage
return true;
}
Diagnostics readSerializedDiagnostics(const Utils::FilePath &filePath,
Diagnostics readSerializedDiagnostics(const Utils::FilePath &logFilePath,
const Utils::FilePath &mainFilePath,
const QSet<Utils::FilePath> &projectFiles,
const Utils::FilePath &logFilePath,
QString *errorMessage)
{
if (!checkFilePath(logFilePath, errorMessage))
return {};
return readSerializedDiagnostics_helper(filePath, projectFiles, logFilePath);
return readSerializedDiagnostics_helper(logFilePath, mainFilePath, projectFiles);
}
} // namespace Internal