aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/libpyside/signalmanager.h
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside6/libpyside/signalmanager.h')
-rw-r--r--sources/pyside6/libpyside/signalmanager.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/sources/pyside6/libpyside/signalmanager.h b/sources/pyside6/libpyside/signalmanager.h
index 8315cb1aa..397700df1 100644
--- a/sources/pyside6/libpyside/signalmanager.h
+++ b/sources/pyside6/libpyside/signalmanager.h
@@ -35,6 +35,14 @@ public:
~PyObjectWrapper();
operator PyObject*() const;
+ // FIXME: To be removed in Qt7
+ // This was done to make QAbstractItemModel::data() work without explicit conversion of
+ // QVariant(PyObjectWrapper) to QVariant(int). This works because QAbstractItemModel::data()
+ // inturn calls legacyEnumValueFromModelData(const QVariant &data). But this function will
+ // be removed in Qt7.
+ // The proper fix would be to associate PyObjectWrapper to the corresponding C++ Enum.
+ int toInt() const;
+
private:
PyObject* m_me;
};
@@ -44,8 +52,9 @@ PYSIDE_API QDataStream &operator>>(QDataStream& in, PyObjectWrapper& myObj);
class PYSIDE_API SignalManager
{
- Q_DISABLE_COPY(SignalManager)
public:
+ Q_DISABLE_COPY_MOVE(SignalManager)
+
using QmlMetaCallErrorHandler = std::optional<int>(*)(QObject *object);
static SignalManager& instance();
@@ -69,11 +78,12 @@ public:
// Disconnect all signals managed by Globalreceiver
void clear();
+ void purgeEmptyGlobalReceivers();
// Utility function to call a python method usign args received in qt_metacall
- static int callPythonMetaMethod(const QMetaMethod& method, void** args, PyObject* obj, bool isShortCuit);
+ static int callPythonMetaMethod(const QMetaMethod& method, void** args, PyObject* obj);
- static void deleteGobalReceiver(const QObject *globalReceiver);
+ static void deleteGlobalReceiver(const QObject *globalReceiver);
private:
struct SignalManagerPrivate;