diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-11 10:56:26 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-11 14:55:29 +0000 |
commit | 0dd022957ddf3a2c92b796895d7bfec6387b9ca3 (patch) | |
tree | 9c06b065bb07275abc101f46dd6ecf9d4ede7d6d /sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp | |
parent | b33f8708fd1d9aee7e4409a91b96fe96d3730764 (diff) |
shiboken: Replace C-style NULL by nullptr
Replace in comments, code and generated code.
Rename variable NULL_VALUE to NULL_PTR and make extern for follow-up
changes.
Rewrite code using NULL in QString::arg() (resulting apparently from
some misunderstanding that it requires a terminating nullptr) to use
printf-formatting to fix a warning: format not a string literal and no
format arguments [-Wformat-security]).
Change-Id: I97c111cadc09192132308924136eb6ede7a6bf44
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp')
-rw-r--r-- | sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp b/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp index 9f71b495a..c438e0c37 100644 --- a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp +++ b/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp @@ -59,7 +59,7 @@ void TestCodeInjections::testReadFile() const char* cppCode ="struct A {};\n"; int argc = 0; - char *argv[] = {NULL}; + char *argv[] = {nullptr}; QCoreApplication app(argc, argv); QString attribute = QLatin1String("file='") + filePath + QLatin1Char('\''); |