aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/libpyside
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-11-17 10:33:12 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-11-17 10:05:35 +0000
commitbbc52f68f6e989a242b787d32e828455bf8e8a8d (patch)
tree51aeb896d4d9a4e839000034fc53095827b3757e /sources/pyside6/libpyside
parent28fe4291c29d3f8333a126c6e58f1ecb163e3ea6 (diff)
libpyside: Small nullptr-cleanup
Change-Id: I9688480a24bafa7808796a6161cf3474f2ca44f8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside')
-rw-r--r--sources/pyside6/libpyside/dynamicqmetaobject_p.h3
-rw-r--r--sources/pyside6/libpyside/pysidesignal.h3
-rw-r--r--sources/pyside6/libpyside/pysideslot.cpp2
-rw-r--r--sources/pyside6/libpyside/signalmanager.cpp10
4 files changed, 10 insertions, 8 deletions
diff --git a/sources/pyside6/libpyside/dynamicqmetaobject_p.h b/sources/pyside6/libpyside/dynamicqmetaobject_p.h
index 9199630b7..11211ca11 100644
--- a/sources/pyside6/libpyside/dynamicqmetaobject_p.h
+++ b/sources/pyside6/libpyside/dynamicqmetaobject_p.h
@@ -81,7 +81,8 @@ namespace PySide
{
public:
PropertyData();
- PropertyData(const char *name, int cachedNotifyId = 0, PySideProperty *data = 0);
+ PropertyData(const char *name, int cachedNotifyId = 0,
+ PySideProperty *data = nullptr);
const QByteArray &name() const { return m_name; }
PySideProperty *data() const { return m_data; }
QByteArray type() const;
diff --git a/sources/pyside6/libpyside/pysidesignal.h b/sources/pyside6/libpyside/pysidesignal.h
index 973644b0a..55e1ee405 100644
--- a/sources/pyside6/libpyside/pysidesignal.h
+++ b/sources/pyside6/libpyside/pysidesignal.h
@@ -155,7 +155,8 @@ PYSIDE_API QString getCallbackSignature(const char *signal, QObject *receiver, P
* @return Return true if this is a Qt Signal, otherwise return false
* @todo replace return type by QList<QByteArray>
**/
-QStringList getArgsFromSignature(const char *signature, bool *isShortCircuit = 0);
+QStringList getArgsFromSignature(const char *signature,
+ bool *isShortCircuit = nullptr);
} // namespace Signal
} // namespace PySide
diff --git a/sources/pyside6/libpyside/pysideslot.cpp b/sources/pyside6/libpyside/pysideslot.cpp
index 99c3cdf55..850fee544 100644
--- a/sources/pyside6/libpyside/pysideslot.cpp
+++ b/sources/pyside6/libpyside/pysideslot.cpp
@@ -157,7 +157,7 @@ PyObject *slotCall(PyObject *self, PyObject *args, PyObject * /* kw */)
pySlotName = String::fromCString(PYSIDE_SLOT_LIST_ATTR);
PyObject *pySignature = String::fromCString(signature);
- PyObject *signatureList = 0;
+ PyObject *signatureList = nullptr;
if (PyObject_HasAttr(callback, pySlotName)) {
signatureList = PyObject_GetAttr(callback, pySlotName);
} else {
diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp
index 0992cfcfd..9507a3ff3 100644
--- a/sources/pyside6/libpyside/signalmanager.cpp
+++ b/sources/pyside6/libpyside/signalmanager.cpp
@@ -76,7 +76,7 @@
#include "globalreceiverv2.h"
namespace {
- static PyObject *metaObjectAttr = 0;
+ static PyObject *metaObjectAttr = nullptr;
static int callMethod(QObject *object, int id, void **args);
static PyObject *parseArguments(const QList< QByteArray >& paramTypes, void **args);
@@ -84,7 +84,7 @@ namespace {
static void destroyMetaObject(PyObject *obj)
{
- void *ptr = PyCapsule_GetPointer(obj, 0);
+ void *ptr = PyCapsule_GetPointer(obj, nullptr);
auto meta = reinterpret_cast<PySide::MetaObjectBuilder *>(ptr);
SbkObject *wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta);
if (wrapper)
@@ -157,7 +157,7 @@ QDataStream &operator<<(QDataStream &out, const PyObjectWrapper &myObj)
return out;
}
- static PyObject *reduce_func = 0;
+ static PyObject *reduce_func = nullptr;
Shiboken::GilState gil;
if (!reduce_func) {
@@ -188,7 +188,7 @@ QDataStream &operator>>(QDataStream &in, PyObjectWrapper &myObj)
return in;
}
- static PyObject *eval_func = 0;
+ static PyObject *eval_func = nullptr;
Shiboken::GilState gil;
if (!eval_func) {
@@ -555,7 +555,7 @@ int SignalManager::registerMetaMethodGetIndex(QObject *source, const char *signa
// Create a instance meta object
if (!dmo) {
dmo = new MetaObjectBuilder(Py_TYPE(pySelf), metaObject);
- PyObject *pyDmo = PyCapsule_New(dmo, 0, destroyMetaObject);
+ PyObject *pyDmo = PyCapsule_New(dmo, nullptr, destroyMetaObject);
PyObject_SetAttr(pySelf, metaObjectAttr, pyDmo);
Py_DECREF(pyDmo);
}