diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 13:05:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 23:02:47 +0200 |
commit | 564b59d903683b14c75b72a3e93367717f201def (patch) | |
tree | 03ffe749d83dce84429a7db484bf92795047036f /src/tools | |
parent | b5fc1e4e2643e73d3b44c483d159529f8deb8af1 (diff) |
Another round of replacing 0 with nullptr
This time based on grepping to also include documentation, tests and
examples previously missed by the automatic tool.
Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/moc/util/generate_keywords.cpp | 6 | ||||
-rw-r--r-- | src/tools/qlalr/examples/glsl/glsl-lex.l | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index c2cfe37fab..28c5eeff38 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -301,7 +301,7 @@ struct State void newState(QList<State> &states, const char *token, const char *lexem, bool pre) { - const char * ident = 0; + const char *ident = nullptr; if (is_ident_start(*lexem)) ident = pre?"PP_CHARACTER" : "CHARACTER"; else if (*lexem == '#') @@ -311,7 +311,7 @@ void newState(QList<State> &states, const char *token, const char *lexem, bool p while (*lexem) { int next = states[state].next[(int)*lexem]; if (!next) { - const char * t = 0; + const char *t = nullptr; if (ident) t = ident; else @@ -324,7 +324,7 @@ void newState(QList<State> &states, const char *token, const char *lexem, bool p state = next; ++lexem; if (ident && !is_ident_char(*lexem)) - ident = 0; + ident = nullptr; } states[state].token = token; } diff --git a/src/tools/qlalr/examples/glsl/glsl-lex.l b/src/tools/qlalr/examples/glsl/glsl-lex.l index 2a9618edf8..c92aad296b 100644 --- a/src/tools/qlalr/examples/glsl/glsl-lex.l +++ b/src/tools/qlalr/examples/glsl/glsl-lex.l @@ -142,7 +142,7 @@ icst ({dec}|0{oct}*|0[xX]{hex}+) "lowp" { return LOW_PRECISION; } #[ \t]+[0-9]+.* { - char *eptr = 0; + char *eptr = nullptr; context.line = (int) strtod(&yytext[1], &eptr); QString fn = QString::fromUtf8(eptr).trimmed(); if (fn.length() > 2) |