diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml')
| -rw-r--r-- | sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml | 507 |
1 files changed, 295 insertions, 212 deletions
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml index f6930986e..774f9dd64 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml @@ -1,45 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** 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 --> -<typesystem package="PySide6.QtWidgets"> +<typesystem package="PySide6.QtWidgets" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="templates/core_common.xml" generate="no"/> <load-typesystem name="templates/widgets_common.xml" generate="no"/> @@ -65,16 +30,8 @@ enum 'QGraphicsPolygonItem::Type' does not have a type entry or is not an enum """ --> - <rejection class="*" enum-name="enum_1"/> - <rejection class="QMdi"/> - <!-- - Event classes have a lot of non-documented protected fields, those fields - are removed from PySide because they are Qt implementation details, - besides the fact they are accessible by ordinary event methods. - --> - <function signature="qDrawShadeLine(QPainter*,int,int,int,int,const QPalette&,bool,int,int)"/> <function signature="qDrawShadeLine(QPainter*,const QPoint,const QPoint,const QPalette&,bool,int,int)"/> <function signature="qDrawShadeRect(QPainter*,int,int,int,int,const QPalette&,bool,int,int,const QBrush*)"/> @@ -87,51 +44,65 @@ <function signature="qDrawWinPanel(QPainter*,const QRect&,const QPalette&,bool,const QBrush*)"/> <function signature="qDrawPlainRect(QPainter*,int,int,int,int,const QColor&,int,const QBrush*)"/> <function signature="qDrawPlainRect(QPainter*,const QRect&,const QColor&,int,const QBrush*)"/> + <function signature="qDrawPlainRoundedRect(QPainter*,int,int,int,int,qreal,qreal,const QColor&,int,const QBrush*)" since="6.7"/> + <function signature="qDrawPlainRoundedRect(QPainter*,const QRect&,qreal,qreal,const QColor&,int,const QBrush *)" since="6.7"/> - <object-type name="QStyleOption" polymorphic-id-expression="%1->type == QStyleOption::SO_Default"> + <object-type name="QStyleOption" polymorphic-id-expression="%B->type == QStyleOption::SO_Default" + polymorphic-name-function="styleOptionType"> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" + snippet="qstyleoption-typename"/> <enum-type name="OptionType"/> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionGraphicsItem" polymorphic-id-expression="%1->type == QStyleOptionGraphicsItem::Type && %1->version == QStyleOptionGraphicsItem::Version"> + <object-type name="QStyleOptionGraphicsItem" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionGraphicsItem *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionSizeGrip" polymorphic-id-expression="%1->type == QStyleOptionSizeGrip::Type && %1->version == QStyleOptionSizeGrip::Version"> + <object-type name="QStyleOptionSizeGrip" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionSizeGrip *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionButton" polymorphic-id-expression="%1->type == QStyleOptionButton::Type && %1->version == QStyleOptionButton::Version"> + <object-type name="QStyleOptionButton" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionButton *>(%B) != nullptr"> <enum-type name="ButtonFeature" flags="ButtonFeatures"/> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionComboBox" polymorphic-id-expression="%1->type == QStyleOptionComboBox::Type && %1->version == QStyleOptionComboBox::Version"> + <object-type name="QStyleOptionComboBox" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionComboBox *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionComplex" polymorphic-id-expression="%1->type == QStyleOptionComplex::Type && %1->version == QStyleOptionComplex::Version"> + <object-type name="QStyleOptionComplex" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionComplex *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionDockWidget" polymorphic-id-expression="%1->type == QStyleOptionDockWidget::Type && %1->version == QStyleOptionDockWidget::Version"> + <object-type name="QStyleOptionDockWidget" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionDockWidget *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionFocusRect" polymorphic-id-expression="%1->type == QStyleOptionFocusRect::Type && %1->version == QStyleOptionFocusRect::Version"> + <object-type name="QStyleOptionFocusRect" polymorphic-id-expression="qstyleoption_cast<const QStyleOptionFocusRect *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionFrame" polymorphic-id-expression="%1->type == QStyleOptionFrame::Type && %1->version == QStyleOptionFrame::Version"> + <object-type name="QStyleOptionFrame" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionFrame *>(%B) != nullptr"> <enum-type name="FrameFeature" flags="FrameFeatures"/> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionGroupBox" polymorphic-id-expression="%1->type == QStyleOptionGroupBox::Type && %1->version == QStyleOptionGroupBox::Version"> + <object-type name="QStyleOptionGroupBox" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionGroupBox *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionHeader" polymorphic-id-expression="%1->type == QStyleOptionHeader::Type && %1->version == QStyleOptionHeader::Version"> + <object-type name="QStyleOptionHeader" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionHeader *>(%B) != nullptr"> <enum-type name="SectionPosition"/> <enum-type name="SelectedPosition"/> <enum-type name="SortIndicator"/> @@ -142,29 +113,35 @@ <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionMenuItem" polymorphic-id-expression="%1->type == QStyleOptionMenuItem::Type && %1->version == QStyleOptionMenuItem::Version"> + <object-type name="QStyleOptionMenuItem" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionMenuItem *>(%B) != nullptr"> <enum-type name="CheckType"/> <enum-type name="MenuItemType"/> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionProgressBar" polymorphic-id-expression="%1->type == QStyleOptionProgressBar::Type && %1->version == QStyleOptionProgressBar::Version"> + <object-type name="QStyleOptionProgressBar" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionProgressBar *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionRubberBand" polymorphic-id-expression="%1->type == QStyleOptionRubberBand::Type && %1->version == QStyleOptionRubberBand::Version"> + <object-type name="QStyleOptionRubberBand" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionRubberBand *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionSlider" polymorphic-id-expression="%1->type == QStyleOptionSlider::Type && %1->version == QStyleOptionSlider::Version"> + <object-type name="QStyleOptionSlider" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionSlider *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionSpinBox" polymorphic-id-expression="%1->type == QStyleOptionSpinBox::Type && %1->version == QStyleOptionSpinBox::Version"> + <object-type name="QStyleOptionSpinBox" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionSpinBox *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionTab" polymorphic-id-expression="%1->type == QStyleOptionTab::Type && %1->version == QStyleOptionTab::Version"> + <object-type name="QStyleOptionTab" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionTab *>(%B) != nullptr"> <enum-type name="CornerWidget" flags="CornerWidgets"/> <enum-type name="SelectedPosition"/> <enum-type name="StyleOptionType"/> @@ -172,36 +149,41 @@ <enum-type name="TabFeature" flags="TabFeatures"/> <enum-type name="TabPosition"/> </object-type> - <object-type name="QStyleOptionTabBarBase" polymorphic-id-expression="%1->type == QStyleOptionTabBarBase::Type && %1->version == QStyleOptionTabBarBase::Version"> + <object-type name="QStyleOptionTabBarBase" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionTabBarBase *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionTabWidgetFrame" polymorphic-id-expression="%1->type == QStyleOptionTabWidgetFrame::Type && %1->version == QStyleOptionTabWidgetFrame::Version"> + <object-type name="QStyleOptionTabWidgetFrame" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionTabWidgetFrame *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionTitleBar" polymorphic-id-expression="%1->type == QStyleOptionTitleBar::Type && %1->version == QStyleOptionTitleBar::Version"> + <object-type name="QStyleOptionTitleBar" polymorphic-id-expression="qstyleoption_cast<const QStyleOptionTitleBar *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> - <object-type name="QStyleOptionToolBar" polymorphic-id-expression="%1->type == QStyleOptionToolBar::Type && %1->version == QStyleOptionToolBar::Version"> + <object-type name="QStyleOptionToolBar" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionToolBar *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> <enum-type name="ToolBarFeature" flags="ToolBarFeatures"/> <enum-type name="ToolBarPosition"/> </object-type> - <object-type name="QStyleOptionToolBox" polymorphic-id-expression="%1->type == QStyleOptionToolBox::Type && %1->version == QStyleOptionToolBox::Version"> + <object-type name="QStyleOptionToolBox" + polymorphic-id-expression="qstyleoption_cast<const QStyleOptionToolBox *>(%B) != nullptr"> <enum-type name="SelectedPosition"/> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> <enum-type name="TabPosition"/> </object-type> - <object-type name="QStyleOptionToolButton" polymorphic-id-expression="%1->type == QStyleOptionToolButton::Type && %1->version == QStyleOptionToolButton::Version"> + <object-type name="QStyleOptionToolButton" polymorphic-id-expression="qstyleoption_cast<const QStyleOptionToolButton *>(%B) != nullptr"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> <enum-type name="ToolButtonFeature" flags="ToolButtonFeatures"/> </object-type> - <value-type name="QStyleOptionViewItem" polymorphic-id-expression="%1->type == QStyleOptionViewItem::Type && %1->version == QStyleOptionViewItem::Version"> + <value-type name="QStyleOptionViewItem" + polymorphic-id-expression="%B->type == QStyleOptionViewItem::Type && %B->version == QStyleOptionViewItem::Version"> <enum-type name="Position"/> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> @@ -216,7 +198,7 @@ <value-type name="QSizePolicy"> <enum-type name="ControlType" flags="ControlTypes"/> <enum-type name="Policy"/> - <enum-type name="PolicyFlag"/> + <enum-type name="PolicyFlag" python-type="IntFlag"/> </value-type> <value-type name="QTableWidgetSelectionRange"/> @@ -271,7 +253,9 @@ </modify-function> </object-type> - <object-type name="QGraphicsItem"> + <!-- Register Qt meta type only for base class QGraphicsItem as registering + QGraphicsItemGroup* breaks QGraphicsItem::itemChange()), PYSIDE-1887 --> + <object-type name="QGraphicsItem" qt-register-metatype="base" parent-management="true"> <enum-type name="CacheMode"/> <enum-type name="Extension"/> <enum-type name="GraphicsItemChange"/> @@ -349,7 +333,7 @@ <modify-argument index="1"> <remove-argument/> </modify-argument> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[bool, PySide6.QtWidgets.QGraphicsItem]"> <replace-type modified-type="(retval, blockingPanel)"/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qgraphicsitem-isblockedbymodalpanel"/> @@ -359,7 +343,7 @@ <remove-argument /> <remove-default-expression /> </modify-argument> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[PySide6.QtGui.QTransform, bool]"> <replace-type modified-type="(QTransform, bool ok)"/> </modify-argument> <inject-code class="target" position="beginning"> @@ -419,7 +403,7 @@ <enum-type name="SelectionMode"/> <enum-type name="State"/> <modify-function signature="setModel(QAbstractItemModel*)"> - <modify-argument index="1"> + <modify-argument index="1" pyi-type="Optional[PySide6.QtCore.QAbstractItemModel]"> <reference-count action="set"/> </modify-argument> </modify-function> @@ -506,8 +490,10 @@ </object-type> <object-type name="QDateEdit"/> <object-type name="QDialog"> - <enum-type name="DialogCode"/> - <modify-function signature="exec()" allow-thread="yes"/> + <enum-type name="DialogCode" python-type="IntEnum"/> + <modify-function signature="exec()" allow-thread="yes"> + <inject-code file="../glue/qtwidgets.cpp" snippet="qdialog-exec-remove-parent-relation"/> + </modify-function> <add-function signature="exec_()" return-type="int"> <inject-code file="../glue/qtwidgets.cpp" snippet="qapplication-exec"/> </add-function> @@ -539,6 +525,11 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> + <modify-function signature="setPage(int,QWizardPage*)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> <modify-function signature="setButton(QWizard::WizardButton,QAbstractButton*)"> <modify-argument index="2"> <parent index="this" action="add"/> @@ -546,12 +537,23 @@ </modify-function> </object-type> <object-type name="QWizardPage"> + <extra-includes> + <include file-name="pysidesignal.h" location="global"/> + </extra-includes> <modify-function signature="wizard()const"> <modify-argument index="this"> <parent index="return" action="add"/> </modify-argument> </modify-function> - <modify-function signature="registerField(const QString&,QWidget*,const char*,const char*)" allow-thread="yes"/> + <modify-function signature="registerField(const QString&,QWidget*,const char*,const char*)" allow-thread="yes"> + <modify-argument index="3" pyi-type="str" rename="property"/> + <modify-argument index="4" pyi-type="str" rename="changed_signal"/> + </modify-function> + <add-function signature="registerField(const QString&@name@,QWidget*@widget@,const char*@property@,PySideSignalInstance@changedSignal@)"> + <modify-argument index="3" pyi-type="str"/> + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" + snippet="qwizardpage-registerfield"/> + </add-function> </object-type> <object-type name="QFocusFrame"> <modify-function signature="setWidget(QWidget*)"> @@ -569,7 +571,7 @@ <modify-argument index="1"> <remove-argument /> </modify-argument> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[bool, PySide6.QtGui.QFont]"> <replace-type modified-type="PyTuple"/> </modify-argument> <inject-code class="target" position="beginning"> @@ -580,7 +582,7 @@ <modify-argument index="1"> <remove-argument /> </modify-argument> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[bool, PySide6.QtGui.QFont]"> <replace-type modified-type="PyTuple"/> </modify-argument> <inject-code class="target" position="beginning"> @@ -800,6 +802,7 @@ </object-type> <object-type name="QMenu"> <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenu-glue"/> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-glue"/> <!-- exec() --> <modify-function signature="exec()" allow-thread="yes"/> <add-function signature="exec_()" return-type="QAction*"> @@ -815,11 +818,6 @@ <add-function signature="exec_(QList<QAction*>,const QPoint&,QAction* @at@ = nullptr,QWidget* @parent@ = nullptr)" return-type="QAction*"> <inject-code file="../glue/qtwidgets.cpp" snippet="qmenu-exec-3"/> </add-function> - <modify-function signature="addAction(const QString&)"> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> <modify-function signature="addMenu(QMenu*)"> <modify-argument index="return"> <parent index="1" action="add"/> @@ -859,7 +857,14 @@ <!-- ### "setNoReplayFor(QWidget*)" is an internal method. --> <modify-function signature="setNoReplayFor(QWidget*)" remove="all"/> - <add-function signature="addAction(QString&,PyObject*,QKeySequence&)"> + <!-- FIXME PYSIDE7: Remove in favor of widgets methods --> + <modify-function signature="addAction(const QString&,const QObject*,const char*,const QKeySequence&)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + + <add-function signature="addAction(QString&@text@,PyObject*,QKeySequence&@shortcut@)"> <modify-argument index="3"> <replace-default-expression with="0"/> </modify-argument> @@ -870,7 +875,7 @@ <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenu-addaction-1"/> </add-function> - <add-function signature="addAction(QIcon&,QString&,PyObject*,QKeySequence&)"> + <add-function signature="addAction(QIcon&,QString&@text@,PyObject*,QKeySequence&@shortcut@)"> <modify-argument index="4"> <replace-default-expression with="0"/> </modify-argument> @@ -880,10 +885,11 @@ <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenu-addaction-2"/> </add-function> - - <add-function signature="addAction(QAction*)"> - <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenu-addaction-3"/> - </add-function> + <modify-function signature="addAction(const QIcon&,const QString&,const QObject*,const char*,const QKeySequence&)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> <modify-function signature="clear()"> <inject-code file="../glue/qtwidgets.cpp" snippet="qmenu-clear"/> @@ -892,23 +898,6 @@ </object-type> <object-type name="QMenuBar"> - <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenubar-glue"/> - <modify-function signature="addAction(const QString&)"> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addAction(QString,const QObject*,const char*)"> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <add-function signature="addAction(const QString&,PyObject*)"> - <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenubar-addaction-1"/> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - </add-function> <modify-function signature="addMenu(QMenu*)"> <modify-argument index="return"> <parent index="1" action="add"/> @@ -939,10 +928,6 @@ <inject-code file="../glue/qtwidgets.cpp" snippet="qmenubar-clear"/> </modify-function> - <add-function signature="addAction(QAction*)"> - <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenubar-addaction-2"/> - </add-function> - </object-type> <object-type name="QProgressBar"> <enum-type name="Direction"/> @@ -1106,30 +1091,39 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QWidgetItem" polymorphic-id-expression="%1->widget()"/> + <object-type name="QWidgetItem" polymorphic-id-expression="%B->widget()"/> - <object-type name="QGraphicsSceneContextMenuEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneContextMenu"> + <object-type name="QGraphicsSceneContextMenuEvent" + polymorphic-id-expression="%B->type() == QEvent::GraphicsSceneContextMenu"> <enum-type name="Reason"/> </object-type> - <object-type name="QGraphicsSceneDragDropEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneDragEnter || %1->type() == QEvent::GraphicsSceneDragLeave || %1->type() == QEvent::GraphicsSceneDragMove || %1->type() == QEvent::GraphicsSceneDrop" > + <object-type name="QGraphicsSceneDragDropEvent" + polymorphic-id-expression="%B->type() == QEvent::GraphicsSceneDragEnter || %B->type() == QEvent::GraphicsSceneDragLeave || %B->type() == QEvent::GraphicsSceneDragMove || %B->type() == QEvent::GraphicsSceneDrop" > <!-- ### "setMimeData(const QMimeData*)" is an internal method. --> <modify-function signature="setMimeData(const QMimeData*)" remove="all"/> <!-- ### "setSource(QWidget*)" is an internal method. --> <modify-function signature="setSource(QWidget*)" remove="all"/> <!-- ### --> </object-type> - <object-type name="QGraphicsSceneEvent" copyable="false"> + <object-type name="QGraphicsSceneEvent" copyable="false" qt-register-metatype="base"> <!-- ### "setWidget(QWidget*)" is an internal method. --> <modify-function signature="setWidget(QWidget*)" remove="all"/> </object-type> - <object-type name="QGraphicsSceneMoveEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneMove"/> - <object-type name="QGraphicsSceneResizeEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneResize"/> - <object-type name="QGraphicsSceneHelpEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneHelp"/> - <object-type name="QGraphicsSceneHoverEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneHoverEnter || %1->type() == QEvent::GraphicsSceneHoverLeave || %1->type() == QEvent::GraphicsSceneHoverMove"/> - <object-type name="QGraphicsSceneMouseEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneMouseDoubleClick || %1->type() == QEvent::GraphicsSceneMouseMove || %1->type() == QEvent::GraphicsSceneMousePress || %1->type() == QEvent::GraphicsSceneMouseRelease"/> - <object-type name="QGraphicsSceneWheelEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneWheel"/> - - <object-type name="QGestureEvent" polymorphic-id-expression="%1->type() == QEvent::Gesture || %1->type() == QEvent::GestureOverride" since="4.6"> + <object-type name="QGraphicsSceneMoveEvent" + polymorphic-id-expression="%B->type() == QEvent::GraphicsSceneMove"/> + <object-type name="QGraphicsSceneResizeEvent" + polymorphic-id-expression="%B->type() == QEvent::GraphicsSceneResize"/> + <object-type name="QGraphicsSceneHelpEvent" + polymorphic-id-expression="%B->type() == QEvent::GraphicsSceneHelp"/> + <object-type name="QGraphicsSceneHoverEvent" + polymorphic-id-expression="%B->type() == QEvent::GraphicsSceneHoverEnter || %B->type() == QEvent::GraphicsSceneHoverLeave || %B->type() == QEvent::GraphicsSceneHoverMove"/> + <object-type name="QGraphicsSceneMouseEvent" + polymorphic-id-expression="%B->type() == QEvent::GraphicsSceneMouseDoubleClick || %B->type() == QEvent::GraphicsSceneMouseMove || %B->type() == QEvent::GraphicsSceneMousePress || %B->type() == QEvent::GraphicsSceneMouseRelease"/> + <object-type name="QGraphicsSceneWheelEvent" + polymorphic-id-expression="%B->type() == QEvent::GraphicsSceneWheel"/> + + <object-type name="QGestureEvent" + polymorphic-id-expression="%B->type() == QEvent::Gesture || %B->type() == QEvent::GestureOverride" since="4.6"> <modify-function signature="activeGestures()const"> <modify-argument index="return"> <define-ownership owner="default"/> @@ -1162,41 +1156,37 @@ </add-function> </object-type> <object-type name="QStyle"> - <enum-type name="ComplexControl"/> - <enum-type name="ContentsType"/> - <enum-type name="ControlElement"/> - <enum-type name="PixelMetric"/> - <enum-type name="PrimitiveElement"/> + <enum-type name="ComplexControl" python-type="IntEnum"/> + <enum-type name="ContentsType" python-type="IntEnum"/> + <enum-type name="ControlElement" python-type="IntEnum"/> + <enum-type name="PixelMetric" python-type="IntEnum"/> + <enum-type name="PrimitiveElement" python-type="IntEnum"/> <enum-type name="RequestSoftwareInputPanel" since="4.6"/> - <enum-type name="StandardPixmap"/> + <enum-type name="StandardPixmap" python-type="IntEnum"/> <enum-type name="StateFlag" flags="State"/> - <enum-type name="StyleHint"/> + <enum-type name="StyleHint" python-type="IntEnum"/> <enum-type name="SubControl" flags="SubControls"/> - <enum-type name="SubElement"/> + <enum-type name="SubElement" python-type="IntEnum"/> <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const"> <modify-argument index="3" invalidate-after-use="yes"/> <modify-argument index="4"> - <replace-default-expression with="0"/> <rename to="widget"/> </modify-argument> </modify-function> <modify-function signature="drawControl(QStyle::ControlElement,const QStyleOption*,QPainter*,const QWidget*)const"> <modify-argument index="3" invalidate-after-use="yes"/> <modify-argument index="4"> - <replace-default-expression with="0"/> <rename to="widget"/> </modify-argument> </modify-function> <modify-function signature="drawPrimitive(QStyle::PrimitiveElement,const QStyleOption*,QPainter*,const QWidget*)const"> <modify-argument index="3" invalidate-after-use="yes"/> <modify-argument index="4"> - <replace-default-expression with="0"/> <rename to="widget"/> </modify-argument> </modify-function> <modify-function signature="hitTestComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,const QPoint&,const QWidget*)const"> <modify-argument index="4"> - <replace-default-expression with="0"/> <rename to="widget"/> </modify-argument> </modify-function> @@ -1215,7 +1205,9 @@ <modify-function signature="getColor(const QColor&,QWidget*,const QString&,QFlags<QColorDialog::ColorDialogOption>)" allow-thread="yes"/> </object-type> - <object-type name="QLayout"> + <object-type name="QLayout" polymorphic-base="true"> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" + snippet="qwidget-retrieveobjectname"/> <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/> <enum-type name="SizeConstraint"/> @@ -1223,7 +1215,8 @@ <modify-argument index="return"> <define-ownership owner="default"/> </modify-argument> - <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="addownership-0"/> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" + snippet="addownership-item-at"/> </modify-function> <modify-function signature="removeWidget(QWidget*)"> @@ -1305,6 +1298,8 @@ </object-type> <object-type name="QStackedLayout"> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" + snippet="qwidget-retrieveobjectname"/> <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/> <enum-type name="StackingMode"/> <modify-function signature="insertWidget(int,QWidget*)" allow-thread="yes"> @@ -1316,6 +1311,8 @@ </object-type> <object-type name="QBoxLayout"> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" + snippet="qwidget-retrieveobjectname"/> <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/> <enum-type name="Direction"/> @@ -1346,12 +1343,15 @@ </object-type> <object-type name="QGridLayout"> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" + snippet="qwidget-retrieveobjectname"/> <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/> <modify-function signature="itemAtPosition (int,int)const"> <modify-argument index="return"> <define-ownership owner="default"/> </modify-argument> - <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="addownership-0"/> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" + snippet="addownership-item-at"/> </modify-function> <modify-function signature="addWidget(QWidget*,int,int,QFlags<Qt::AlignmentFlag>)"> <modify-argument index="4"> @@ -1421,7 +1421,7 @@ <enum-type name="ViewportAnchor"/> <enum-type name="ViewportUpdateMode"/> <modify-function signature="setScene(QGraphicsScene*)"> - <modify-argument index="1"> + <modify-argument index="1" pyi-type="Optional[PySide6.QtWidgets.QGraphicsScene]"> <reference-count action="set"/> </modify-argument> </modify-function> @@ -1486,6 +1486,7 @@ <enum-type name="InputMode"/> <modify-function signature="getInt(QWidget*,const QString&,const QString&,int,int,int,int,bool*,QFlags<Qt::WindowType>)" allow-thread="yes"> + <modify-argument index="return" pyi-type="Tuple[int, bool]"/> <modify-argument index="8"> <remove-default-expression/> <remove-argument/> @@ -1496,6 +1497,7 @@ </modify-function> <modify-function signature="getItem(QWidget*,const QString&,const QString&,const QStringList&,int,bool,bool*,QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)" allow-thread="yes"> + <modify-argument index="return" pyi-type="Tuple[str, bool]"/> <modify-argument index="7"> <remove-default-expression/> <remove-argument/> @@ -1506,6 +1508,7 @@ </modify-function> <modify-function signature="getMultiLineText(QWidget*,const QString&,const QString&,const QString&,bool*,QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)" allow-thread="yes"> + <modify-argument index="return" pyi-type="Tuple[str, bool]"/> <modify-argument index="5"> <remove-default-expression/> <remove-argument/> @@ -1516,6 +1519,7 @@ </modify-function> <modify-function signature="getText(QWidget*,const QString&,const QString&,QLineEdit::EchoMode,const QString&,bool*,QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)" allow-thread="yes"> + <modify-argument index="return" pyi-type="Tuple[str, bool]"/> <modify-argument index="6"> <remove-default-expression/> <remove-argument/> @@ -1526,6 +1530,7 @@ </modify-function> <modify-function signature="getDouble(QWidget*,const QString&,const QString&,double,double,double,int,bool*,QFlags<Qt::WindowType>,double)" allow-thread="yes"> + <modify-argument index="return" pyi-type="Tuple[float, bool]"/> <modify-argument index="8"> <remove-default-expression/> <remove-argument/> @@ -1786,7 +1791,7 @@ <modify-function signature="closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)" allow-thread="yes"/> </object-type> <object-type name="QTableWidgetItem" > - <enum-type name="ItemType"/> + <enum-type name="ItemType" python-type="IntEnum"/> <modify-function signature="read(QDataStream&)" allow-thread="yes"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> @@ -1795,7 +1800,7 @@ </modify-function> </object-type> <object-type name="QListWidgetItem" > - <enum-type name="ItemType"/> + <enum-type name="ItemType" python-type="IntEnum"/> <modify-function signature="QListWidgetItem(const QString&,QListWidget*,int)"> <modify-argument index="this"> <parent index="2" action="add"/> @@ -1853,9 +1858,9 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QTreeWidgetItem" hash-function="qHash"> + <object-type name="QTreeWidgetItem" hash-function="qHash" parent-management="true"> <enum-type name="ChildIndicatorPolicy"/> - <enum-type name="ItemType"/> + <enum-type name="ItemType" python-type="IntEnum"/> <modify-function signature="read(QDataStream&)" allow-thread="yes"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> @@ -1975,8 +1980,12 @@ <modify-function signature="removeItemWidget(QListWidgetItem*)" allow-thread="yes"/> </object-type> - <object-type name="QWidget" delete-in-main-thread="true"> + <object-type name="QWidget" delete-in-main-thread="true" polymorphic-base="true"> <!-- see QWindow::nativeEvent(), QAbstractNativeEventFilter::nativeEventFilter() --> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-glue"/> + <inject-code class="native" position="beginning"> + #include <QtWidgets/qapplication.h> + </inject-code> <modify-function signature="nativeEvent(const QByteArray &,void*,qintptr*)"> <modify-argument index="3"> <remove-argument/> @@ -1996,10 +2005,14 @@ </modify-function> <extra-includes> + <include file-name="QApplication" location="global"/> <include file-name="QIcon" location="global"/> <include file-name="QMessageBox" location="global"/> + <include file-name="QStyle" location="global"/> </extra-includes> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" + snippet="qwidget-retrieveobjectname"/> <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-glue"/> <enum-type name="RenderFlag" flags="RenderFlags"/> @@ -2008,12 +2021,14 @@ <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> + <modify-argument index="1" pyi-type="Optional[PySide6.QtWidgets.QWidget]"/> </modify-function> <modify-function signature="setParent(QWidget*,QFlags<Qt::WindowType>)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> + <modify-argument index="1" pyi-type="Optional[PySide6.QtWidgets.QWidget]"/> </modify-function> <modify-function signature="parentWidget()const"> @@ -2025,6 +2040,12 @@ </modify-argument> </modify-function> + <modify-function signature="nativeParentWidget()const"> <!-- Suppress return value heuristics --> + <modify-argument index="return"> + <define-ownership class="target" owner="default"/> + </modify-argument> + </modify-function> + <modify-function signature="actionEvent(QActionEvent*)"> <modify-argument index="1" invalidate-after-use="yes"> <rename to="event"/> @@ -2178,6 +2199,82 @@ </modify-argument> </modify-function> + <modify-function signature="addAction(const QString&)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addAction(const QIcon&,const QString&)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addAction(const QString&,const QKeySequence&)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addAction(const QIcon&,const QString&,const QKeySequence&)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + + <modify-function signature="addAction(const QString&,const QObject*,const char*,Qt::ConnectionType)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <add-function signature="addAction(QString&@text@,PyObject*@callable@)" + return-type="QAction*"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-2"/> + </add-function> + + <modify-function signature="addAction(const QIcon&,const QString&,const QObject*,const char*,Qt::ConnectionType)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <add-function signature="addAction(QIcon&@icon@,QString&@text@,PyObject*@callable@)" + return-type="QAction*"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-3"/> + </add-function> + + <modify-function signature="addAction(const QString&,const QKeySequence&,const QObject*,const char*,Qt::ConnectionType)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <add-function signature="addAction(QString&@text@,QKeySequence&@shortcut@,PyObject*@callable@)" + return-type="QAction*"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-3"/> + </add-function> + + <modify-function signature="addAction(const QIcon&,const QString&,const QKeySequence&,const QObject*,const char*,Qt::ConnectionType)"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <add-function signature="addAction(QIcon&@icon@,QString&@text@,QKeySequence&@shortcut@,PyObject*@callable@)" + return-type="QAction*"> + <modify-argument index="return"> + <parent index="this" action="add"/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-4"/> + </add-function> + <modify-function signature="insertAction(QAction*,QAction*)"> <modify-argument index="2"> <parent index="this" action="add"/> @@ -2192,6 +2289,7 @@ <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> + <modify-argument index="1" pyi-type="Optional[PySide6.QtWidgets.QWidget]"/> </modify-function> <modify-function signature="window()const"> @@ -2204,7 +2302,8 @@ <object-type name="QMessageBox"> <enum-type name="ButtonRole"/> <enum-type name="Icon"/> - <enum-type name="StandardButton" flags="StandardButtons"/> + <enum-type name="StandardButton" python-type="IntFlag" flags="StandardButtons"/> + <enum-type name="Option" flags="Options" since="6.6"/> <modify-function signature="removeButton(QAbstractButton*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2214,10 +2313,19 @@ <include file-name="QPixmap" location="global"/> </extra-includes> + <!-- FIXME PYSIDE-7: Remove deprecated overloads --> <modify-function signature="critical(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="critical(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="information(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="information(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="question(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="question(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="warning(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="warning(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="QMessageBox(const QString&,const QString&,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> <modify-function signature="critical(QWidget*,const QString&,const QString&,int,int,int)" remove="all"/> <modify-function signature="critical(QWidget*,const QString&,const QString&,const QString&,const QString&,const QString&,int,int)" remove="all"/> @@ -2234,7 +2342,7 @@ <enum-type name="ButtonSymbols"/> <enum-type name="CorrectionMode"/> <enum-type name="StepEnabledFlag" flags="StepEnabled"/> - <enum-type name="StepType" since="5.12"/> + <enum-type name="StepType"/> <modify-function signature="setLineEdit(QLineEdit*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2369,7 +2477,7 @@ <modify-function signature="getExistingDirectory(QWidget*,const QString&,const QString&,QFlags<QFileDialog::Option>)" allow-thread="yes"/> <modify-function signature="getExistingDirectoryUrl(QWidget*,const QString&,const QUrl&,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"/> <modify-function signature="getOpenFileName(QWidget*,const QString&,const QString&,const QString&,QString*,QFlags<QFileDialog::Option>)" allow-thread="yes"> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[str, str]"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> <modify-argument index="5"> @@ -2379,7 +2487,7 @@ <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qfiledialog-return" /> </modify-function> <modify-function signature="getOpenFileNames(QWidget*,const QString&,const QString&,const QString&,QString*,QFlags<QFileDialog::Option>)" allow-thread="yes"> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[List[str], str]"> <replace-type modified-type="(fileNames, selectedFilter)"/> </modify-argument> <modify-argument index="5"> @@ -2390,7 +2498,7 @@ </modify-function> <modify-function signature="getOpenFileUrl(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[PySide6.QtCore.QUrl, str]"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> <modify-argument index="5"> @@ -2401,7 +2509,7 @@ </modify-function> <modify-function signature="getOpenFileUrls(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[List[PySide6.QtCore.QUrl], str]"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> <modify-argument index="5"> @@ -2412,7 +2520,7 @@ </modify-function> <modify-function signature="getSaveFileName(QWidget*,const QString&,const QString&,const QString&,QString*,QFlags<QFileDialog::Option>)" allow-thread="yes"> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[str, str]"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> <modify-argument index="5"> @@ -2423,7 +2531,7 @@ </modify-function> <modify-function signature="getSaveFileUrl(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[PySide6.QtCore.QUrl, str]"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> <modify-argument index="5"> @@ -2614,6 +2722,7 @@ <object-type name="QDial"/> <object-type name="QKeySequenceEdit"/> <object-type name="QLineEdit"> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-glue"/> <enum-type name="ActionPosition"/> <enum-type name="EchoMode"/> <modify-function signature="setCompleter(QCompleter*)"> @@ -2658,8 +2767,8 @@ </modify-function> </object-type> <object-type name="QFrame"> - <enum-type name="Shadow"/> - <enum-type name="Shape"/> + <enum-type name="Shadow" python-type="IntEnum"/> + <enum-type name="Shape" python-type="IntEnum"/> <enum-type name="StyleMask"/> </object-type> <object-type name="QSpinBox"/> @@ -2685,43 +2794,6 @@ </modify-function> </object-type> <object-type name="QToolBar"> - <modify-function signature="addAction(QIcon,QString,const QObject*,const char*)"> - <modify-argument index="3"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <modify-argument index="4"> - <remove-argument /> - </modify-argument> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - <inject-code file="../glue/qtwidgets.cpp" snippet="qtoolbar-addaction-1"/> - </modify-function> - <modify-function signature="addAction(QString,const QObject*,const char*)"> - <modify-argument index="2"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <modify-argument index="3"> - <remove-argument /> - </modify-argument> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - <inject-code file="../glue/qtwidgets.cpp" snippet="qtoolbar-addaction-2"/> - </modify-function> - <modify-function signature="addAction(const QString&)"> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addAction(const QIcon&,const QString&)"> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <add-function signature="addAction(QAction*)"> - <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qtoolbar-addaction-3"/> - </add-function> <modify-function signature="addSeparator()"> <modify-argument index="return"> <parent index="this" action="add"/> @@ -2825,6 +2897,8 @@ <include file-name="QIcon" location="global"/> <include file-name="QLocale" location="global"/> <include file-name="QStyle" location="global"/> + <include file-name="pysideqapp.h" location="global"/> + <include file-name="pysidecleanup.h" location="global"/> </extra-includes> <modify-function signature="QApplication(int&,char**,int)" access="private"/> <add-function signature="QApplication(QStringList)"> @@ -2847,9 +2921,9 @@ <object-type name="QCommandLinkButton"/> <!-- FIXME PYSIDE7: Move to QtGui --> - <object-type name="QFileSystemModel" polymorphic-id-expression="qobject_cast<QFileSystemModel*>(%1)"> - <enum-type name="Roles"/> - <enum-type name="Option" flags="Options" since="5.14"/> + <object-type name="QFileSystemModel" polymorphic-id-expression="qobject_cast<QFileSystemModel*>(%B)"> + <enum-type name="Roles" python-type="IntEnum"/> + <enum-type name="Option" flags="Options"/> <modify-function signature="setIconProvider(QAbstractFileIconProvider*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2857,12 +2931,17 @@ </modify-function> </object-type> <object-type name="QFormLayout"> + <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" + snippet="qwidget-retrieveobjectname"/> <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/> <enum-type name="FieldGrowthPolicy"/> <enum-type name="ItemRole"/> <enum-type name="RowWrapPolicy"/> + <value-type name="TakeRowResult"> + <include file-name="QFormLayout" location="global"/> + </value-type> <modify-function signature="getLayoutPosition(QLayout*,int*,QFormLayout::ItemRole*)const"> <modify-argument index="0"> @@ -3038,7 +3117,8 @@ <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> </object-type> - <object-type name="QGraphicsLayoutItem" copyable="false"> + <object-type name="QGraphicsLayoutItem" copyable="false" qt-register-metatype="base" + parent-management="true"> <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const"> <modify-argument index="0"> <replace-type modified-type="PyObject"/> @@ -3266,6 +3346,16 @@ </object-type> <object-type name="QGestureRecognizer" since="4.6"> <enum-type name="ResultFlag" flags="Result"/> + <modify-function signature="create(QObject*)"> + <modify-argument index="return"> + <define-ownership owner="c++"/> + </modify-argument> + </modify-function> + <modify-function signature="registerRecognizer(QGestureRecognizer*)"> + <modify-argument index="1"> + <define-ownership owner="c++"/> + </modify-argument> + </modify-function> </object-type> <object-type name="QTapAndHoldGesture" since="4.6"/> <object-type name="QTapGesture" since="4.6"/> @@ -3291,6 +3381,12 @@ <object-type name="QPinchGesture" since="4.6"> <enum-type name="ChangeFlag" flags="ChangeFlags"/> </object-type> + + <object-type name="QRhiWidget" since="6.7"> + <enum-type name="Api"/> + <enum-type name="TextureFormat"/> + </object-type> + <object-type name="QSwipeGesture" since="4.6"> <enum-type name="SwipeDirection"/> </object-type> @@ -3322,19 +3418,6 @@ <!-- The above entries may be present in the system or not. Keep this section organized. --> - <!-- This enum is present on QtCore --> - <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared"/> - <suppress-warning text="QGraphicsEllipseItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsItemGroup::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsItem::UserType' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsLineItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsPathItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsPixmapItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsPolygonItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsProxyWidget::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsRectItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsSimpleTextItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsSvgItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsTextItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsWidget::Type' does not have a type entry or is not an enum"/> + <suppress-warning text="signal 'activated' in class 'QCompleter' is overloaded."/> + <suppress-warning text="signal 'highlighted' in class 'QCompleter' is overloaded."/> </typesystem> |