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

@@ -43,9 +43,9 @@ void RefactoringClient::alive()
void RefactoringClient::sourceLocationsForRenamingMessage(
ClangBackEnd::SourceLocationsForRenamingMessage &&message)
{
m_localRenamingCallback(message.symbolName().toQString(),
message.sourceLocations(),
message.textDocumentRevision());
m_localRenamingCallback(message.symbolName.toQString(),
message.sourceLocations,
message.textDocumentRevision);
m_refactoringEngine->setRefactoringEngineAvailable(true);
}
@@ -54,13 +54,13 @@ void RefactoringClient::sourceRangesAndDiagnosticsForQueryMessage(
ClangBackEnd::SourceRangesAndDiagnosticsForQueryMessage &&message)
{
m_clangQueryExampleHighlighter->setSourceRanges(message.takeSourceRanges());
m_clangQueryHighlighter->setDiagnostics(message.diagnostics());
m_clangQueryHighlighter->setDiagnostics(message.diagnostics);
}
void RefactoringClient::sourceRangesForQueryMessage(ClangBackEnd::SourceRangesForQueryMessage &&message)
{
++m_resultCounter;
addSearchResults(message.sourceRanges());
addSearchResults(message.sourceRanges);
setResultCounterAndSendSearchIsFinishedIfFinished();
}
@@ -125,7 +125,7 @@ void RefactoringClient::setRefactoringConnectionClient(
void RefactoringClient::addSearchResults(const ClangBackEnd::SourceRangesContainer &sourceRanges)
{
for (const auto &sourceRangeWithText : sourceRanges.sourceRangeWithTextContainers())
for (const auto &sourceRangeWithText : sourceRanges.sourceRangeWithTextContainers)
addSearchResult(sourceRangeWithText);
}
@@ -134,13 +134,13 @@ void RefactoringClient::addSearchResult(const ClangBackEnd::SourceRangeWithTextC
auto &filePathCache = m_refactoringEngine->filePathCache();
m_searchHandle->addResult(QString(filePathCache.filePath(sourceRangeWithText.filePathId()).path()),
QString(sourceRangeWithText.text()),
{{int(sourceRangeWithText.start().line()),
int(sourceRangeWithText.start().column() - 1),
int(sourceRangeWithText.start().offset())},
{int(sourceRangeWithText.end().line()),
int(sourceRangeWithText.end().column() - 1),
int(sourceRangeWithText.end().offset())}});
QString(sourceRangeWithText.text),
{{int(sourceRangeWithText.start.line),
int(sourceRangeWithText.start.column - 1),
int(sourceRangeWithText.start.offset)},
{int(sourceRangeWithText.end.line),
int(sourceRangeWithText.end.column - 1),
int(sourceRangeWithText.end.offset)}});
}
void RefactoringClient::setResultCounterAndSendSearchIsFinishedIfFinished()