aboutsummaryrefslogtreecommitdiffstats
path: root/sources
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-07-23 14:16:14 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-07-23 14:58:51 +0200
commit4a6ecfc1b66252e75e75c6de982ef68e057b625e (patch)
tree7939d2929f292dfa1c42ac640d960a0d880b44b1 /sources
parentff0be5aba1c12be49b305e596a7610d197ca8427 (diff)
PySide2: Remove unimplemented attributes
Diffstat (limited to 'sources')
-rw-r--r--sources/pyside2/PySide2/QtCore/typesystem_core_common.xml11
-rw-r--r--sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml15
-rw-r--r--sources/pyside2/PySide2/QtNetwork/typesystem_network.xml2
-rw-r--r--sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml2
-rw-r--r--sources/pyside2/PySide2/QtSql/typesystem_sql.xml3
-rw-r--r--sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml23
6 files changed, 21 insertions, 35 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index d23f90121..ef7e24e4c 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -960,7 +960,7 @@
<enum-type name="InputMethodHint" flags="InputMethodHints" since="4.6"/>
<enum-type name="InputMethodQuery" flags="InputMethodQueries" />
<enum-type name="EnterKeyType" since="5.6" />
- <enum-type name="ItemDataRole" force-integer="yes" />
+ <enum-type name="ItemDataRole"/>
<enum-type name="ItemFlag" flags="ItemFlags"/>
<enum-type name="ItemSelectionMode"/>
<enum-type name="ItemSelectionOperation" since="5.5" />
@@ -2068,7 +2068,7 @@
</object-type>
<object-type name="QAbstractItemModel">
- <enum-type name="CheckIndexOption" flags="CheckIndexOptions" class="yes" since="5.11"/>
+ <enum-type name="CheckIndexOption" flags="CheckIndexOptions" since="5.11"/>
<enum-type name="LayoutChangeHint" />
<!-- This function was replaced by a added function -->
<modify-function signature="createIndex(int,int,void*)const" remove="all"/>
@@ -2719,12 +2719,12 @@
}
</inject-code>
</modify-function>
- <add-function signature="QByteArray(PyByteArray)" allow-thread="yes">>
+ <add-function signature="QByteArray(PyByteArray)">
<inject-code class="target" position="beginning">
%0 = new QByteArray(PyByteArray_AsString(%PYARG_1), PyByteArray_Size(%PYARG_1));
</inject-code>
</add-function>
- <add-function signature="QByteArray(PyBytes)" allow-thread="yes">
+ <add-function signature="QByteArray(PyBytes)">
<inject-code class="target" position="beginning">
%0 = new QByteArray(PyBytes_AS_STRING(%PYARG_1), PyBytes_GET_SIZE(%PYARG_1));
</inject-code>
@@ -3479,10 +3479,9 @@
</modify-function>
</object-type>
<object-type name="QEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::None">
- <enum-type name="Type" extensible="yes" />
+ <enum-type name="Type"/>
</object-type>
<object-type name="QChildEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ChildAdded || %1-&gt;type() == QEvent::ChildPolished || %1-&gt;type() == QEvent::ChildRemoved">
- <modify-field name="c" read="false" write="false"/>
<modify-function signature="child()const">
<modify-argument index="return">
<define-ownership class="target" owner="default"/>
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index b679abc87..eccb6f7e0 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -395,7 +395,6 @@
<value-type name="QTextFrameFormat" >
<enum-type name="BorderStyle"/>
<enum-type name="Position"/>
- <modify-function signature="isValid()const" access="non-final"/>
</value-type>
<value-type name="QTextLength">
<enum-type name="Type"/>
@@ -403,9 +402,6 @@
<value-type name="QPainterPath">
<enum-type name="ElementType"/>
<value-type name="Element">
- <modify-field name="x" write="false"/>
- <modify-field name="y" write="false"/>
- <modify-field name="type" write="false"/>
<include file-name="QPainterPath" location="global"/>
</value-type>
</value-type>
@@ -554,14 +550,12 @@
<enum-type name="FontPropertiesInheritanceBehavior"/>
<enum-type name="UnderlineStyle"/>
<enum-type name="VerticalAlignment"/>
- <modify-function signature="isValid()const" access="non-final"/>
</value-type>
<value-type name="QTextFormat" >
<enum-type name="FormatType"/>
<enum-type name="ObjectTypes"/>
<enum-type name="PageBreakFlag" flags="PageBreakFlags"/>
<enum-type name="Property" />
- <modify-function signature="isValid()const" access="non-final"/>
</value-type>
<value-type name="QTextListFormat">
<enum-type name="Style"/>
@@ -1507,10 +1501,10 @@
</inject-code>
</modify-function>
</value-type>
- <value-type name="QGradient" force-abstract="yes" polymorphic-id-expression="%1-&gt;type() == QGradient::NoGradient">
+ <value-type name="QGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::NoGradient">
<enum-type name="CoordinateMode"/>
<enum-type name="InterpolationMode"/>
- <enum-type name="Spread" lower-bound="QGradient.PadSpread" upper-bound="QGradient.RepeatSpread"/>
+ <enum-type name="Spread"/>
<enum-type name="Type"/>
</value-type>
<value-type name="QLinearGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::LinearGradient" />
@@ -1835,9 +1829,7 @@
<suppress-warning text="enum 'QWheelEvent::DefaultDeltasPerStep' does not have a type entry or is not an enum" />
<object-type name="QWindowStateChangeEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::WindowStateChange"/>
- <object-type name="QInputEvent" copyable="false">
- <modify-function signature="modifiers()const" access="non-final"/>
- </object-type>
+ <object-type name="QInputEvent" copyable="false"/>
<object-type name="QKeyEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::KeyPress || %1-&gt;type() == QEvent::KeyRelease || %1-&gt;type() == QEvent::ShortcutOverride">
<add-function signature="operator!=(QKeySequence::StandardKey)">
<inject-code class="target">
@@ -2237,7 +2229,6 @@
</extra-includes>
<!-- ### "setPaintDevice(QPaintDevice*)" is an internal method. -->
<modify-function signature="setPaintDevice(QPaintDevice*)" remove="all"/>
- <modify-field name="state" read="false" write="false"/>
</object-type>
<object-type name="QPainter">
<extra-includes>
diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
index e4235e070..66fff6e9d 100644
--- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
+++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
@@ -275,7 +275,7 @@
</extra-includes>
</value-type>
<value-type name="QNetworkRequest">
- <enum-type name="Attribute" extensible="yes"/>
+ <enum-type name="Attribute"/>
<enum-type name="LoadControl" since="4.7"/>
<enum-type name="Priority" since="4.7"/>
<enum-type name="CacheLoadControl"/>
diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
index d04d2f674..c332eea0d 100644
--- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
+++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
@@ -71,7 +71,7 @@
<rejection class="^QGL.*$" argument-type="^(const )?GLsizei ?\*$"/>
<namespace-type name="QGL">
- <enum-type name="FormatOption" flags="FormatOptions" force-integer="yes"/>
+ <enum-type name="FormatOption" flags="FormatOptions"/>
<extra-includes>
<include file-name="qgl.h" location="global"/>
</extra-includes>
diff --git a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml
index 1b6baa15f..3eab73307 100644
--- a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml
+++ b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml
@@ -101,7 +101,6 @@
<extra-includes>
<include file-name="QSqlField" location="global"/>
</extra-includes>
- <modify-function signature="append(QSqlField)" access="non-final"/>
</value-type>
<value-type name="QSqlError">
@@ -142,8 +141,6 @@
</object-type>
<object-type name="QSqlQueryModel">
- <modify-function signature="indexInQuery(QModelIndex)const" access="non-final"/>
- <modify-function signature="setQuery(QSqlQuery)" access="non-final"/>
<extra-includes>
<include file-name="QSqlError" location="global"/>
<include file-name="QSqlQuery" location="global"/>
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 11e6a9f7a..2b29187cb 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -74,7 +74,7 @@
-->
<object-type name="QStyleOption" polymorphic-id-expression="%1-&gt;type == QStyleOption::SO_Default">
- <enum-type name="OptionType" extensible="yes"/>
+ <enum-type name="OptionType"/>
<enum-type name="StyleOptionType"/>
<enum-type name="StyleOptionVersion"/>
</object-type>
@@ -1267,17 +1267,17 @@
</object-type>
<object-type name="QAbstractButton"/>
<object-type name="QStyle">
- <enum-type name="ComplexControl" extensible="yes"/>
- <enum-type name="ContentsType" extensible="yes"/>
- <enum-type name="ControlElement" extensible="yes"/>
- <enum-type name="PixelMetric" extensible="yes" />
- <enum-type name="PrimitiveElement" extensible="yes" />
+ <enum-type name="ComplexControl"/>
+ <enum-type name="ContentsType"/>
+ <enum-type name="ControlElement"/>
+ <enum-type name="PixelMetric"/>
+ <enum-type name="PrimitiveElement"/>
<enum-type name="RequestSoftwareInputPanel" since="4.6"/>
- <enum-type name="StandardPixmap" extensible="yes"/>
+ <enum-type name="StandardPixmap"/>
<enum-type name="StateFlag" flags="State"/>
- <enum-type name="StyleHint" extensible="yes" />
- <enum-type name="SubControl" flags="SubControls" extensible="yes" force-integer="yes"/>
- <enum-type name="SubElement" extensible="yes" />
+ <enum-type name="StyleHint"/>
+ <enum-type name="SubControl" flags="SubControls"/>
+ <enum-type name="SubElement"/>
<modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const">
<modify-argument index="3" invalidate-after-use="yes"/>
<modify-argument index="4">
@@ -1574,7 +1574,6 @@
<enum-type name="OptimizationFlag" flags="OptimizationFlags"/>
<enum-type name="ViewportAnchor"/>
<enum-type name="ViewportUpdateMode"/>
- <modify-function signature="setupViewport(QWidget*)" access="non-final"/>
<modify-function signature="setScene(QGraphicsScene*)">
<modify-argument index="1">
<reference-count action="set"/>
@@ -2963,7 +2962,7 @@
</object-type>
<object-type name="QDesktopWidget"/>
<object-type name="QFrame">
- <enum-type name="Shadow" extensible="yes"/>
+ <enum-type name="Shadow"/>
<enum-type name="Shape"/>
<enum-type name="StyleMask"/>
</object-type>