diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-25 09:33:27 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-25 10:43:56 +0200 |
| commit | ddfbbd346b522703a5b6f8d274a7f79983e5f319 (patch) | |
| tree | 6ebd312287a1398b4b619b37045370cbeb83e1d1 /sources/shiboken2/tests/libother | |
| parent | 2eced73f6b8dd9f568e84e78f786a0ec8d6dd429 (diff) | |
shiboken: Introduce nullptr
Apply Fixits by Qt Creator with some amendments.
Change-Id: Ie8300ddb834adb8b649324562f2c912a4e8cf4ce
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/tests/libother')
| -rw-r--r-- | sources/shiboken2/tests/libother/otherderived.cpp | 2 | ||||
| -rw-r--r-- | sources/shiboken2/tests/libother/othermultiplederived.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken2/tests/libother/otherderived.cpp b/sources/shiboken2/tests/libother/otherderived.cpp index 5b1714f2a..d23f6ad23 100644 --- a/sources/shiboken2/tests/libother/otherderived.cpp +++ b/sources/shiboken2/tests/libother/otherderived.cpp @@ -51,7 +51,7 @@ OtherDerived::pureVirtual() void* OtherDerived::pureVirtualReturningVoidPtr() { - return 0; + return nullptr; } void diff --git a/sources/shiboken2/tests/libother/othermultiplederived.cpp b/sources/shiboken2/tests/libother/othermultiplederived.cpp index 554df3c76..e7ee4f96d 100644 --- a/sources/shiboken2/tests/libother/othermultiplederived.cpp +++ b/sources/shiboken2/tests/libother/othermultiplederived.cpp @@ -45,6 +45,6 @@ Base1* OtherMultipleDerived::createObject(const std::string& objName) return new MDerived3; else if (objName == "OtherMultipleDerived") return new OtherMultipleDerived; - return 0; + return nullptr; } |