aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-04-15 13:45:17 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-16 11:05:01 +0000
commit88c855310c75123c96027541e8f3f654a48e6f03 (patch)
tree8c9c485dba5477942478e42df0474b0ec3b4f56b
parentff35c0726df3463e7e0f4d9a6cee19b7c55aae30 (diff)
PySide6/typesystem: Replace remaining usages of QVector by QList
Change-Id: I1c9fe1006cb936c88c860482ba93d0a68554a350 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit f409d7e593ceebcc305cc8211f9d775ea5329954) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml26
-rw-r--r--sources/pyside6/PySide6/glue/qtcore.cpp2
2 files changed, 14 insertions, 14 deletions
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
index 6137c248f..56252d8f2 100644
--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
@@ -486,12 +486,12 @@
<!-- ### "QPolygon(int, const int*)" is an internal constructor. -->
<modify-function signature="QPolygon(int,const int*)" remove="all"/>
- <!-- ### A QVector parameter, for no defined type, will generate wrong code. -->
- <modify-function signature="operator+=(QVector&lt;QPoint&gt;)" remove="all"/>
+ <!-- ### A QList parameter, for no defined type, will generate wrong code. -->
+ <modify-function signature="operator+=(QList&lt;QPoint&gt;)" remove="all"/>
<add-function signature="operator&lt;&lt;(QPoint)">
<inject-code file="../glue/qtgui.cpp" snippet="qpolygon-operatorlowerlower"/>
</add-function>
- <add-function signature="operator&lt;&lt;(QVector&lt;QPoint&gt;)">
+ <add-function signature="operator&lt;&lt;(QList&lt;QPoint&gt;)">
<inject-code file="../glue/qtgui.cpp" snippet="qpolygon-operatorlowerlower"/>
</add-function>
<!-- ### -->
@@ -500,12 +500,12 @@
<extra-includes>
<include file-name="QTransform" location="global"/>
</extra-includes>
- <!-- ### A QVector parameter, for no defined type, will generate wrong code. -->
- <modify-function signature="operator+=(QVector&lt;QPointF&gt;)" remove="all"/>
+ <!-- ### A QList parameter, for no defined type, will generate wrong code. -->
+ <modify-function signature="operator+=(QList&lt;QPointF&gt;)" remove="all"/>
<!-- ### See bug 776 -->
<modify-function signature="operator&lt;&lt;(QPointF)" remove="all"/>
<!-- ### See bug 777 -->
- <modify-function signature="operator&lt;&lt;(QVector&lt;QPointF&gt;)" remove="all"/>
+ <modify-function signature="operator&lt;&lt;(QList&lt;QPointF&gt;)" remove="all"/>
<!-- ### -->
</value-type>
<value-type name="QIcon" >
@@ -1747,18 +1747,18 @@
<modify-function signature="drawConvexPolygon(const QPoint*,int)" remove="all"/>
- <add-function signature="drawConvexPolygon(QVector&lt;QPoint>)">
+ <add-function signature="drawConvexPolygon(QList&lt;QPoint>)">
<inject-code>
<insert-template name="qpainter_drawlist"/>
</inject-code>
</add-function>
<modify-function signature="drawConvexPolygon(const QPointF*,int)" remove="all"/>
- <add-function signature="drawConvexPolygon(QVector&lt;QPointF>)">
+ <add-function signature="drawConvexPolygon(QList&lt;QPointF>)">
<inject-code>
<insert-template name="qpainter_drawlist"/>
</inject-code>
</add-function>
- <!-- ### Overloads using QVector<T> does the job of these methods -->
+ <!-- ### Overloads using QList<T> does the job of these methods -->
<modify-function signature="drawLines(const QLine*,int)" remove="all"/>
<modify-function signature="drawLines(const QLineF*,int)" remove="all"/>
<modify-function signature="drawLines(const QPoint*,int)" remove="all"/>
@@ -1784,15 +1784,15 @@
<modify-function signature="drawPoints(const QPolygonF&amp;)" overload-number="1"/>
<modify-function signature="drawPolygon(const QPoint*,int,Qt::FillRule)" remove="all"/>
- <add-function signature="drawPolygon(QVector&lt;QPoint>,Qt::FillRule)">
+ <add-function signature="drawPolygon(QList&lt;QPoint>,Qt::FillRule)">
<inject-code file="../glue/qtgui.cpp" snippet="qpainter-drawpolygon"/>
</add-function>
<modify-function signature="drawPolygon(const QPointF*,int,Qt::FillRule)" remove="all"/>
- <add-function signature="drawPolygon(QVector&lt;QPointF>,Qt::FillRule)">
+ <add-function signature="drawPolygon(QList&lt;QPointF>,Qt::FillRule)">
<inject-code file="../glue/qtgui.cpp" snippet="qpainter-drawpolygon"/>
</add-function>
<modify-function signature="drawPolyline(const QPoint*,int)" remove="all"/>
- <add-function signature="drawPolyline(QVector&lt;QPoint>)">
+ <add-function signature="drawPolyline(QList&lt;QPoint>)">
<inject-code>
<insert-template name="qpainter_drawlist"/>
</inject-code>
@@ -1802,7 +1802,7 @@
<modify-function signature="drawPolyline(const QPointF*,int)" remove="all"/>
<modify-function signature="drawPolyline(const QPolygon&amp;)" overload-number="0"/>
<modify-function signature="drawPolyline(const QPolygonF&amp;)" overload-number="1"/>
- <add-function signature="drawPolyline(QVector&lt;QPointF>)">
+ <add-function signature="drawPolyline(QList&lt;QPointF>)">
<inject-code>
<insert-template name="qpainter_drawlist"/>
</inject-code>
diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp
index 354dfa389..a42fd00f0 100644
--- a/sources/pyside6/PySide6/glue/qtcore.cpp
+++ b/sources/pyside6/PySide6/glue/qtcore.cpp
@@ -768,7 +768,7 @@ return !result ? -1 : 0;
// @snippet qabstractitemmodel-createindex
// @snippet qabstractitemmodel
-qRegisterMetaType<QVector<int> >("QVector<int>");
+qRegisterMetaType<QList<int> >("QList<int>");
// @snippet qabstractitemmodel
// @snippet qobject-metaobject