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.h65
1 files changed, 22 insertions, 43 deletions
diff --git a/sources/pyside6/libpyside/signalmanager.h b/sources/pyside6/libpyside/signalmanager.h
index fe077bd1a..c531d6630 100644
--- a/sources/pyside6/libpyside/signalmanager.h
+++ b/sources/pyside6/libpyside/signalmanager.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt for Python.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef SIGNALMANAGER_H
#define SIGNALMANAGER_H
@@ -47,6 +11,8 @@
#include <QtCore/QMetaMethod>
+#include <optional>
+
QT_FORWARD_DECLARE_CLASS(QDataStream)
namespace PySide
@@ -69,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;
};
@@ -78,11 +52,16 @@ 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();
- QObject* globalReceiver(QObject* sender, PyObject* callback);
+ static void setQmlMetaCallErrorHandler(QmlMetaCallErrorHandler handler);
+
+ QObject* globalReceiver(QObject *sender, PyObject *callback, QObject *receiver = nullptr);
void releaseGlobalReceiver(const QObject* sender, QObject* receiver);
int globalReceiverSlotIndex(QObject* sender, const char* slotSignature) const;
void notifyGlobalReceiver(QObject* receiver);
@@ -97,15 +76,15 @@ public:
// used to discovery metaobject
static const QMetaObject* retrieveMetaObject(PyObject* self);
- // Used to discovery if SignalManager was connected with object "destroyed()" signal.
- int countConnectionsWith(const QObject *object);
-
// 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 void deleteGlobalReceiver(const QObject *globalReceiver);
+
private:
struct SignalManagerPrivate;
SignalManagerPrivate* m_d;