diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:03:54 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:04:41 +0200 |
commit | 9b01aae7777c7ccde9eed1a8c55aead1524e00e5 (patch) | |
tree | c62834ca412f290485dd96d2a7522809b8fce6e1 /sources/pyside2/libpyside/signalmanager.cpp.in | |
parent | 2156651b39fbb6717ed936c94dcd28295436e0a4 (diff) | |
parent | 0b842db3a95a44fbda3379d2093cb52f8ae2a1ff (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: Id40dab17b02800199f70072115d7473041f683d8
Diffstat (limited to 'sources/pyside2/libpyside/signalmanager.cpp.in')
-rw-r--r-- | sources/pyside2/libpyside/signalmanager.cpp.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sources/pyside2/libpyside/signalmanager.cpp.in b/sources/pyside2/libpyside/signalmanager.cpp.in index 08c57c218..ca176c693 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp.in +++ b/sources/pyside2/libpyside/signalmanager.cpp.in @@ -116,19 +116,19 @@ namespace PySide { PyObjectWrapper::PyObjectWrapper() :m_me(Py_None) { - Py_INCREF(m_me); + Py_XINCREF(m_me); } PyObjectWrapper::PyObjectWrapper(PyObject* me) : m_me(me) { - Py_INCREF(m_me); + Py_XINCREF(m_me); } PyObjectWrapper::PyObjectWrapper(const PyObjectWrapper &other) : m_me(other.m_me) { - Py_INCREF(m_me); + Py_XINCREF(m_me); } PyObjectWrapper::~PyObjectWrapper() @@ -139,13 +139,13 @@ PyObjectWrapper::~PyObjectWrapper() return; Shiboken::GilState gil; - Py_DECREF(m_me); + Py_XDECREF(m_me); } PyObjectWrapper& PyObjectWrapper::operator=(const PySide::PyObjectWrapper& other) { - Py_INCREF(other.m_me); - Py_DECREF(m_me); + Py_XINCREF(other.m_me); + Py_XDECREF(m_me); m_me = other.m_me; return *this; } |