From a57a202a70801f766094c3ed11664b03c9a6a3e4 Mon Sep 17 00:00:00 2001
From: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Date: Thu, 11 Oct 2018 17:45:43 +0200
Subject: Move inject-code snippets to separate files

When code must be modified or added to certain
functions, we currently have two options:

    * Write a template and include it into the typesystem,
    * inject code directly at a certain place of the function entry.

The problem with injecting raw code is that since it is an XML
file, one need to escape protected symbols, like "<" and "&".

Thanks to a couple of complementary commits, now we can place
this code snippets on a separate file without triggering
a whole module compiling process, since the typesystem itself
will not be alterered.

All the injected code from the typesystem was removed
and placed into a single file per module inside a top-level directory
called glue.

Some small fixes were included mainly regarding styling
of the code.

Task-number: PYSIDE-834
Change-Id: I823e92d241a528d75d5940090008db9bf297f49e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../pyside2/PySide2/QtOpenGL/typesystem_opengl.xml | 252 +++++++++------------
 1 file changed, 112 insertions(+), 140 deletions(-)

(limited to 'sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml')

diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
index c332eea0d..59019faa1 100644
--- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
+++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 -->
 <typesystem package="PySide2.QtOpenGL">
-  <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" />
+  <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/>
 
   <primitive-type name="GLbitfield"/>
   <primitive-type name="GLboolean"/>
@@ -88,7 +88,7 @@
     <enum-type name="OpenGLVersionFlag" flags="OpenGLVersionFlags"/>
   </value-type>
 
-  <rejection class="QGLContext" field-name="currentCtx" />
+  <rejection class="QGLContext" field-name="currentCtx"/>
   <object-type name="QGLContext">
     <enum-type name="BindOption" flags="BindOptions" since="4.6"/>
     <modify-function signature="chooseContext(const QGLContext*)">
@@ -99,7 +99,7 @@
     </modify-function>
 
     <!-- ### Obsolete functions and ctors -->
-    <modify-function signature="QGLContext(const QGLFormat&amp;,QPaintDevice*)" remove="all" />
+    <modify-function signature="QGLContext(const QGLFormat&amp;,QPaintDevice*)" remove="all"/>
     <!-- ### -->
   </object-type>
   <object-type name="QGLFramebufferObject">
@@ -124,7 +124,7 @@
       </modify-argument>
     </modify-function>
     <!-- ### Not part of Qt public API -->
-    <modify-function signature="setContext(QGLContext*,const QGLContext*,bool)" remove="all" />
+    <modify-function signature="setContext(QGLContext*,const QGLContext*,bool)" remove="all"/>
     <!-- ### -->
     <!--- ### Obsolete functions -->
     <modify-function signature="setFormat(QGLFormat)" remove="all"/>
@@ -158,12 +158,12 @@
     <!-- setAttributeArray -->
     <modify-function signature="setAttributeArray(int,const QVector2D*,int)" rename="setAttributeArray2D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="%3" />
-                <replace from="$ARG1" to="%3" />
+                <replace from="$ARG0" to="%3"/>
+                <replace from="$ARG1" to="%3"/>
                 <replace from="$ATTR_TYPE" to="QVector2D"/>
             </insert-template>
         </inject-code>
@@ -171,12 +171,12 @@
 
     <modify-function signature="setAttributeArray(int,const QVector3D*,int)" rename="setAttributeArray3D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="%3" />
-                <replace from="$ARG1" to="%3" />
+                <replace from="$ARG0" to="%3"/>
+                <replace from="$ARG1" to="%3"/>
                 <replace from="$ATTR_TYPE" to="QVector3D"/>
             </insert-template>
         </inject-code>
@@ -184,12 +184,12 @@
 
     <modify-function signature="setAttributeArray(int,const QVector4D*,int)" rename="setAttributeArray4D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="%3" />
-                <replace from="$ARG1" to="%3" />
+                <replace from="$ARG0" to="%3"/>
+                <replace from="$ARG1" to="%3"/>
                 <replace from="$ATTR_TYPE" to="QVector4D"/>
             </insert-template>
         </inject-code>
@@ -197,12 +197,12 @@
 
     <modify-function signature="setAttributeArray(const char*,const QVector2D*,int)" rename="setAttributeArray2D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="%3" />
-                <replace from="$ARG1" to="%3" />
+                <replace from="$ARG0" to="%3"/>
+                <replace from="$ARG1" to="%3"/>
                 <replace from="$ATTR_TYPE" to="QVector2D"/>
             </insert-template>
         </inject-code>
@@ -210,12 +210,12 @@
 
     <modify-function signature="setAttributeArray(const char*,const QVector3D*,int)" rename="setAttributeArray3D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="%3" />
-                <replace from="$ARG1" to="%3" />
+                <replace from="$ARG0" to="%3"/>
+                <replace from="$ARG1" to="%3"/>
                 <replace from="$ATTR_TYPE" to="QVector3D"/>
             </insert-template>
         </inject-code>
@@ -223,12 +223,12 @@
 
     <modify-function signature="setAttributeArray(const char*,const QVector4D*,int)" rename="setAttributeArray4D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="%3" />
-                <replace from="$ARG1" to="%3" />
+                <replace from="$ARG0" to="%3"/>
+                <replace from="$ARG1" to="%3"/>
                 <replace from="$ATTR_TYPE" to="QVector4D"/>
             </insert-template>
         </inject-code>
@@ -237,15 +237,15 @@
     <!-- setUniformValueArray -->
     <modify-function signature="setUniformValueArray(int,const GLint*,int)" rename="setUniformValueArrayInt">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="GLint"/>
             </insert-template>
         </inject-code>
@@ -253,15 +253,15 @@
 
     <modify-function signature="setUniformValueArray(int,const GLuint*,int)" rename="setUniformValueArrayUint">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="GLuint"/>
             </insert-template>
         </inject-code>
@@ -269,15 +269,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QVector2D*,int)" rename="setUniformValueArray2D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QVector2D"/>
             </insert-template>
         </inject-code>
@@ -285,15 +285,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QVector3D*,int)" rename="setUniformValueArray3D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QVector3D"/>
             </insert-template>
         </inject-code>
@@ -301,15 +301,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QVector4D*,int)" rename="setUniformValueArray4D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QVector4D"/>
             </insert-template>
         </inject-code>
@@ -317,15 +317,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix2x2*,int)" rename="setUniformValueArray2x2">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix2x2"/>
             </insert-template>
         </inject-code>
@@ -333,15 +333,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix2x3*,int)" rename="setUniformValueArray2x3">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix2x3"/>
             </insert-template>
         </inject-code>
@@ -349,15 +349,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix2x4*,int)" rename="setUniformValueArray2x4">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix2x4"/>
             </insert-template>
         </inject-code>
@@ -365,15 +365,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix3x2*,int)" rename="setUniformValueArray3x2">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix3x2"/>
             </insert-template>
         </inject-code>
@@ -381,15 +381,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix3x3*,int)" rename="setUniformValueArray3x3">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix3x3"/>
             </insert-template>
         </inject-code>
@@ -397,15 +397,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix3x4*,int)" rename="setUniformValueArray3x4">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix3x4"/>
             </insert-template>
         </inject-code>
@@ -413,15 +413,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix4x2*,int)" rename="setUniformValueArray4x2">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix4x2"/>
             </insert-template>
         </inject-code>
@@ -429,15 +429,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix4x3*,int)" rename="setUniformValueArray4x3">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix4x3"/>
             </insert-template>
         </inject-code>
@@ -445,15 +445,15 @@
 
     <modify-function signature="setUniformValueArray(int,const QMatrix4x4*,int)" rename="setUniformValueArray4x4">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix4x4"/>
             </insert-template>
         </inject-code>
@@ -461,15 +461,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const GLint*,int)" rename="setUniformValueArrayInt">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="GLint"/>
             </insert-template>
         </inject-code>
@@ -477,15 +477,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const GLuint*,int)" rename="setUniformValueArrayUint">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="GLuint"/>
             </insert-template>
         </inject-code>
@@ -493,15 +493,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QVector2D*,int)" rename="setUniformValueArray2D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QVector2D"/>
             </insert-template>
         </inject-code>
@@ -509,15 +509,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QVector3D*,int)" rename="setUniformValueArray3D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QVector3D"/>
             </insert-template>
         </inject-code>
@@ -525,15 +525,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QVector4D*,int)" rename="setUniformValueArray4D">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QVector4D"/>
             </insert-template>
         </inject-code>
@@ -541,15 +541,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix2x2*,int)" rename="setUniformValueArray2x2">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix2x2"/>
             </insert-template>
         </inject-code>
@@ -557,15 +557,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix2x3*,int)" rename="setUniformValueArray2x3">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix2x3"/>
             </insert-template>
         </inject-code>
@@ -573,15 +573,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix2x4*,int)" rename="setUniformValueArray2x4">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix2x4"/>
             </insert-template>
         </inject-code>
@@ -589,15 +589,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix3x2*,int)" rename="setUniformValueArray3x2">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix3x2"/>
             </insert-template>
         </inject-code>
@@ -605,15 +605,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix3x3*,int)" rename="setUniformValueArray3x3">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix3x3"/>
             </insert-template>
         </inject-code>
@@ -621,15 +621,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix3x4*,int)" rename="setUniformValueArray3x4">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix3x4"/>
             </insert-template>
         </inject-code>
@@ -637,15 +637,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix4x2*,int)" rename="setUniformValueArray4x2">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix4x2"/>
             </insert-template>
         </inject-code>
@@ -653,15 +653,15 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix4x3*,int)" rename="setUniformValueArray4x3">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix4x3"/>
             </insert-template>
         </inject-code>
@@ -669,23 +669,23 @@
 
     <modify-function signature="setUniformValueArray(const char*,const QMatrix4x4*,int)" rename="setUniformValueArray4x4">
         <modify-argument index="2" >
-            <replace-type modified-type="PySequence" />
+            <replace-type modified-type="PySequence"/>
         </modify-argument>
         <modify-argument index="3">
              <remove-argument />
         </modify-argument>
         <inject-code>
             <insert-template name="callArrayFunction">
-                <replace from="$ARG0" to="_size" />
-                <replace from="$ARG1" to="0" />
+                <replace from="$ARG0" to="_size"/>
+                <replace from="$ARG1" to="0"/>
                 <replace from="$ATTR_TYPE" to="QMatrix4x4"/>
             </insert-template>
         </inject-code>
     </modify-function>
 
     <!-- ### Use QMatrixZxY overloads -->
-    <modify-function signature="setAttributeArray(int,GLenum,const void*,int,int)" remove="all" since="4.7" />
-    <modify-function signature="setAttributeArray(const char*,GLenum,const void*,int,int)" remove="all" since="4.7" />
+    <modify-function signature="setAttributeArray(int,GLenum,const void*,int,int)" remove="all" since="4.7"/>
+    <modify-function signature="setAttributeArray(const char*,GLenum,const void*,int,int)" remove="all" since="4.7"/>
     <!-- ### -->
   </object-type>
 
@@ -701,25 +701,10 @@
       <modify-argument index="2">
         <replace-default-expression with="-1"/>
       </modify-argument>
-      <inject-code class="target" position="beginning">
-        int size = (%2 &lt; 0) ? %1.size() : %2;
-        %CPPSELF.allocate((const void*) %1.data(), size);
-      </inject-code>
+      <inject-code class="target" position="beginning" file="../glue/qtopengl.cpp" snippet="qglbuffer-allocate"/>
     </modify-function>
     <modify-function signature="map(QGLBuffer::Access)">
-      <inject-code>
-        Py_ssize_t dataSize = %CPPSELF.size();
-        void* data = %CPPSELF.map(%1);
-
-        if (!data) {
-            Py_INCREF(Py_None);
-            %PYARG_0 = Py_None;
-        } else if (%1 == QGLBuffer::ReadOnly) {
-            %PYARG_0 = Shiboken::Buffer::newObject(data, dataSize, Shiboken::Buffer::ReadOnly);
-        } else {
-            %PYARG_0 = Shiboken::Buffer::newObject(data, dataSize, Shiboken::Buffer::ReadWrite);
-        }
-      </inject-code>
+      <inject-code file="../glue/qtopengl.cpp" snippet="qglbuffer-map"/>
     </modify-function>
     <modify-function signature="read(int,void*,int)">
       <modify-argument index="2">
@@ -728,17 +713,7 @@
       <modify-argument index="return">
         <replace-type modified-type="(retval, data)"/>
       </modify-argument>
-      <inject-code class="target" position="beginning">
-        char *data = new char[%3];
-        bool result = %CPPSELF.read(%1, data, %3);
-        QByteArray ret;
-        if (result)
-            ret.append((const char*)data, %3);
-        %PYARG_0 = PyTuple_New(2);
-        PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](result));
-        PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QByteArray](ret));
-        delete[] data;
-      </inject-code>
+      <inject-code class="target" position="beginning" file="../glue/qtopengl.cpp" snippet="qglbuffer-read"/>
     </modify-function>
     <modify-function signature="write(int,const void*,int)">
       <modify-argument index="2">
@@ -747,10 +722,7 @@
       <modify-argument index="3">
         <replace-default-expression with="-1"/>
       </modify-argument>
-      <inject-code class="target" position="beginning">
-        int size = (%3 &lt; 0) ? %2.size() : %3;
-        %CPPSELF.write(%1, (const void*) %2.data(), size);
-      </inject-code>
+      <inject-code class="target" position="beginning" file="../glue/qtopengl.cpp" snippet="qglbuffer-write"/>
     </modify-function>
   </object-type>
 
-- 
cgit v1.2.3