aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-11-19 10:47:31 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-19 17:50:52 +0000
commitac3a289ad1f8cec6e2ad8b0a266df8d1de6d3fa5 (patch)
tree123d6946dd938f0f3b4183f1df117dc35f13040d
parent0f3e3754037e9a5f90f4e310326b079cfc6f6ca5 (diff)
libpyside6: Use isEmpty() instead of empty() for Qt containers
Change-Id: I0e2f7164bd89ae75eb2aa1cb82adcfa317aea309 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit cd67ab30927eed01ad3f068309033edca0478a3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/libpyside/globalreceiverv2.cpp6
-rw-r--r--sources/pyside6/libpyside/pyside.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/sources/pyside6/libpyside/globalreceiverv2.cpp b/sources/pyside6/libpyside/globalreceiverv2.cpp
index 601e893f7..c935d1180 100644
--- a/sources/pyside6/libpyside/globalreceiverv2.cpp
+++ b/sources/pyside6/libpyside/globalreceiverv2.cpp
@@ -262,7 +262,7 @@ void GlobalReceiverV2::incRef(const QObject *link)
void GlobalReceiverV2::decRef(const QObject *link)
{
- if (m_refs.empty())
+ if (m_refs.isEmpty())
return;
@@ -279,7 +279,7 @@ void GlobalReceiverV2::decRef(const QObject *link)
}
}
- if (m_refs.empty())
+ if (m_refs.isEmpty())
Py_BEGIN_ALLOW_THREADS
delete this;
Py_END_ALLOW_THREADS
@@ -339,7 +339,7 @@ int GlobalReceiverV2::qt_metacall(QMetaObject::Call call, int id, void **args)
}
if (id == DESTROY_SLOT_ID) {
- if (m_refs.empty())
+ if (m_refs.isEmpty())
return -1;
auto obj = *reinterpret_cast<QObject **>(args[1]);
incRef(); //keep the object live (safe ref)
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp
index 17c673149..5c3b0f3af 100644
--- a/sources/pyside6/libpyside/pyside.cpp
+++ b/sources/pyside6/libpyside/pyside.cpp
@@ -360,7 +360,7 @@ PyObject *getMetaDataFromQObject(QObject *cppSelf, PyObject *self, PyObject *nam
}
}
}
- if (!signalList.empty()) {
+ if (!signalList.isEmpty()) {
PyObject *pySignal = reinterpret_cast<PyObject *>(Signal::newObjectFromMethod(self, signalList));
PyObject_SetAttr(self, name, pySignal);
return pySignal;