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

ClangSupport: Use simpler structures in some cases

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/clangcodemodel/clangfollowsymbol.cpp
View File

@@ -45,11 +45,11 @@ static bool findMark(const QVector<ClangBackEnd::TokenInfoContainer> &marks,
{
mark = Utils::findOrDefault(marks,
[line, column](const ClangBackEnd::TokenInfoContainer &curMark) {
if (curMark.line() != line)
if (curMark.line != line)
return false;
if (curMark.column() == column)
if (curMark.column == column)
return true;
if (curMark.column() < column && curMark.column() + curMark.length() > column)
if (curMark.column < column && curMark.column + curMark.length > column)
return true;
return false;
});
@@ -61,8 +61,8 @@ static bool findMark(const QVector<ClangBackEnd::TokenInfoContainer> &marks,
static int getMarkPos(QTextCursor cursor, const ClangBackEnd::TokenInfoContainer &mark)
{
cursor.setPosition(0);
cursor.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, mark.line() - 1);
cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, mark.column() - 1);
cursor.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, mark.line - 1);
cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, mark.column - 1);
return cursor.position();
}
@@ -80,15 +80,15 @@ static Utils::Link linkAtCursor(QTextCursor cursor, const QString &filePath, uin
cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
const QString tokenStr = cursor.selectedText();
Link token(filePath, mark.line(), mark.column());
Link token(filePath, mark.line, mark.column);
token.linkTextStart = getMarkPos(cursor, mark);
token.linkTextEnd = token.linkTextStart + mark.length();
if (mark.extraInfo().includeDirectivePath) {
token.linkTextEnd = token.linkTextStart + mark.length;
if (mark.extraInfo.includeDirectivePath) {
if (tokenStr != "include" && tokenStr != "#" && tokenStr != "<")
return token;
return Link();
}
if (mark.extraInfo().identifier || tokenStr == "operator")
if (mark.extraInfo.identifier || tokenStr == "operator")
return token;
return Link();
}