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

CppTools: modernize

Browse Source 
Change-Id: Iaf02e4d026f1ac8b216833d83cd7a735e21ff60a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2019-01-14 01:40:53 +01:00
parent 845af92889
commit 1d3d18a969
116 changed files with 461 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cpptools/cppcanonicalsymbol.cpp
View File

@@ -55,7 +55,7 @@ const LookupContext &CanonicalSymbol::context() const
Scope *CanonicalSymbol::getScopeAndExpression(const QTextCursor &cursor, QString *code)
{
if (!m_document)
return 0;
return nullptr;
QTextCursor tc = cursor;
int line, column;
@@ -65,7 +65,7 @@ Scope *CanonicalSymbol::getScopeAndExpression(const QTextCursor &cursor, QString
QTextDocument *textDocument = cursor.document();
if (!CppTools::isValidIdentifierChar(textDocument->characterAt(pos)))
if (!(pos > 0 && CppTools::isValidIdentifierChar(textDocument->characterAt(pos - 1))))
return 0;
return nullptr;
while (CppTools::isValidIdentifierChar(textDocument->characterAt(pos)))
++pos;
@@ -83,7 +83,7 @@ Symbol *CanonicalSymbol::operator()(const QTextCursor &cursor)
if (Scope *scope = getScopeAndExpression(cursor, &code))
return operator()(scope, code);
return 0;
return nullptr;
}
Symbol *CanonicalSymbol::operator()(Scope *scope, const QString &code)
@@ -118,14 +118,12 @@ Symbol *CanonicalSymbol::canonicalSymbol(Scope *scope, const QString &code,
}
}
for (int i = 0; i < results.size(); ++i) {
const LookupItem &r = results.at(i);
if (r.declaration())
for (const auto &r : results) {
if (r.declaration())
return r.declaration();
}
return 0;
return nullptr;
}
} // namespace CppEditor