diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2019-01-14 01:40:53 +0100 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-01-21 09:00:18 +0000 |
commit | 1d3d18a96988eb091b207103f18c9fbba505013a (patch) | |
tree | ea96a5524d5dbda96447455a9152484e54ea6e3b /src/plugins/cpptools/insertionpointlocator.cpp | |
parent | 845af928896ba1ef1bb7259766913ea7f4c35cd9 (diff) |
CppTools: modernize
Change-Id: Iaf02e4d026f1ac8b216833d83cd7a735e21ff60a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/cpptools/insertionpointlocator.cpp')
-rw-r--r-- | src/plugins/cpptools/insertionpointlocator.cpp | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp index 0fe27dbcc1..b73d672306 100644 --- a/src/plugins/cpptools/insertionpointlocator.cpp +++ b/src/plugins/cpptools/insertionpointlocator.cpp @@ -58,17 +58,10 @@ static int ordering(InsertionPointLocator::AccessSpec xsSpec) struct AccessRange { - unsigned start; - unsigned end; - InsertionPointLocator::AccessSpec xsSpec; - unsigned colonToken; - - AccessRange() - : start(0) - , end(0) - , xsSpec(InsertionPointLocator::Invalid) - , colonToken(0) - {} + unsigned start = 0; + unsigned end = 0; + InsertionPointLocator::AccessSpec xsSpec = InsertionPointLocator::Invalid; + unsigned colonToken = 0; AccessRange(unsigned start, unsigned end, InsertionPointLocator::AccessSpec xsSpec, unsigned colonToken) : start(start) @@ -107,7 +100,7 @@ public: protected: using ASTVisitor::visit; - bool visit(ClassSpecifierAST *ast) + bool visit(ClassSpecifierAST *ast) override { if (!ast->lbrace_token || !ast->rbrace_token) return true; @@ -358,7 +351,7 @@ class FindMethodDefinitionInsertPoint : protected ASTVisitor HighestValue<int, unsigned> _bestToken; public: - FindMethodDefinitionInsertPoint(TranslationUnit *translationUnit) + explicit FindMethodDefinitionInsertPoint(TranslationUnit *translationUnit) : ASTVisitor(translationUnit) {} @@ -388,12 +381,12 @@ public: } protected: - bool preVisit(AST *ast) + bool preVisit(AST *ast) override { return ast->asNamespace() || ast->asTranslationUnit() || ast->asLinkageBody(); } - bool visit(NamespaceAST *ast) + bool visit(NamespaceAST *ast) override { if (_currentDepth >= _namespaceNames.size()) return false; @@ -423,7 +416,7 @@ class FindFunctionDefinition : protected ASTVisitor unsigned _line = 0; unsigned _column = 0; public: - FindFunctionDefinition(TranslationUnit *translationUnit) + explicit FindFunctionDefinition(TranslationUnit *translationUnit) : ASTVisitor(translationUnit) { } @@ -438,7 +431,7 @@ public: } protected: - bool preVisit(AST *ast) + bool preVisit(AST *ast) override { if (_result) return false; @@ -452,7 +445,7 @@ protected: return true; } - bool visit(FunctionDefinitionAST *ast) + bool visit(FunctionDefinitionAST *ast) override { _result = ast; return false; @@ -464,13 +457,13 @@ protected: static Declaration *isNonVirtualFunctionDeclaration(Symbol *s) { if (!s) - return 0; + return nullptr; Declaration *declaration = s->asDeclaration(); if (!declaration) - return 0; + return nullptr; Function *type = s->type()->asFunctionType(); if (!type || type->isPureVirtual()) - return 0; + return nullptr; return declaration; } @@ -497,9 +490,9 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration, // scan preceding declarations for a function declaration (and see if it is defined) SymbolFinder symbolFinder; - Function *definitionFunction = 0; + Function *definitionFunction = nullptr; QString prefix, suffix; - Declaration *surroundingFunctionDecl = 0; + Declaration *surroundingFunctionDecl = nullptr; for (int i = declIndex - 1; i >= 0; --i) { Symbol *s = klass->memberAt(i); if (s->isGenerated() || !(surroundingFunctionDecl = isNonVirtualFunctionDeclaration(s))) @@ -512,7 +505,7 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration, prefix = QLatin1String("\n\n"); break; } - definitionFunction = 0; + definitionFunction = nullptr; } } if (!definitionFunction) { @@ -530,7 +523,7 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration, suffix = QLatin1String("\n\n"); break; } - definitionFunction = 0; + definitionFunction = nullptr; } } } |