typesystem_gui_common.xml: Cleanup

- Remove duplicate modifications of
  QOpenGLExtraFunctions::SamplerParameteri/fv()
  that are covered by the below regular expression

- Remove QMatrix4x2::copyDataTo() as is done for the other QMatrix<N>x<M>
  classes, fixing:

There's no user provided way (conversion rule, argument removal, custom code,
etc) to handle the primitive type 'float *' of argument 1 in function
'QMatrix4x2::copyDataTo(float * values) const'.

- Remove the array modifications of the QMatrix<N>x<M> constructors
  (specializations of QGenericMatrix). They don't work since the
  handling is not implemented in shiboken's
  AbstractMetaBuilderPrivate::inheritTemplate(). This can be fixed,
  but has no effect here since the manually added constructor from a
  PySequence always takes preference. This fixes:

 There's no user provided way (conversion rule, argument removal, custom code, etc) to handle the primitive type
'const float *' of argument 1 in function 'QMatrix2x2::QMatrix2x2(const float * values)'.
'const float *' of argument 1 in function 'QMatrix2x3::QMatrix2x3(const float * values)'.
'const float *' of argument 1 in function 'QMatrix2x4::QMatrix2x4(const float * values)'.
'const float *' of argument 1 in function 'QMatrix3x2::QMatrix3x2(const float * values)'.
'const float *' of argument 1 in function 'QMatrix3x3::QMatrix3x3(const float * values)'.
'const float *' of argument 1 in function 'QMatrix3x4::QMatrix3x4(const float * values)'.
'const float *' of argument 1 in function 'QMatrix4x2::QMatrix4x2(const float * values)'.
'const float *' of argument 1 in function 'QMatrix4x3::QMatrix4x3(const float * values)'.

Change-Id: Iea9ced35158b31fb006d038cd5c307d5feec839e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 9 insertions, 30 deletions

diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index e61e1b6e7..eaff93345 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -1927,9 +1927,7 @@
 
   <value-type name="QGenericMatrix" generate="no"/>
   <value-type name="QMatrix2x2" since="4.6">
-    <modify-function signature="QMatrix2x2(const float*)">
-      <modify-argument index="1"><array/></modify-argument>
-    </modify-function>
+    <modify-function signature="QMatrix2x2(const float*)" remove="all"/>
     <modify-function signature="copyDataTo(float*) const" remove="all"/>
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
@@ -1965,9 +1963,7 @@
   </value-type>
 
   <value-type name="QMatrix2x3" since="4.6">
-    <modify-function signature="QMatrix2x3(const float*)">
-      <modify-argument index="1"><array/></modify-argument>
-    </modify-function>
+    <modify-function signature="QMatrix2x3(const float*)" remove="all"/>
     <modify-function signature="copyDataTo(float*) const" remove="all"/>
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
@@ -2003,9 +1999,7 @@
   </value-type>
 
   <value-type name="QMatrix2x4" since="4.6">
-    <modify-function signature="QMatrix2x4(const float*)">
-      <modify-argument index="1"><array/></modify-argument>
-    </modify-function>
+    <modify-function signature="QMatrix2x4(const float*)" remove="all"/>
     <modify-function signature="copyDataTo(float*) const" remove="all"/>
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
@@ -2041,9 +2035,7 @@
   </value-type>
 
   <value-type name="QMatrix3x2" since="4.6">
-    <modify-function signature="QMatrix3x2(const float*)">
-      <modify-argument index="1"><array/></modify-argument>
-    </modify-function>
+    <modify-function signature="QMatrix3x2(const float*)" remove="all"/>
     <modify-function signature="copyDataTo(float*) const" remove="all"/>
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
@@ -2079,9 +2071,7 @@
   </value-type>
 
   <value-type name="QMatrix3x3" since="4.6">
-    <modify-function signature="QMatrix3x3(const float*)">
-      <modify-argument index="1"><array/></modify-argument>
-    </modify-function>
+    <modify-function signature="QMatrix3x3(const float*)" remove="all"/>
     <modify-function signature="copyDataTo(float*) const" remove="all"/>
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
@@ -2117,9 +2107,7 @@
   </value-type>
 
   <value-type name="QMatrix3x4" since="4.6">
-    <modify-function signature="QMatrix3x4(const float*)">
-      <modify-argument index="1"><array/></modify-argument>
-    </modify-function>
+    <modify-function signature="QMatrix3x4(const float*)" remove="all"/>
     <modify-function signature="copyDataTo(float*) const" remove="all"/>
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
@@ -2155,9 +2143,8 @@
   </value-type>
 
   <value-type name="QMatrix4x2" since="4.6">
-    <modify-function signature="QMatrix4x2(const float*)">
-      <modify-argument index="1"><array/></modify-argument>
-    </modify-function>
+    <modify-function signature="QMatrix4x2(const float*)" remove="all"/>
+    <modify-function signature="copyDataTo(float*) const" remove="all"/>
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
             <insert-template name="repr_code_matrix">
@@ -2192,9 +2179,7 @@
   </value-type>
 
   <value-type name="QMatrix4x3" since="4.6">
-    <modify-function signature="QMatrix4x3(const float*)">
-      <modify-argument index="1"><array/></modify-argument>
-    </modify-function>
+    <modify-function signature="QMatrix4x3(const float*)" remove="all"/>
     <modify-function signature="copyDataTo(float*) const" remove="all"/>
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
@@ -2739,12 +2724,6 @@
       <modify-function signature="glProgramUniformMatrix4x3fv(unsigned int,int,int,unsigned char,const float*)">
           <modify-argument index="5"><array/></modify-argument>
       </modify-function>
-      <modify-function signature="glSamplerParameterfv(unsigned int,unsigned int,const float*)">
-          <modify-argument index="3"><array/></modify-argument>
-      </modify-function>
-      <modify-function signature="glSamplerParameteriv(unsigned int,unsigned int,const int*)">
-          <modify-argument index="3"><array/></modify-argument>
-      </modify-function>
       <modify-function signature="^glSamplerParameterI?u?[fi]v\(.*$">
           <modify-argument index="3"><array/></modify-argument>
       </modify-function>