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

C++: Make cplusplus-update-frontend generate "nullptr"

Browse Source 
The commit 2e14df7561 replaced some "0" by
"nullptr" on e.g. the generated ASTClone.cpp.

Running cplusplus-update-frontend reverts the changes for the generated
files again, so adapt cplusplus-update-frontend to generate "nullptr"
instead.

Change-Id: I16750da0df57692405c5b33462f1f63f05c175c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Nikolai Kosjar
2020-05-25 13:50:48 +02:00
parent b3ffd8d1eb
commit b193e3cea1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
View File

@@ -667,7 +667,7 @@ protected:
if (typeName.endsWith("ListAST")) { if (typeName.endsWith("ListAST")) {
*out << " for (" << typeName << " *iter = " << memberName << ", **ast_iter = &ast->" << memberName << ";" << endl *out << " for (" << typeName << " *iter = " << memberName << ", **ast_iter = &ast->" << memberName << ";" << endl
<< " iter; iter = iter->next, ast_iter = &(*ast_iter)->next)" << endl << " iter; iter = iter->next, ast_iter = &(*ast_iter)->next)" << endl
<< " *ast_iter = new (pool) " << typeName << "((iter->value) ? iter->value->clone(pool) : 0);" << endl; << " *ast_iter = new (pool) " << typeName << "((iter->value) ? iter->value->clone(pool) : nullptr);" << endl;
} else if (typeName.endsWith("AST")) { } else if (typeName.endsWith("AST")) {
*out << " if (" << memberName << ")" << endl *out << " if (" << memberName << ")" << endl
<< " ast->" << memberName << " = " << memberName << "->clone(pool);" << endl; << " ast->" << memberName << " = " << memberName << "->clone(pool);" << endl;
@@ -1585,7 +1585,7 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir)
const QString elementName = className.left(className.length() - 7) + QLatin1String("AST"); const QString elementName = className.left(className.length() - 7) + QLatin1String("AST");
out out
<< " " << className << " *" << methodName << "(" << " " << className << " *" << methodName << "("
<< elementName << " *value, " << className << " *next = 0)" << endl << elementName << " *value, " << className << " *next = nullptr)" << endl
<< " {" << endl << " {" << endl
<< " " << className << " *list = new (&pool) " << className << ";" << endl << " " << className << " *list = new (&pool) " << className << ";" << endl
<< " list->next = next;" << endl << " list->next = next;" << endl