diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-31 10:42:39 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-31 11:30:59 +0000 |
commit | fafd06df5f87f13df7136cc903f4d7e094510325 (patch) | |
tree | 1e02726db4b14f186d12eb399a3fcc0b1a95ae86 /sources/pyside2/libpyside | |
parent | d0ef246be94375b247ec667d867d6978d513ddeb (diff) |
libshiboken: Replace AutoDecRef::operator= by a reset() method
The operators cause compiler warnings about multiple versions and
missing return types. Replace them by a reset() method (modeled after
std::unique_ptr, QScopedPointer).
This implies some changes in the templates.
Change-Id: I21a8fb9b84ecdfecf9671fa113f1bb3c6483166f
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/libpyside')
-rw-r--r-- | sources/pyside2/libpyside/signalmanager.cpp.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sources/pyside2/libpyside/signalmanager.cpp.in b/sources/pyside2/libpyside/signalmanager.cpp.in index 390f472db..ea0d692d8 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp.in +++ b/sources/pyside2/libpyside/signalmanager.cpp.in @@ -205,9 +205,8 @@ QDataStream &operator>>(QDataStream& in, PyObjectWrapper& myObj) in >> repr; Shiboken::AutoDecRef pyCode(PyBytes_FromStringAndSize(repr.data(), repr.size())); Shiboken::AutoDecRef value(PyObject_CallFunctionObjArgs(eval_func, pyCode.object(), 0)); - if (!value.object()) { - value = Py_None; - } + if (!value.object()) + value.reset(Py_None); myObj = PyObjectWrapper(value); return in; } |