diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-14 12:30:48 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-14 12:30:50 +0100 |
| commit | 317eb0ad107d056f4af097ff94d99233009c393d (patch) | |
| tree | f4b8aaa87f49dce41400b6a05980ad8cd434728b /sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | |
| parent | 907ff205912cc8d8d0a09c8096f5089dae5eeca9 (diff) | |
| parent | 2fc25e72b289b0f8e10110ffa886cad864d3147c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Id589406a8107c8e24942f072356e5e6f9e5b051b
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/shibokengenerator.cpp')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index b9eea7529..ac0b2ffaf 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -41,7 +41,6 @@ #include <limits> #include <memory> -static const char NULL_VALUE[] = "NULL"; static const char AVOID_PROTECTED_HACK[] = "avoid-protected-hack"; static const char PARENT_CTOR_HEURISTIC[] = "enable-parent-ctor-heuristic"; static const char RETURN_VALUE_HEURISTIC[] = "enable-return-value-heuristic"; @@ -53,6 +52,7 @@ const char *CPP_ARG = "cppArg"; const char *CPP_ARG_REMOVED = "removed_cppArg"; const char *CPP_RETURN_VAR = "cppResult"; const char *CPP_SELF_VAR = "cppSelf"; +const char *NULL_PTR = "nullptr"; const char *PYTHON_ARG = "pyArg"; const char *PYTHON_ARGS = "pyArgs"; const char *PYTHON_OVERRIDE_VAR = "pyOverride"; @@ -151,10 +151,10 @@ ShibokenGenerator::~ShibokenGenerator() = default; void ShibokenGenerator::clearTpFuncs() { - m_tpFuncs.insert(QLatin1String("__str__"), QLatin1String("0")); - m_tpFuncs.insert(QLatin1String("__repr__"), QLatin1String("0")); - m_tpFuncs.insert(QLatin1String("__iter__"), QLatin1String("0")); - m_tpFuncs.insert(QLatin1String("__next__"), QLatin1String("0")); + m_tpFuncs.insert(QLatin1String("__str__"), QString()); + m_tpFuncs.insert(QLatin1String("__repr__"), QString()); + m_tpFuncs.insert(QLatin1String("__iter__"), QString()); + m_tpFuncs.insert(QLatin1String("__next__"), QString()); } void ShibokenGenerator::initPrimitiveTypesCorrespondences() @@ -1396,7 +1396,7 @@ QString ShibokenGenerator::argumentString(const AbstractMetaFunction *func, { QString default_value = argument->originalDefaultValueExpression(); if (default_value == QLatin1String("NULL")) - default_value = QLatin1String(NULL_VALUE); + default_value = QLatin1String(NULL_PTR); //WORKAROUND: fix this please if (default_value.startsWith(QLatin1String("new "))) |