diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-05-25 11:12:40 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-05-25 11:12:40 +0300 |
| commit | ca0519cb3f6b62e3b61ba74f0c60eac891dd3a15 (patch) | |
| tree | 46e94d1b9a77648ca080a36b7d266f2322031d67 /sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml | |
| parent | 72d32f66685fbb7fefc41eee629e63f4824cb10b (diff) | |
| parent | 7c386888b453b7f2ac78ef1da59d077b25e372b3 (diff) | |
Merge tag 'v5.15.4-lts' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl
Qt For Python Release 5.15.4
Change-Id: I8457501ba90fc481fb9de686eb8a2f880ecc06cd
Diffstat (limited to 'sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml | 131 |
1 files changed, 65 insertions, 66 deletions
diff --git a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml index f10aeea3e..5dc87a013 100644 --- a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml +++ b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml @@ -119,56 +119,43 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="addRow(QVector<QtDataVisualization::QBarDataItem>*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addRow(QVector<QtDataVisualization::QBarDataItem>*, const QString&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addRows(const QtDataVisualization::QBarDataArray&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addRows(const QtDataVisualization::QBarDataArray&, const QStringList&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRow(int, QVector<QtDataVisualization::QBarDataItem>*)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRow(int, QVector<QtDataVisualization::QBarDataItem>*, const QString&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRows(int, const QtDataVisualization::QBarDataArray&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRows(int, const QtDataVisualization::QBarDataArray&, const QStringList&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRow(int, QVector<QtDataVisualization::QBarDataItem>*)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRow(int, QVector<QtDataVisualization::QBarDataItem>*, const QString&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> + + <!-- PYSIDE-1438: Replace all add/set/insertRow() taking a 'QVector*' by overloads + taking 'const QVector &' since an allocated list needs to be passed. --> + <modify-function signature="addRow(QVector<QtDataVisualization::QBarDataItem>*)" remove="all"/> + <add-function signature="addRow(const QVector<QtDataVisualization::QBarDataItem>&)" return-type="int"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-addrow"/> + </add-function> + <modify-function signature="addRow(QVector<QtDataVisualization::QBarDataItem>*,const QString&)" remove="all"/> + <add-function signature="addRow(const QVector<QtDataVisualization::QBarDataItem>&,const QString&)" + return-type="int"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-addrow-string"/> + </add-function> + + <modify-function signature="insertRow(int,QVector<QtDataVisualization::QBarDataItem>*)" remove="all"/> + <add-function signature="insertRow(int,const QVector<QtDataVisualization::QBarDataItem>&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-insertrow"/> + </add-function> + <modify-function signature="insertRow(int,QVector<QtDataVisualization::QBarDataItem>*,const QString&)" remove="all"/> + <add-function signature="insertRow(int,const QVector<QtDataVisualization::QBarDataItem>&, const QString&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-insertrow-string"/> + </add-function> + + <modify-function signature="setRow(int,QVector<QtDataVisualization::QBarDataItem>*)" remove="all"/> + <add-function signature="setRow(int,const QVector<QtDataVisualization::QBarDataItem>&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-setrow"/> + </add-function> + <modify-function signature="setRow(int,QVector<QtDataVisualization::QBarDataItem>*,const QString&)" remove="all"/> + <add-function signature="setRow(int,const QVector<QtDataVisualization::QBarDataItem>&,const QString&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-setrow-string"/> + </add-function> + <modify-function signature="setRows(int, const QtDataVisualization::QBarDataArray&)"> <modify-argument index="2"> <parent index="this" action="add"/> @@ -182,7 +169,13 @@ </object-type> <object-type name="QCustom3DItem"/> <object-type name="QCustom3DLabel"/> - <object-type name="QCustom3DVolume"/> + <object-type name="QCustom3DVolume"> + <modify-function signature="setTextureData(QVector<uchar>*)" remove="all"/> + <add-function signature="setTextureData(const QVector<uchar>&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="qcustom3dvolume-settexturedata"/> + </add-function> + </object-type> <object-type name="QHeightMapSurfaceDataProxy"/> <object-type name="QItemModelBarDataProxy"> <enum-type name="MultiMatchBehavior"/> @@ -251,21 +244,27 @@ </object-type> <value-type name="QSurfaceDataItem"/> <object-type name="QSurfaceDataProxy"> - <modify-function signature="addRow(QVector<QtDataVisualization::QSurfaceDataItem>*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRow(int, QVector<QtDataVisualization::QSurfaceDataItem>*)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRow(int, QVector<QtDataVisualization::QSurfaceDataItem>*)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> + + <!-- PYSIDE-1438: Replace all add/set/insertRow() taking a 'QVector*' by overloads + taking 'const QVector &' since an allocated list needs to be passed. --> + <modify-function signature="addRow(QVector<QtDataVisualization::QSurfaceDataItem>*)" remove="all"/> + <add-function signature="addRow(const QVector<QtDataVisualization::QSurfaceDataItem>&)" return-type="int"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-addrow"/> + </add-function> + + <modify-function signature="insertRow(int,QVector<QtDataVisualization::QSurfaceDataItem>*)" remove="all"/> + <add-function signature="insertRow(int,const QVector<QtDataVisualization::QSurfaceDataItem>&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-insertrow"/> + </add-function> + + <modify-function signature="setRow(int,QVector<QtDataVisualization::QSurfaceDataItem>*)" remove="all"/> + <add-function signature="setRow(int,const QVector<QtDataVisualization::QSurfaceDataItem>&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-setrow"/> + </add-function> + <modify-function signature="resetArray(QtDataVisualization::QSurfaceDataArray*)"> <modify-argument index="1"> <parent index="this" action="add"/> |