ClangSupport: Use simpler structures in some cases

The patch is mostly mechanical, but contains also a few spurious changes
from values references for some local variables, foreach -> ranged for
etc that I coulnd't resist.

Change-Id: I58f0bd972546895eb318607cbfbd7ac35caf3f23
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
hjk
2018-04-04 18:25:23 +02:00
parent 4a0bbed560
commit cf4dbb4bb6
150 changed files with 1814 additions and 2598 deletions

View File

@@ -82,8 +82,8 @@ bool hasFixItAt(const QVector<ClangBackEnd::FixItContainer> &fixits,
int line)
{
const auto isFixitForLocation = [filePath, line] (const ClangBackEnd::FixItContainer &fixit) {
const ClangBackEnd::SourceLocationContainer location = fixit.range().start();
return location.filePath() == filePath && location.line() == uint(line);
const ClangBackEnd::SourceLocationContainer &location = fixit.range.start;
return location.filePath == filePath && location.line == uint(line);
};
return Utils::anyOf(fixits, isFixitForLocation);
@@ -125,11 +125,11 @@ void ClangFixItOperationsExtractor::extractFromDiagnostic(
const QString &filePath,
int line)
{
const QVector<ClangBackEnd::FixItContainer> fixIts = diagnosticContainer.fixIts();
const QVector<ClangBackEnd::FixItContainer> &fixIts = diagnosticContainer.fixIts;
if (hasFixItAt(fixIts, filePath, line)) {
appendFixitOperation(diagnosticContainer.text().toString(), fixIts);
appendFixitOperation(diagnosticContainer.text.toString(), fixIts);
foreach (const auto &child, diagnosticContainer.children())
for (const auto &child : diagnosticContainer.children)
extractFromDiagnostic(child, filePath, line);
}
}