Merge remote-tracking branch 'origin/4.14' into master

Change-Id: Id7ad82997873da828456a15c441620d93c6fc7e7
This commit is contained in:
Eike Ziller
2020-10-21 09:31:01 +02:00
89 changed files with 1028 additions and 1110 deletions

View File

@@ -213,7 +213,7 @@ Utils::ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const
return {start, start + token.utf16chars()};
}
Utils::ChangeSet::Range CppRefactoringFile::range(AST *ast) const
Utils::ChangeSet::Range CppRefactoringFile::range(const AST *ast) const
{
return {startOf(ast), endOf(ast)};
}

View File

@@ -52,7 +52,7 @@ public:
Range range(int start, int end) const;
Range range(unsigned tokenIndex) const;
Range range(CPlusPlus::AST *ast) const;
Range range(const CPlusPlus::AST *ast) const;
const CPlusPlus::Token &tokenAt(unsigned index) const;