aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/libshiboken/sbkenum.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-26 08:34:20 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-26 08:34:20 +0200
commit3d6d370db58b7b1575838d6c627f5109001ef136 (patch)
tree82ec6ef675f8fd77204667354f92b954e2df00b4 /sources/shiboken2/libshiboken/sbkenum.h
parent54c3abd8774f479535d0b8741a3c30d1e7ee8548 (diff)
parent45fa0715398f8d90573552eada0adf2e4eb5e763 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'sources/shiboken2/libshiboken/sbkenum.h')
-rw-r--r--sources/shiboken2/libshiboken/sbkenum.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/libshiboken/sbkenum.h b/sources/shiboken2/libshiboken/sbkenum.h
index 199027836..759d72636 100644
--- a/sources/shiboken2/libshiboken/sbkenum.h
+++ b/sources/shiboken2/libshiboken/sbkenum.h
@@ -101,7 +101,7 @@ namespace Enum
const char *itemName, long itemValue);
LIBSHIBOKEN_API bool createScopedEnumItem(PyTypeObject *enumType, SbkObjectType *scope, const char *itemName, long itemValue);
- LIBSHIBOKEN_API PyObject *newItem(PyTypeObject *enumType, long itemValue, const char *itemName = 0);
+ LIBSHIBOKEN_API PyObject *newItem(PyTypeObject *enumType, long itemValue, const char *itemName = nullptr);
LIBSHIBOKEN_API PyTypeObject *newTypeWithName(const char *name, const char *cppName,
PyTypeObject *numbers_fromFlag=nullptr);