diff options
Diffstat (limited to 'sources/pyside6/libpyside/pysideqobject.h')
| -rw-r--r-- | sources/pyside6/libpyside/pysideqobject.h | 54 |
1 files changed, 11 insertions, 43 deletions
diff --git a/sources/pyside6/libpyside/pysideqobject.h b/sources/pyside6/libpyside/pysideqobject.h index 538f6f024..f81c50399 100644 --- a/sources/pyside6/libpyside/pysideqobject.h +++ b/sources/pyside6/libpyside/pysideqobject.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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) 2021 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 PYSIDEQOBJECT_H #define PYSIDEQOBJECT_H @@ -44,7 +8,9 @@ #include <pysidemacros.h> -#include <QtCore/QtGlobal> +#include <QtCore/qtclasshelpermacros.h> + +#include <cstddef> QT_FORWARD_DECLARE_CLASS(QObject) QT_FORWARD_DECLARE_STRUCT(QMetaObject) @@ -58,7 +24,8 @@ namespace PySide /// \param metaObj QMetaObject of \p qObj. /// \param kwds key->value dictonary. /// \return True if everything goes well, false with a Python error set otherwise. -PYSIDE_API bool fillQtProperties(PyObject *qObj, const QMetaObject *metaObj, PyObject *kwds); +PYSIDE_API bool fillQtProperties(PyObject *qObj, const QMetaObject *metaObj, + PyObject *kwds, bool allowErrors); PYSIDE_API void initDynamicMetaObject(PyTypeObject *type, const QMetaObject *base, std::size_t cppObjSize); @@ -76,13 +43,14 @@ PYSIDE_API bool isQObjectDerived(PyTypeObject *pyType, bool raiseError); /// Convenience to convert a PyObject to QObject PYSIDE_API QObject *convertToQObject(PyObject *object, bool raiseError); -/// Check for properties and signals registered on MetaObject and return these +/// Check for properties and signals registered on MetaObject and return these. +/// Also handle Python properties when true_property was selected. /// \param cppSelf Is the QObject which contains the metaobject /// \param self Python object of cppSelf /// \param name Name of the argument which the function will try retrieve from MetaData /// \return The Python object which contains the Data obtained in metaObject or the Python -/// attribute related with name -PYSIDE_API PyObject *getMetaDataFromQObject(QObject *cppSelf, PyObject *self, PyObject *name); +/// method pulled out of a Python property. +PYSIDE_API PyObject *getHiddenDataFromQObject(QObject *cppSelf, PyObject *self, PyObject *name); /// Mutex for accessing QObject memory helpers from multiple threads PYSIDE_API QMutex &nextQObjectMemoryAddrMutex(); |