From ad69024a695a459e2953f477d90a64004c818ff5 Mon Sep 17 00:00:00 2001
From: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Date: Thu, 29 Mar 2018 13:38:10 +0200
Subject: Remove white spaces from signature label in XMLs

Change-Id: I2d41bb92335bcbd2300da29b793ce0529e57960a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 .../PySide2/QtCore/typesystem_core_common.xml      | 244 ++++++++---------
 .../PySide2/QtGui/typesystem_gui_common.xml        | 164 +++++------
 sources/pyside2/PySide2/QtHelp/typesystem_help.xml |   2 +-
 .../QtMultimedia/typesystem_multimedia_common.xml  |  42 +--
 .../PySide2/QtNetwork/typesystem_network.xml       |  22 +-
 .../pyside2/PySide2/QtOpenGL/typesystem_opengl.xml |  82 +++---
 .../QtPrintSupport/typesystem_printsupport.xml     |   2 +-
 sources/pyside2/PySide2/QtQml/typesystem_qml.xml   |   8 +-
 .../pyside2/PySide2/QtQuick/typesystem_quick.xml   |   2 +-
 sources/pyside2/PySide2/QtSql/typesystem_sql.xml   |   8 +-
 sources/pyside2/PySide2/QtSvg/typesystem_svg.xml   |   4 +-
 sources/pyside2/PySide2/QtTest/typesystem_test.xml |  22 +-
 .../PySide2/QtUiTools/typesystem_uitools.xml       |  12 +-
 .../QtWebKitWidgets/typesystem_webkitwidgets.xml   |   6 +-
 .../QtWidgets/typesystem_widgets_common.xml        | 302 ++++++++++-----------
 .../PySide2/QtWidgets/typesystem_widgets_mac.xml   |   2 +-
 sources/pyside2/PySide2/QtXml/typesystem_xml.xml   |  16 +-
 .../QtXmlPatterns/typesystem_xmlpatterns.xml       |   6 +-
 18 files changed, 473 insertions(+), 473 deletions(-)

(limited to 'sources/pyside2')

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index e4d16b2d3..6db3691a6 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -69,7 +69,7 @@
     <function signature="qIsNull(double)" />
     <!-- Qt5: gone <function signature="qRound(qreal)" /> -->
     <function signature="qTan(qreal)" since="4.6" />
-    <function signature="qtTrId(const char *, int)" since="4.6" />
+    <function signature="qtTrId(const char*,int)" since="4.6" />
     <function signature="qVersion()" />
     <function signature="qrand()" />
     <function signature="qsrand(uint)" />
@@ -895,7 +895,7 @@
     <enum-type name="AlignmentFlag" flags="Alignment" />
     <enum-type name="AnchorPoint" since="4.6" />
     <enum-type name="ApplicationAttribute"/>
-    <enum-type name="ApplicationState" flags="ApplicationStates" since="5.1"/> 
+    <enum-type name="ApplicationState" flags="ApplicationStates" since="5.1"/>
     <enum-type name="ArrowType"/>
     <enum-type name="AspectRatioMode"/>
     <enum-type name="Axis"/>
@@ -979,9 +979,9 @@
     <enum-type name="CursorMoveStyle" since="4.8" revision="4800"/>
 
    <!--### These functions are part of QtGui, not QtCore -->
-    <modify-function signature="codecForHtml(const QByteArray &amp;)" remove="all"/>
-    <modify-function signature="mightBeRichText(const QString &amp;)" remove="all"/>
-    <modify-function signature="convertFromPlainText(const QString &amp;, Qt::WhiteSpaceMode)" remove="all"/>
+    <modify-function signature="codecForHtml(const QByteArray&amp;)" remove="all"/>
+    <modify-function signature="mightBeRichText(const QString&amp;)" remove="all"/>
+    <modify-function signature="convertFromPlainText(const QString&amp;,Qt::WhiteSpaceMode)" remove="all"/>
     <!--### -->
   </namespace-type>
 
@@ -1188,7 +1188,7 @@
             </insert-template>
         </inject-code>
     </add-function>
-    <modify-function signature="intersect(QLineF, QPointF*)const">
+    <modify-function signature="intersect(QLineF,QPointF*)const">
         <modify-argument index="2">
             <remove-argument />
         </modify-argument>
@@ -1228,7 +1228,7 @@
     %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
     </template>
 
-    <modify-function signature="unregisterResource(const uchar*, const QString&amp;)" rename="unregisterResourceData">
+    <modify-function signature="unregisterResource(const uchar*,const QString&amp;)" rename="unregisterResourceData">
       <modify-argument index="1">
         <replace-type modified-type="PyBuffer"/>
       </modify-argument>
@@ -1236,7 +1236,7 @@
         <insert-template name="QResource_registerResource" />
       </inject-code>
     </modify-function>
-    <modify-function signature="registerResource(const uchar*, const QString&amp;)" rename="registerResourceData">
+    <modify-function signature="registerResource(const uchar*,const QString&amp;)" rename="registerResourceData">
       <modify-argument index="1">
         <replace-type modified-type="PyBuffer"/>
       </modify-argument>
@@ -1377,7 +1377,7 @@
       <include file-name="datetime.h" location="global"/>
     </extra-includes>
     <!-- Somewhat internal constructor used to pickle QDateTime -->
-    <add-function signature="QDateTime(int, int, int, int, int, int, int, int)">
+    <add-function signature="QDateTime(int,int,int,int,int,int,int,int)">
         <modify-argument index="8">
           <replace-default-expression with="Qt::LocalTime"/>
         </modify-argument>
@@ -1387,7 +1387,7 @@
             %0 = new %TYPE(date, time, Qt::TimeSpec(%8));
         </inject-code>
     </add-function>
-    <add-function signature="QDateTime(int, int, int, int, int, int)">
+    <add-function signature="QDateTime(int,int,int,int,int,int)">
         <inject-code class="target" position="beginning">
             QDate date(%1, %2, %3);
             QTime time(%4, %5, %6);
@@ -1777,7 +1777,7 @@
         </modify-argument>
     </modify-function>
   </value-type>
-  
+
   <value-type name="QTimeZone">
     <enum-type name="TimeType"/>
     <enum-type name="NameType"/>
@@ -1821,19 +1821,19 @@
     <enum-type name="CurrencySymbolFormat" since="4.8" revision="4800"/>
     <enum-type name="QuotationStyle" since="4.8" revision="4800"/>
     <!--### All those C++ number types have the same representation in Python -->
-    <modify-function signature="toString(qulonglong) const" remove="all"/>
-    <modify-function signature="toString(ushort) const" remove="all"/>
-    <modify-function signature="toString(unsigned int) const" remove="all"/>
+    <modify-function signature="toString(qulonglong)const" remove="all"/>
+    <modify-function signature="toString(ushort)const" remove="all"/>
+    <modify-function signature="toString(unsigned int)const" remove="all"/>
     <!--### -->
     <extra-includes>
       <include file-name="QDate" location="global"/>
     </extra-includes>
-    <modify-function signature="toTime(QString, QLocale::FormatType)const">
+    <modify-function signature="toTime(QString,QLocale::FormatType)const">
         <modify-argument index="2">
             <rename to="format" />
         </modify-argument>
     </modify-function>
-    <modify-function signature="toDate(QString, QLocale::FormatType)const">
+    <modify-function signature="toDate(QString,QLocale::FormatType)const">
         <modify-argument index="2">
             <rename to="format" />
         </modify-argument>
@@ -1990,7 +1990,7 @@
     </modify-function>
     <modify-function signature="relock()" allow-thread="yes" />
     <add-function signature="__enter__()" />
-    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+    <add-function signature="__exit__(PyObject*,PyObject*,PyObject*)">
         <inject-code>
             %CPPSELF.unlock();
         </inject-code>
@@ -2004,7 +2004,7 @@
     </modify-function>
     <modify-function signature="relock()" allow-thread="yes" />
     <add-function signature="__enter__()" />
-    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+    <add-function signature="__exit__(PyObject*,PyObject*,PyObject*)">
         <inject-code>
             %CPPSELF.unlock();
         </inject-code>
@@ -2032,14 +2032,14 @@
   <object-type name="QAbstractItemModel">
     <enum-type name="LayoutChangeHint" />
     <!-- This function was replaced by a added function -->
-    <modify-function signature="createIndex(int, int, void*) const" remove="all"/>
-    <!-- This function is the same as createIndex(int, int, int) const -->
-    <modify-function signature="createIndex(int, int, quintptr)const">
+    <modify-function signature="createIndex(int,int,void*)const" remove="all"/>
+    <!-- This function is the same as createIndex(int, int, int)const -->
+    <modify-function signature="createIndex(int,int,quintptr)const">
         <modify-argument index="3">
             <replace-default-expression with="0" />
         </modify-argument>
     </modify-function>
-    <add-function signature="createIndex(int, int, PyObject*)const" return-type="QModelIndex">
+    <add-function signature="createIndex(int,int,PyObject*)const" return-type="QModelIndex">
         <modify-argument index="1">
             <rename to="row"/>
         </modify-argument>
@@ -2064,13 +2064,13 @@
     <inject-code class="target" position="end">
         qRegisterMetaType&lt;QVector&lt;int&gt; &gt;("QVector&lt;int&gt;");
     </inject-code>
-    <modify-function signature="mimeData(QModelIndexList) const">
+    <modify-function signature="mimeData(QModelIndexList)const">
       <modify-argument index="return">
         <define-ownership class="native" owner="c++"/>
         <define-ownership class="target" owner="default"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="data(const QModelIndex&amp;,int) const">
+    <modify-function signature="data(const QModelIndex&amp;,int)const">
       <modify-argument index="return">
         <define-ownership class="native" owner="c++"/>
       </modify-argument>
@@ -2079,14 +2079,14 @@
   <value-type name="QItemSelection">
     <include file-name="QList" location="global"/>
   </value-type>
-    
+
   <object-type name="QItemSelectionModel">
     <extra-includes>
         <include file-name="QItemSelection" location="global"/>
     </extra-includes>
     <enum-type name="SelectionFlag" flags="SelectionFlags"/>
   </object-type>
- 
+
   <value-type name="QItemSelectionRange" hash-function="qHash">
   </value-type>
   <primitive-type name="QModelIndexList"/>
@@ -2096,7 +2096,7 @@
       <include file-name="QStringList" location="global"/>
       <include file-name="QSize" location="global"/>
     </extra-includes>
-    <modify-function signature="setSourceModel(QAbstractItemModel *)">
+    <modify-function signature="setSourceModel(QAbstractItemModel*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2111,7 +2111,7 @@
       <include file-name="QStringList" location="global"/>
       <include file-name="QSize" location="global"/>
     </extra-includes>
-    <modify-function signature="setSourceModel(QAbstractItemModel *)">
+    <modify-function signature="setSourceModel(QAbstractItemModel*)">
       <modify-argument index="1">
         <reference-count action="set"/>
       </modify-argument>
@@ -2120,7 +2120,7 @@
     <modify-function signature="clear()" remove="all"/>
     <modify-function signature="filterChanged()" remove="all"/>
     <!--### End of obsolete section -->
-  </object-type>  
+  </object-type>
   <!-- QObject is created manually -->
   <object-type name="QObject">
     <extra-includes>
@@ -2128,7 +2128,7 @@
       <include file-name="QCoreApplication" location="global"/>
       <include file-name="signalmanager.h" location="local" />
     </extra-includes>
-    <modify-function signature="metaObject() const">
+    <modify-function signature="metaObject()const">
       <inject-code class="target" position="beginning">
         %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME();
         %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
@@ -2160,7 +2160,7 @@
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <!-- End of Invalidate-after-use fix -->
-    <modify-function signature="parent() const">
+    <modify-function signature="parent()const">
       <modify-argument index="this">
         <parent index="return" action="add"/>
       </modify-argument>
@@ -2173,7 +2173,7 @@
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="connect(const QObject*, const char*, const char *, Qt::ConnectionType) const">
+    <modify-function signature="connect(const QObject*,const char*,const char*,Qt::ConnectionType)const">
         <modify-argument index="4">
             <rename to="type"/>
         </modify-argument>
@@ -2184,7 +2184,7 @@
         </inject-code>
     </modify-function>
     <!-- static version -->
-    <modify-function signature="connect(const QObject*, QMetaMethod, const QObject*, QMetaMethod, Qt::ConnectionType)">
+    <modify-function signature="connect(const QObject*,QMetaMethod,const QObject*,QMetaMethod,Qt::ConnectionType)">
         <modify-argument index="5">
             <rename to="type"/>
         </modify-argument>
@@ -2194,7 +2194,7 @@
         %PYARG_0 = %CONVERTTOPYTHON[bool](%0);
         </inject-code>
     </modify-function>
-    <modify-function signature="connect(const QObject*, const char*, const QObject*, const char *, Qt::ConnectionType)">
+    <modify-function signature="connect(const QObject*,const char*,const QObject*,const char*,Qt::ConnectionType)">
         <modify-argument index="5">
             <rename to="type"/>
         </modify-argument>
@@ -2205,7 +2205,7 @@
         </inject-code>
     </modify-function>
     <inject-code class="native" position="beginning" file="glue/qobject_connect.cpp" />
-    <add-function signature="connect(const QObject*, const char*, PyCallable*, Qt::ConnectionType)" return-type="bool" static="yes">
+    <add-function signature="connect(const QObject*,const char*,PyCallable*,Qt::ConnectionType)" return-type="bool" static="yes">
         <modify-argument index="4">
             <rename to="type"/>
             <replace-default-expression with="Qt::AutoConnection" />
@@ -2217,7 +2217,7 @@
         </inject-code>
     </add-function>
     <!-- static version -->
-    <add-function signature="connect(const char*, PyCallable*, Qt::ConnectionType)" return-type="bool">
+    <add-function signature="connect(const char*,PyCallable*,Qt::ConnectionType)" return-type="bool">
         <modify-argument index="3">
             <rename to="type"/>
             <replace-default-expression with="Qt::AutoConnection" />
@@ -2228,7 +2228,7 @@
         %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
         </inject-code>
     </add-function>
-    <add-function signature="connect(const char*, const QObject*, const char *, Qt::ConnectionType)" return-type="bool">
+    <add-function signature="connect(const char*,const QObject*,const char*,Qt::ConnectionType)" return-type="bool">
         <modify-argument index="4">
             <rename to="type"/>
             <replace-default-expression with="Qt::AutoConnection" />
@@ -2239,21 +2239,21 @@
         %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
         </inject-code>
     </add-function>
-    
-    <add-function signature="emit(const char*, ...)" return-type="bool">
+
+    <add-function signature="emit(const char*,...)" return-type="bool">
         <inject-code class="target" position="beginning">
         %RETURN_TYPE %0 = PySide::SignalManager::instance().emitSignal(%CPPSELF, %1, %PYARG_2);
         %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
         </inject-code>
     </add-function>
-    <add-function signature="disconnect(const char *, PyCallable*)" return-type="bool">
+    <add-function signature="disconnect(const char*,PyCallable*)" return-type="bool">
          <inject-code class="target" position="beginning">
         // %FUNCTION_NAME() - disable generation of function call.
         %RETURN_TYPE %0 = qobjectDisconnectCallback(%CPPSELF, %1, %2);
         %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
         </inject-code>
     </add-function>
-    <add-function signature="disconnect(const QObject*, const char*, PyCallable*)" return-type="bool" static="yes">
+    <add-function signature="disconnect(const QObject*,const char*,PyCallable*)" return-type="bool" static="yes">
          <inject-code class="target" position="beginning">
         // %FUNCTION_NAME() - disable generation of function call.
         %RETURN_TYPE %0 = qobjectDisconnectCallback(%1, %2, %3);
@@ -2263,7 +2263,7 @@
 
 
     <inject-code class="native" file="glue/qobject_findchild.cpp"/>
-    <add-function signature="findChild(PyTypeObject*, const QString&amp;)" return-type="PyObject*">
+    <add-function signature="findChild(PyTypeObject*,const QString&amp;)" return-type="PyObject*">
         <inject-code class="target" position="beginning">
         QObject *child = _findChildHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1);
         %PYARG_0 = %CONVERTTOPYTHON[QObject*](child);
@@ -2275,7 +2275,7 @@
           <replace-default-expression with="QString()" />
       </modify-argument>
     </add-function>
-    <add-function signature="findChildren(PyTypeObject*, const QString&amp;)" return-type="PySequence*" >
+    <add-function signature="findChildren(PyTypeObject*,const QString&amp;)" return-type="PySequence*" >
         <inject-code class="target" position="beginning">
             %PYARG_0 = PyList_New(0);
             _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0);
@@ -2287,7 +2287,7 @@
             <replace-default-expression with="QString()" />
         </modify-argument>
     </add-function>
-    <add-function signature="findChildren(PyTypeObject*, const QRegExp&amp;)" return-type="PySequence*" >
+    <add-function signature="findChildren(PyTypeObject*,const QRegExp&amp;)" return-type="PySequence*" >
         <inject-code class="target" position="beginning">
             %PYARG_0 = PyList_New(0);
             _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0);
@@ -2297,7 +2297,7 @@
         </modify-argument>
     </add-function>
 
-    <add-function signature="tr(const char *, const char *, int)" return-type="QString">
+    <add-function signature="tr(const char*,const char*,int)" return-type="QString">
         <modify-argument index="2">
           <replace-default-expression with="0"/>
         </modify-argument>
@@ -2323,7 +2323,7 @@
         </inject-code>
     </add-function>
 
-   <modify-function signature="receivers(const char*) const">
+   <modify-function signature="receivers(const char*)const">
      <inject-code class="target" position="beginning">
        // Avoid return +1 because SignalManager connect to "destroyed()" signal to control object timelife
        int ret = %CPPSELF.%FUNCTION_NAME(%1);
@@ -2340,14 +2340,14 @@
      </modify-argument>
    </modify-function>
 
-   <modify-function signature="sender() const">
+   <modify-function signature="sender()const">
       <modify-argument index="return">
          <define-ownership owner="default"/>
       </modify-argument>
   </modify-function>
 
    <!-- This is not supported due the lack of information durring the call with no arguments,  this can cause a memory leak -->
-   <modify-function signature="disconnect(const char*, const QObject *, const char *)const">
+   <modify-function signature="disconnect(const char*,const QObject*,const char*)const">
        <modify-argument index="1">
            <remove-default-expression />
        </modify-argument>
@@ -2417,7 +2417,7 @@
             </insert-template>
         </inject-code>
     </add-function>
-    <add-function signature="replace(QString, QString)" return-type="QString">
+    <add-function signature="replace(QString,QString)" return-type="QString">
         <modify-argument index="1">
             <rename to="sourceString"/>
         </modify-argument>
@@ -2529,7 +2529,7 @@
     <modify-function signature="startsWith(const char*)const" remove="all" />
     <modify-function signature="operator==(QString)const" remove="all" />
     <modify-function signature="operator==(const char*,QByteArray)" remove="all" />
-    <modify-function signature="operator==(QByteArray, const char*)" remove="all" />
+    <modify-function signature="operator==(QByteArray,const char*)" remove="all" />
     <modify-function signature="operator>(QString)const" remove="all" />
     <modify-function signature="operator>(const char*,QByteArray)" remove="all" />
     <modify-function signature="operator>(QByteArray,const char*)" remove="all" />
@@ -2561,7 +2561,7 @@
             }
         </inject-code>
     </add-function>
-    <add-function signature="operator+(PyUnicode, QByteArray)">
+    <add-function signature="operator+(PyUnicode,QByteArray)">
         <inject-code>
             Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(%PYARG_1));
             if (!str.isNull()) {
@@ -2571,7 +2571,7 @@
             }
         </inject-code>
     </add-function>
-    <add-function signature="operator+(PyBytes, QByteArray)">
+    <add-function signature="operator+(PyBytes,QByteArray)">
         <inject-code>
         QByteArray ba = QByteArray(PyBytes_AS_STRING(%PYARG_1), PyBytes_GET_SIZE(%PYARG_1)) + *%CPPSELF;
         %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba);
@@ -2603,7 +2603,7 @@
             </insert-template>
         </inject-code>
     </add-function>
-    <modify-function signature="QByteArray(const char *, int)">
+    <modify-function signature="QByteArray(const char*,int)">
         <!-- Keep \x00 bytes passed in python strings -->
         <inject-code class="target" position="beginning">
             if (PyBytes_Check(%PYARG_1)) {
@@ -2663,8 +2663,8 @@
 
     <!--### -->
 
-    <modify-function signature="operator const char *()const" remove="all"/>
-    <modify-function signature="operator const void *()const" remove="all"/>
+    <modify-function signature="operator const char*()const" remove="all"/>
+    <modify-function signature="operator const void*()const" remove="all"/>
 
     <!--### STL compatibility functions not supported by PySide -->
     <modify-function signature="push_back(char)" remove="all"/>
@@ -2675,7 +2675,7 @@
     <modify-function signature="push_front(const char*)" remove="all"/>
     <!--### -->
 
-    <modify-function signature="toLong(bool*, int) const">
+    <modify-function signature="toLong(bool*,int)const">
       <modify-argument index="1">
         <remove-argument/>
       </modify-argument>
@@ -2683,7 +2683,7 @@
         <insert-template name="fix_bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="toLongLong(bool*, int) const">
+    <modify-function signature="toLongLong(bool*,int)const">
       <modify-argument index="1">
         <remove-argument/>
       </modify-argument>
@@ -2691,7 +2691,7 @@
         <insert-template name="fix_bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="toShort(bool*, int) const">
+    <modify-function signature="toShort(bool*,int)const">
       <modify-argument index="1">
         <remove-argument/>
       </modify-argument>
@@ -2699,7 +2699,7 @@
         <insert-template name="fix_bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="toUInt(bool*, int) const">
+    <modify-function signature="toUInt(bool*,int)const">
       <modify-argument index="1">
         <remove-argument/>
       </modify-argument>
@@ -2707,7 +2707,7 @@
         <insert-template name="fix_bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="toULong(bool*, int) const">
+    <modify-function signature="toULong(bool*,int)const">
       <modify-argument index="1">
         <remove-argument/>
       </modify-argument>
@@ -2715,7 +2715,7 @@
         <insert-template name="fix_bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="toULongLong(bool*, int) const">
+    <modify-function signature="toULongLong(bool*,int)const">
       <modify-argument index="1">
         <remove-argument/>
       </modify-argument>
@@ -2828,7 +2828,7 @@
       <enum-type name="ProcessEventsFlag" flags="ProcessEventsFlags"/>
       <modify-function signature="exec(QFlags&lt;QEventLoop::ProcessEventsFlag>)" rename="exec_" allow-thread="yes" />
       <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes" />
-      <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>, int)" allow-thread="yes" />
+      <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>,int)" allow-thread="yes" />
   </object-type>
   <object-type name="QFileDevice" since="5.0">
     <enum-type name="FileError"/>
@@ -2860,13 +2860,13 @@
   </object-type>
   <object-type name="QFile">
     <modify-function signature="copy(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="copy(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="copy(const QString&amp;,const QString&amp;)" allow-thread="yes"/>
     <modify-function signature="link(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="link(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="link(const QString&amp;,const QString&amp;)" allow-thread="yes"/>
     <modify-function signature="remove()" allow-thread="yes"/>
     <modify-function signature="remove(const QString&amp;)" allow-thread="yes"/>
     <modify-function signature="rename(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="rename(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="rename(const QString&amp;,const QString&amp;)" allow-thread="yes"/>
   </object-type>
   <object-type name="QSaveFile"/>
   <object-type name="QFileSelector" />
@@ -2882,13 +2882,13 @@
     <modify-function signature="waitForReadyRead(int)" allow-thread="yes"/>
     <modify-function signature="waitForBytesWritten(int)" allow-thread="yes"/>
     <!-- ### peek(qint64) do the job -->
-    <modify-function signature="peek(char*, qint64)" remove="all"/>
+    <modify-function signature="peek(char*,qint64)" remove="all"/>
     <!-- ### read(qint64) do the job -->
-    <modify-function signature="read(char*, qint64)" remove="all"/>
+    <modify-function signature="read(char*,qint64)" remove="all"/>
     <!-- ### readLine(qint64) do the job -->
-    <modify-function signature="readLine(char*, qint64)" remove="all"/>
+    <modify-function signature="readLine(char*,qint64)" remove="all"/>
     <!-- ### write(str) do the job -->
-    <modify-function signature="write(const char*, qint64)" remove="all"/>
+    <modify-function signature="write(const char*,qint64)" remove="all"/>
     <modify-function signature="write(const char*)" remove="all"/>
     <modify-function signature="getChar(char*)">
         <modify-argument index="1">
@@ -2899,7 +2899,7 @@
             <insert-template name="fix_char*" />
         </inject-code>
     </modify-function>
-    <modify-function signature="readData(char*, qint64)">
+    <modify-function signature="readData(char*,qint64)">
         <inject-code class="target">
             QByteArray ba;
             ba.resize(%2);
@@ -2923,7 +2923,7 @@
             </conversion-rule>
         </modify-argument>
     </modify-function>
-    <modify-function signature="readLineData(char*, qint64)">
+    <modify-function signature="readLineData(char*,qint64)">
         <inject-code class="target">
             QByteArray ba;
             ba.resize(%2);
@@ -2969,13 +2969,13 @@
         </modify-argument>
     </modify-function>
     <modify-function signature="relock()" allow-thread="yes"/>
-    <modify-function signature="mutex() const">
+    <modify-function signature="mutex()const">
       <modify-argument index="return">
         <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <add-function signature="__enter__()" />
-    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+    <add-function signature="__exit__(PyObject*,PyObject*,PyObject*)">
         <inject-code>
             %CPPSELF.unlock();
         </inject-code>
@@ -2995,12 +2995,12 @@
   </object-type>
   <object-type name="QSemaphore">
     <modify-function signature="acquire(int)" allow-thread="yes"/>
-    <modify-function signature="tryAcquire(int, int)" allow-thread="yes"/>
+    <modify-function signature="tryAcquire(int,int)" allow-thread="yes"/>
   </object-type>
 
   <object-type name="QSocketNotifier">
     <enum-type name="Type"/>
-    <add-function signature="QSocketNotifier(PyObject*, QSocketNotifier::Type, QObject*)">
+    <add-function signature="QSocketNotifier(PyObject*,QSocketNotifier::Type,QObject*)">
         <modify-argument index="3">
             <replace-default-expression with="0" />
             <rename to="parent" />
@@ -3075,7 +3075,7 @@
     <enum-type name="State"/>
   </object-type>
   <object-type name="QTranslator">
-    <modify-function signature="load(const uchar*, int, QString)">
+    <modify-function signature="load(const uchar*,int,QString)">
         <modify-argument index="1">
             <replace-type modified-type="PyBuffer" />
         </modify-argument>
@@ -3091,8 +3091,8 @@
     </modify-function>
   </object-type>
   <object-type name="QWaitCondition">
-    <modify-function signature="wait(QMutex*, unsigned long)" allow-thread="yes"/>
-    <modify-function signature="wait(QReadWriteLock*, unsigned long)" allow-thread="yes"/>
+    <modify-function signature="wait(QMutex*,unsigned long)" allow-thread="yes"/>
+    <modify-function signature="wait(QReadWriteLock*,unsigned long)" allow-thread="yes"/>
   </object-type>
   <object-type name="QFileSystemWatcher">
     <extra-includes>
@@ -3131,7 +3131,7 @@
         timer->start(%1);
       </inject-code>
     </modify-function>
-    <add-function signature="singleShot(int, PyCallable*)" static="yes">
+    <add-function signature="singleShot(int,PyCallable*)" static="yes">
         <inject-code class="target" position="beginning">
         // %FUNCTION_NAME() - disable generation of c++ function call
         Shiboken::AutoDecRef emptyTuple(PyTuple_New(0));
@@ -3142,7 +3142,7 @@
 
         if (PyObject_TypeCheck(%2, &amp;PySideSignalInstanceType)) {
             PySideSignalInstance *signalInstance = reinterpret_cast&lt;PySideSignalInstance*&gt;(%2);
-            Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s", PySide::Signal::getSignature(signalInstance)));
+            Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s",PySide::Signal::getSignature(signalInstance)));
             Shiboken::AutoDecRef result(
                 PyObject_CallMethod(pyTimer,
                                     const_cast&lt;char*&gt;("connect"),
@@ -3183,7 +3183,7 @@
     <modify-function signature="waitForFinished(int)" allow-thread="yes"/>
     <modify-function signature="readAllStandardOutput()" allow-thread="yes"/>
     <modify-function signature="readAllStandardError()" allow-thread="yes"/>
-    <modify-function signature="execute(QString, QStringList)" allow-thread="yes"/>
+    <modify-function signature="execute(QString,QStringList)" allow-thread="yes"/>
     <modify-function signature="execute(QString)" allow-thread="yes"/>
     <modify-function signature="startDetached(QString,QStringList,QString,qint64*)">
         <modify-argument index="4">
@@ -3201,7 +3201,7 @@
         </inject-code>
     </modify-function>
     <!-- Function removed because on windows it returns a win32 specific structure -->
-    <modify-function signature="pid() const" remove="all" />
+    <modify-function signature="pid()const" remove="all" />
     <add-function signature="pid()" return-type="long">
         <inject-code>
             long result;
@@ -3257,11 +3257,11 @@
         </inject-code>
     </add-function>
     <!-- blocking functions -->
-    <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;, int)" allow-thread="yes"/>
+    <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;,int)" allow-thread="yes"/>
     <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;)" allow-thread="yes"/>
     <modify-function signature="flush()" allow-thread="yes"/>
-    <modify-function signature="sendEvent(QObject*, QEvent*)" allow-thread="yes"/>
-    <modify-function signature="sendPostedEvents(QObject*, int)" allow-thread="yes"/>
+    <modify-function signature="sendEvent(QObject*,QEvent*)" allow-thread="yes"/>
+    <modify-function signature="sendPostedEvents(QObject*,int)" allow-thread="yes"/>
     <modify-function signature="instance()">
       <inject-code class="target">
         QCoreApplication *app = QCoreApplication::instance();
@@ -3285,14 +3285,14 @@
     <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes">
       <modify-argument index="2" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="QCoreApplication(int &amp;, char  **, int)" access="private"/>
+    <modify-function signature="QCoreApplication(int &amp;,char **,int)" access="private"/>
     <inject-code class="native" file="glue/qcoreapplication_init.cpp" position="beginning" />
-    <modify-function signature="postEvent(QObject*,QEvent*, int)">
+    <modify-function signature="postEvent(QObject*,QEvent*,int)">
       <modify-argument index="2">
         <define-ownership owner="c++"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="winEventFilter(MSG*, long*)">
+    <modify-function signature="winEventFilter(MSG*,long*)">
       <modify-argument index="2">
         <remove-argument />
         <conversion-rule class="native">
@@ -3334,7 +3334,7 @@
         <define-ownership class="target" owner="default"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="value(const QString&amp;, const QVariant&amp;)const">
+    <modify-function signature="value(const QString&amp;,const QVariant&amp;)const">
         <inject-documentation mode="append" format="target">
             .. warning:: QSettings.value can return different types (QVariant types) depending on the platform it's running on, so the safest way to use it is always casting the result to the desired type, e.g.: int(settings.value("myKey"))
         </inject-documentation>
@@ -3345,7 +3345,7 @@
   </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-function signature="child()const">
       <modify-argument index="return">
          <define-ownership class="target" owner="default"/>
       </modify-argument>
@@ -3620,7 +3620,7 @@
     <!-- Qt5.5: Removed because it expect QString to be mutable -->
     <modify-function signature="readLineInto(QString*,qint64)" since="5.5" remove="all"/>
     <!-- Removed because we use the non-const version -->
-    <modify-function signature="QTextStream(const QByteArray&amp;, QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
+    <modify-function signature="QTextStream(const QByteArray&amp;,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
 
     <!-- Removed because it expect QString to be mutable -->
     <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
@@ -3677,7 +3677,7 @@
   </object-type>
 
   <object-type name="QThreadPool">
-    <modify-function signature="start(QRunnable*, int)">
+    <modify-function signature="start(QRunnable*,int)">
       <modify-argument index="1">
         <parent index="this" action="add" />
       </modify-argument>
@@ -3700,7 +3700,7 @@
     <modify-function signature="pop_back()" remove="all"/>
     <modify-function signature="push_front(QXmlStreamAttribute)" remove="all"/>
     <modify-function signature="pop_front()" remove="all"/>
-    <modify-function signature="toList() const" remove="all"/>
+    <modify-function signature="toList()const" remove="all"/>
     <modify-function signature="fromList(const QList&lt;QXmlStreamAttribute&gt; &amp;)" remove="all"/>
     <modify-function signature="operator+=(QVector&lt;QXmlStreamAttribute&gt;)" remove="all" />
   </value-type>
@@ -3714,7 +3714,7 @@
   </object-type>
   <object-type name="QXmlStreamWriter">
     <!-- Removed because it expect QString to be mutable -->
-    <modify-function signature="QXmlStreamWriter(QString *)" remove="all" />
+    <modify-function signature="QXmlStreamWriter(QString*)" remove="all" />
     <modify-function signature="codec()const">
       <modify-argument index="return">
         <define-ownership class="target" owner="default"/>
@@ -3745,19 +3745,19 @@
   <object-type name="QMessageLogContext">
     <modify-function signature="copy(const QMessageLogContext &amp;)" remove="all" />
   </object-type>
-  
+
   <value-type name="QMetaMethod">
     <enum-type name="Access"/>
     <enum-type name="MethodType"/>
     <!-- This isn't part of Qt public API -->
     <modify-function signature="attributes()const" remove="all" />
-    <modify-function signature="getParameterTypes(int *) const" remove="all" />
+    <modify-function signature="getParameterTypes(int*)const" remove="all" />
   </value-type>
   <object-type name="QMetaObject">
     <enum-type name="Call"/>
     <include file-name="qobjectdefs.h" location="global" />
     <!-- This isn't part of Qt public API -->
-    <modify-function signature="connect(const QObject*, int, const QObject*, int, int, int*)" remove="all" />
+    <modify-function signature="connect(const QObject*,int,const QObject*,int,int,int*)" remove="all" />
   </object-type>
   <object-type name="QMetaObject::Connection">
     <include file-name="qobjectdefs.h" location="global" />
@@ -3772,7 +3772,7 @@
   </value-type>
 
   <value-type name="QMetaEnum">
-    <modify-function signature="keyToValue(const char*, bool*) const" allow-thread="yes">
+    <modify-function signature="keyToValue(const char*,bool*)const" allow-thread="yes">
         <modify-argument index="2">
             <remove-argument />
         </modify-argument>
@@ -3783,7 +3783,7 @@
             <insert-template name="fix_args,bool*"/>
         </inject-code>
     </modify-function>
-    <modify-function signature="keysToValue(const char*, bool*) const" allow-thread="yes">
+    <modify-function signature="keysToValue(const char*,bool*)const" allow-thread="yes">
         <modify-argument index="2">
             <remove-argument />
         </modify-argument>
@@ -3809,7 +3809,7 @@
   </object-type>
 
   <object-type name="QAbstractState" since="4.6">
-    <modify-function signature="machine() const">
+    <modify-function signature="machine()const">
         <modify-argument index="this">
             <parent index="return" action="add"/>
         </modify-argument>
@@ -3843,13 +3843,13 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="targetState() const">
+    <modify-function signature="targetState()const">
       <modify-argument index="return">
         <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="targetStates() const">
+    <modify-function signature="targetStates()const">
       <modify-argument index="return">
         <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" />
       </modify-argument>
@@ -3870,7 +3870,7 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="insertAnimation(int, QAbstractAnimation*)">
+    <modify-function signature="insertAnimation(int,QAbstractAnimation*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -3961,7 +3961,7 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="QEventTransition(QObject*, QEvent::Type, QState*)">
+    <modify-function signature="QEventTransition(QObject*,QEvent::Type,QState*)">
       <modify-argument index="3">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -4010,7 +4010,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
   <object-type name="QSequentialAnimationGroup" since="4.6"/>
 
   <object-type name="QSignalTransition" since="4.6">
-    <add-function signature="QSignalTransition(PyObject*, QState*)" return-type="QSignalTransition*">
+    <add-function signature="QSignalTransition(PyObject*,QState*)" return-type="QSignalTransition*">
         <modify-argument index="2">
             <replace-default-expression with="0" />
         </modify-argument>
@@ -4020,9 +4020,9 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
                 Shiboken::AutoDecRef obType(PyObject_Type(dataSource));
                 QObject* sender = %CONVERTTOCPP[QObject*](dataSource);
                 if (sender) {
-                    const char *dataSignature = PySide::Signal::getSignature((PySideSignalInstance*)%PYARG_1);
+                    const char*dataSignature = PySide::Signal::getSignature((PySideSignalInstance*)%PYARG_1);
                     QByteArray signature(dataSignature); // Append SIGNAL flag (2)
-                    %0 = new QSignalTransitionWrapper(sender, "2" + signature, %2);
+                    %0 = new QSignalTransitionWrapper(sender,"2" + signature,%2);
                 }
             }
         </inject-code>
@@ -4038,7 +4038,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addTransition(const QObject*, const char*, QAbstractState*)">
+    <modify-function signature="addTransition(const QObject*,const char*,QAbstractState*)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -4062,7 +4062,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
     <!-- FIXME: the proper signature for this added function would be something like
          addTransition(PySide2.QtCore.Signal, QAbstractState*)
          but that depends on bug #362. -->
-    <add-function signature="addTransition(PyObject*, QAbstractState*)" return-type="QSignalTransition*">
+    <add-function signature="addTransition(PyObject*,QAbstractState*)" return-type="QSignalTransition*">
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -4075,7 +4075,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
           goto Sbk_%TYPEFunc_%FUNCTION_NAME_TypeError;
       PySideSignalInstance *signalInstance = reinterpret_cast&lt;PySideSignalInstance*&gt;(%1);
       QObject* sender = %CONVERTTOCPP[QObject*](PySide::Signal::getObject(signalInstance));
-      QSignalTransition *%0 = %CPPSELF->%FUNCTION_NAME(sender, PySide::Signal::getSignature(signalInstance), %2);
+      QSignalTransition*%0 = %CPPSELF->%FUNCTION_NAME(sender,PySide::Signal::getSignature(signalInstance),%2);
       %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%0);
       </inject-code>
     </add-function>
@@ -4094,12 +4094,12 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
     <value-type name="SignalEvent" since="4.6"/>
     <value-type name="WrappedEvent" since="4.6"/>
 
-    <modify-function signature="addState(QAbstractState *)">
+    <modify-function signature="addState(QAbstractState*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="removeState(QAbstractState *)">
+    <modify-function signature="removeState(QAbstractState*)">
       <modify-argument index="1">
         <parent index="this" action="remove"/>
       </modify-argument>
@@ -4117,7 +4117,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
     </add-function>
 
     <!-- Replaced by a added function -->
-    <modify-function signature="defaultAnimations() const" remove="all"/>
+    <modify-function signature="defaultAnimations()const" remove="all"/>
     <add-function signature="defaultAnimations()" return-type="list of QAbstractAnimation" >
         <inject-code class="target" position="beginning">
             %PYARG_0 = PyList_New(0);
@@ -4144,13 +4144,13 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
 
   <add-function signature="SIGNAL(const char*)" return-type="str">
     <inject-code class="target" position="beginning">
-      %PYARG_0 = Shiboken::String::fromFormat("2%s", QMetaObject::normalizedSignature(%1).constData());
+      %PYARG_0 = Shiboken::String::fromFormat("2%s",QMetaObject::normalizedSignature(%1).constData());
     </inject-code>
   </add-function>
 
   <add-function signature="SLOT(const char*)" return-type="str">
     <inject-code class="target" position="beginning">
-      %PYARG_0 = Shiboken::String::fromFormat("1%s", QMetaObject::normalizedSignature(%1).constData());
+      %PYARG_0 = Shiboken::String::fromFormat("1%s",QMetaObject::normalizedSignature(%1).constData());
     </inject-code>
   </add-function>
 
@@ -4164,12 +4164,12 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
       <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
     </inject-code>
   </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP(PyObject, PyObject)" return-type="PyObject*">
+  <add-function signature="QT_TRANSLATE_NOOP(PyObject,PyObject)" return-type="PyObject*">
     <inject-code class="target" position="beginning">
       <insert-template name="return_argument"><replace from="#" to="2" /></insert-template>
     </inject-code>
   </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP3(PyObject, PyObject, PyObject)" return-type="PyObject*">
+  <add-function signature="QT_TRANSLATE_NOOP3(PyObject,PyObject,PyObject)" return-type="PyObject*">
     <inject-code class="target" position="beginning">
       <insert-template name="return_argument"><replace from="#" to="2" /></insert-template>
     </inject-code>
@@ -4193,7 +4193,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
                             const unsigned char *,
                             const unsigned char *);
   </inject-code>
-  <add-function signature="qRegisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool">
+  <add-function signature="qRegisterResourceData(int,PyBytes,PyBytes,PyBytes)" return-type="bool">
     <inject-code class="target" position="beginning">
         %RETURN_TYPE %0 = %FUNCTION_NAME(%1, reinterpret_cast&lt;uchar*&gt;(PyBytes_AS_STRING(%PYARG_2)),
                                              reinterpret_cast&lt;uchar*&gt;(PyBytes_AS_STRING(%PYARG_3)),
@@ -4201,7 +4201,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
         %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
     </inject-code>
   </add-function>
-  <add-function signature="qUnregisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool">
+  <add-function signature="qUnregisterResourceData(int,PyBytes,PyBytes,PyBytes)" return-type="bool">
     <inject-code class="target" position="beginning">
         %RETURN_TYPE %0 = %FUNCTION_NAME(%1, reinterpret_cast&lt;uchar*&gt;(PyBytes_AS_STRING(%PYARG_2)),
                                              reinterpret_cast&lt;uchar*&gt;(PyBytes_AS_STRING(%PYARG_3)),
@@ -4222,7 +4222,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
   <suppress-warning text="visibility of function '*' modified in class '*'"/>
   <suppress-warning text="hiding of function '*' in class '*'"/>
   <suppress-warning text="namespace '*' does not have a type entry"/>
-  <suppress-warning text="Shadowing: QObject::parent() const and QAbstractItemModel::parent() const"/>
+  <suppress-warning text="Shadowing: QObject::parent()const and QAbstractItemModel::parent() const"/>
   <suppress-warning text="namespace '*' for enum 'QtMsgType' is not declared"/>
   <suppress-warning text="horribly broken type 'imaxdiv_t'"/>
   <suppress-warning text="horribly broken type '__off64_t'"/>
@@ -4250,8 +4250,8 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
   <suppress-warning text="signature 'winEventFilter(MSG*,long*)' for function modification in 'QCoreApplication' not found. Possible candidates:*"/>
 
   <!-- this is necessary to avoid warning on other modules -->
-  <suppress-warning text="signature 'operator*(QByteArray,const char*)' for function modification in 'QByteArray' not found. Possible candidates: *"/>
-  <suppress-warning text="signature 'operator+(QByteArray,QString)' for function modification in 'QByteArray' not found. Possible candidates: *"/>
+  <suppress-warning text="signature 'operator*(QByteArray,const char*)' for function modification in 'QByteArray' not found. Possible candidates:*"/>
+  <suppress-warning text="signature 'operator+(QByteArray,QString)' for function modification in 'QByteArray' not found. Possible candidates:*"/>
 
   <!-- This enum is intenaly used -->
   <suppress-warning text="enum 'PM_CbaIconHeight' does not have a type entry or is not an enum" />
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 0c43fde1f..976380cda 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -275,7 +275,7 @@
         <insert-template name="fix_bool*"/>
       </inject-code>
     </modify-function>
-    <add-function signature="quadToQuad(QPolygonF&amp;, QPolygonF&amp;)" return-type="PyObject*" static="true">
+    <add-function signature="quadToQuad(QPolygonF&amp;,QPolygonF&amp;)" return-type="PyObject*" static="true">
       <inject-code>
         QTransform _result;
         if (QTransform::quadToQuad(%1, %2, _result)) {
@@ -407,7 +407,7 @@
         </inject-code>
     </add-function>
 
-    <modify-function signature="operator[](uint) const" remove="all"/>
+    <modify-function signature="operator[](uint)const" remove="all"/>
     <add-function signature="__getitem__">
         <inject-code class="target" position="beginning">
             if (_i &lt; 0 || _i >= %CPPSELF.count()) {
@@ -423,12 +423,12 @@
     <modify-function signature="operator QVariant()const" remove="all"/>
   </value-type>
   <value-type name="QPicture" >
-    <modify-function signature="load(QIODevice*, const char*)" allow-thread="yes"/>
-    <modify-function signature="load(const QString&amp;, const char*)" allow-thread="yes"/>
-    <modify-function signature="save(QIODevice*, const char*)" allow-thread="yes"/>
-    <modify-function signature="save(const QString&amp;, const char*)" allow-thread="yes"/>
+    <modify-function signature="load(QIODevice*,const char*)" allow-thread="yes"/>
+    <modify-function signature="load(const QString&amp;,const char*)" allow-thread="yes"/>
+    <modify-function signature="save(QIODevice*,const char*)" allow-thread="yes"/>
+    <modify-function signature="save(const QString&amp;,const char*)" allow-thread="yes"/>
     <!-- See bug 759 -->
-    <modify-function signature="data() const">
+    <modify-function signature="data()const">
         <modify-argument index="return">
             <replace-type modified-type="PyObject"/>
         </modify-argument>
@@ -462,7 +462,7 @@
     <modify-function signature="operator&amp;=(QRect)" remove="all"/>
     <!-- ### -->
   </value-type>
-  
+
   <value-type name="QTextBlock">
     <value-type name="iterator" >
       <include file-name="QTextBlock" location="global"/>
@@ -500,7 +500,7 @@
             }
         </inject-code>
     </modify-function>
-    <modify-function signature="userData() const">
+    <modify-function signature="userData()const">
         <modify-argument index="return">
             <define-ownership class="target" owner="default"/>
         </modify-argument>
@@ -555,7 +555,7 @@
     </add-function>
 
     <!-- ### "QPolygon(int, const int*)" is an internal constructor. -->
-    <modify-function signature="QPolygon(int, const int *)" remove="all"/>
+    <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"/>
     <modify-function signature="operator&lt;&lt;(QPoint)">
@@ -590,7 +590,7 @@
   <value-type name="QIcon" >
     <enum-type name="Mode"/>
     <enum-type name="State"/>
-    <modify-function signature="QIcon(QIconEngine *)">
+    <modify-function signature="QIcon(QIconEngine*)">
       <modify-argument index="1">
         <no-null-pointer/>
         <parent index="this" action="add"/>
@@ -646,7 +646,7 @@
 
     <!-- ### Operator ! doesn't make sense in Python. -->
     <modify-function signature="operator!()const" remove="all"/>
- 
+
     <modify-function signature="loadFromData(const uchar*,uint,const char*,QFlags&lt;Qt::ImageConversionFlag&gt;)">
       <modify-argument index="1">
         <replace-type modified-type="PyBytes"/>
@@ -713,7 +713,7 @@
       </modify-argument>
     </modify-function>
   </value-type>
-  
+
   <!-- Qt5: this _should_ be obsolete, but QImage is still using it... -->
   <value-type name="QMatrix">
     <extra-includes>
@@ -794,7 +794,7 @@
     <extra-includes>
       <include file-name="QStringList" location="global"/>
     </extra-includes>
-    <modify-function signature="setStyleHint(QFont::StyleHint, QFont::StyleStrategy)">
+    <modify-function signature="setStyleHint(QFont::StyleHint,QFont::StyleStrategy)">
       <modify-argument index="2">
         <rename to="strategy"/>
       </modify-argument>
@@ -823,7 +823,7 @@
         uchar *ptr = reinterpret_cast&lt;uchar*&gt;(Shiboken::Buffer::getPointer(%PYARG_1));
         %0 = new %TYPE(ptr, %ARGS);
     </template>
-    <modify-function signature="QImage(uchar *,int,int,int,QImage::Format,QImageCleanupFunction, void *)">
+    <modify-function signature="QImage(uchar*,int,int,int,QImage::Format,QImageCleanupFunction,void*)">
         <modify-argument index="1">
             <replace-type modified-type="PyBuffer"/>
         </modify-argument>
@@ -833,7 +833,7 @@
             </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="QImage(uchar*,int,int,QImage::Format,QImageCleanupFunction, void *)">
+    <modify-function signature="QImage(uchar*,int,int,QImage::Format,QImageCleanupFunction,void*)">
         <modify-argument index="1">
             <replace-type modified-type="PyBuffer"/>
         </modify-argument>
@@ -860,8 +860,8 @@
     </add-function>
 
     <!-- The non-const versions are already used -->
-    <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format,QImageCleanupFunction, void *)" remove="all"/>
-    <modify-function signature="QImage(const uchar*,int,int,QImage::Format,QImageCleanupFunction, void *)" remove="all" />
+    <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format,QImageCleanupFunction,void*)" remove="all"/>
+    <modify-function signature="QImage(const uchar*,int,int,QImage::Format,QImageCleanupFunction,void*)" remove="all" />
     <!-- ### -->
 
     <modify-function signature="QImage(const char*[])">
@@ -1575,44 +1575,44 @@
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
 
-    <modify-function signature="appendColumn(const QList&lt;QStandardItem *&gt; &amp;)">
+    <modify-function signature="appendColumn(const QList&lt;QStandardItem*&gt; &amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="appendRow(const QList&lt;QStandardItem *&gt; &amp;)">
+    <modify-function signature="appendRow(const QList&lt;QStandardItem*&gt; &amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="appendRow(QStandardItem *)">
+    <modify-function signature="appendRow(QStandardItem*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="appendRows(const QList&lt;QStandardItem *&gt; &amp;)">
+    <modify-function signature="appendRows(const QList&lt;QStandardItem*&gt; &amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="insertColumn(int, const QList&lt;QStandardItem *&gt; &amp;)">
+    <modify-function signature="insertColumn(int,const QList&lt;QStandardItem*&gt; &amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertRow(int, const QList&lt;QStandardItem *&gt; &amp;)">
+    <modify-function signature="insertRow(int,const QList&lt;QStandardItem*&gt; &amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertRows(int, const QList&lt;QStandardItem *&gt; &amp;)">
+    <modify-function signature="insertRows(int,const QList&lt;QStandardItem*&gt; &amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="setChild(int, int, QStandardItem *)">
+    <modify-function signature="setChild(int,int,QStandardItem*)">
       <inject-code class="target" position="beginning">
         // Clear parent from the old child
         QStandardItem *_i = %CPPSELF->child(%1, %2);
@@ -1625,7 +1625,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setChild(int, QStandardItem *)">
+    <modify-function signature="setChild(int,QStandardItem*)">
       <inject-code class="target" position="beginning">
         // Clear parent from the old child
         QStandardItem *_i = %CPPSELF->child(%1);
@@ -1639,13 +1639,13 @@
       </modify-argument>
     </modify-function>
 
-     <modify-function signature="takeChild(int, int)">
+     <modify-function signature="takeChild(int,int)">
       <modify-argument index="return">
         <parent index="this" action="remove"/>
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="clone() const">
+    <modify-function signature="clone()const">
       <modify-argument index="return">
         <define-ownership class="native" owner="c++"/>
         <define-ownership class="target" owner="target"/>
@@ -1666,7 +1666,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="document() const">
+    <modify-function signature="document()const">
       <modify-argument index="this">
         <parent index="return" action="add"/>
       </modify-argument>
@@ -1737,7 +1737,7 @@
         <insert-template name="return_QString"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="validate(QString &amp;, int &amp;)const">
+    <modify-function signature="validate(QString &amp;,int &amp;)const">
       <modify-argument index="return">
         <replace-type modified-type="PyObject"/>
         <conversion-rule class="native">
@@ -1759,7 +1759,7 @@
   <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragLeave"/>
   <object-type name="QDragMoveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragMove" />
   <object-type name="QDropEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Drop">
-    <modify-function signature="source() const">
+    <modify-function signature="source()const">
       <modify-argument index="return">
         <define-ownership class="target" owner="default" />
       </modify-argument>
@@ -1911,12 +1911,12 @@
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="source() const">
+    <modify-function signature="source()const">
       <modify-argument index="return">
         <define-ownership owner="target"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="target() const">
+    <modify-function signature="target()const">
       <modify-argument index="return">
         <define-ownership owner="target"/>
       </modify-argument>
@@ -1928,7 +1928,7 @@
       </modify-argument>
     </modify-function>
     <modify-function signature="exec(QFlags&lt;Qt::DropAction&gt;)" rename="exec_" allow-thread="yes"/>
-    <modify-function signature="exec(QFlags&lt;Qt::DropAction&gt;, Qt::DropAction)" rename="exec_" allow-thread="yes"/>
+    <modify-function signature="exec(QFlags&lt;Qt::DropAction&gt;,Qt::DropAction)" rename="exec_" allow-thread="yes"/>
   </object-type>
 
   <object-type name="QStandardItemModel" polymorphic-id-expression="qobject_cast&lt;QStandardItemModel*&gt;(%1)">
@@ -1951,32 +1951,32 @@
         <parent index="this" action="remove" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="verticalHeaderItem(int) const">
+    <modify-function signature="verticalHeaderItem(int)const">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="horizontalHeaderItem(int) const">
+    <modify-function signature="horizontalHeaderItem(int)const">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="invisibleRootItem() const">
+    <modify-function signature="invisibleRootItem()const">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="item(int, int) const">
+    <modify-function signature="item(int,int)const">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="itemFromIndex(const QModelIndex&amp;) const">
+    <modify-function signature="itemFromIndex(const QModelIndex&amp;)const">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="itemPrototype() const">
+    <modify-function signature="itemPrototype()const">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
@@ -1993,18 +1993,18 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="insertRow(int, QStandardItem*)">
+    <modify-function signature="insertRow(int,QStandardItem*)">
       <modify-argument index="2">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="setHorizontalHeaderItem(int, QStandardItem*)">
+    <modify-function signature="setHorizontalHeaderItem(int,QStandardItem*)">
       <modify-argument index="2">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="setItem(int, int, QStandardItem*)">
+    <modify-function signature="setItem(int,int,QStandardItem*)">
       <inject-code class="target" position="beginning">
         // Clear parent from the old child
         QStandardItem *_i = %CPPSELF->item(%1, %2);
@@ -2017,7 +2017,7 @@
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="setItem(int, QStandardItem*)">
+    <modify-function signature="setItem(int,QStandardItem*)">
       <inject-code class="target" position="beginning">
         // Clear parent from the old child
         QStandardItem *_i = %CPPSELF->item(%1);
@@ -2036,7 +2036,7 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="setVerticalHeaderItem(int, QStandardItem*)">
+    <modify-function signature="setVerticalHeaderItem(int,QStandardItem*)">
       <inject-code class="target" position="beginning">
         // Clear parent from the old child
         QStandardItem *_i = %CPPSELF->verticalHeaderItem(%1);
@@ -2062,19 +2062,19 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="findItems(const QString&amp;, QFlags&lt;Qt::MatchFlag&gt;, int) const">
+    <modify-function signature="findItems(const QString&amp;,QFlags&lt;Qt::MatchFlag&gt;,int)const">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="insertColumn(int, const QList&lt;QStandardItem*&gt;&amp;)">
+    <modify-function signature="insertColumn(int,const QList&lt;QStandardItem*&gt;&amp;)">
       <modify-argument index="2">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="insertRow(int, const QList&lt;QStandardItem*&gt;&amp;)">
+    <modify-function signature="insertRow(int,const QList&lt;QStandardItem*&gt;&amp;)">
       <modify-argument index="2">
         <parent index="this" action="add" />
       </modify-argument>
@@ -2110,7 +2110,7 @@
       <include file-name="QPixmap" location="global"/>
     </extra-includes>
     <enum-type name="Mode" />
-    <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)">
+    <modify-function signature="setMimeData(QMimeData*,QClipboard::Mode)">
       <modify-argument index="1">
         <!-- TODO: maybe this is not the best solution -->
         <parent index="this" action="add"/>
@@ -2219,7 +2219,7 @@
     </value-type>
 
     <!-- ### "drawText(...)" is an internal method. -->
-    <modify-function signature="drawText(const QPointF&amp;, const QString&amp;, int, int)" remove="all"/>
+    <modify-function signature="drawText(const QPointF&amp;,const QString&amp;,int,int)" remove="all"/>
 
     <template name="qpainter_drawlist">
         %BEGIN_ALLOW_THREADS
@@ -2227,67 +2227,67 @@
         %END_ALLOW_THREADS
     </template>
 
-    <modify-function signature="drawConvexPolygon(const QPoint*, int)" remove="all" />
+    <modify-function signature="drawConvexPolygon(const QPoint*,int)" remove="all" />
     <add-function signature="drawConvexPolygon(QVector&lt;QPoint>)">
         <inject-code>
             <insert-template name="qpainter_drawlist" />
         </inject-code>
     </add-function>
-    <modify-function signature="drawConvexPolygon(const QPointF*, int)" remove="all" />
+    <modify-function signature="drawConvexPolygon(const QPointF*,int)" remove="all" />
     <add-function signature="drawConvexPolygon(QVector&lt;QPointF>)">
         <inject-code>
             <insert-template name="qpainter_drawlist" />
         </inject-code>
     </add-function>
     <!-- ### Overloads using QVector<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" />
-    <modify-function signature="drawLines(const QPointF*, int)" remove="all" />
-    <modify-function signature="drawRects(const QRect*, int)" remove="all" />
-    <modify-function signature="drawRects(const QRectF*, int)" remove="all" />
+    <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" />
+    <modify-function signature="drawLines(const QPointF*,int)" remove="all" />
+    <modify-function signature="drawRects(const QRect*,int)" remove="all" />
+    <modify-function signature="drawRects(const QRectF*,int)" remove="all" />
     <!-- ### -->
-    <modify-function signature="drawPoints(const QPoint*, int)" remove="all" />
+    <modify-function signature="drawPoints(const QPoint*,int)" remove="all" />
     <add-function signature="drawPoints(QVector&lt;QPoint>)">
         <inject-code>
             <insert-template name="qpainter_drawlist" />
         </inject-code>
     </add-function>
-    <modify-function signature="drawPoints(const QPointF*, int)" remove="all" />
+    <modify-function signature="drawPoints(const QPointF*,int)" remove="all" />
     <add-function signature="drawPoints(QVector&lt;QPointF>)">
         <inject-code>
             <insert-template name="qpainter_drawlist" />
         </inject-code>
     </add-function>
-    <modify-function signature="drawPolygon(const QPoint*, int, Qt::FillRule)" remove="all" />
-    <add-function signature="drawPolygon(QVector&lt;QPoint>, Qt::FillRule)">
+    <modify-function signature="drawPolygon(const QPoint*,int,Qt::FillRule)" remove="all" />
+    <add-function signature="drawPolygon(QVector&lt;QPoint>,Qt::FillRule)">
         <inject-code>
             %BEGIN_ALLOW_THREADS
             %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2);
             %END_ALLOW_THREADS
         </inject-code>
     </add-function>
-    <modify-function signature="drawPolygon(const QPointF*, int, Qt::FillRule)" remove="all" />
-    <add-function signature="drawPolygon(QVector&lt;QPointF>, Qt::FillRule)">
+    <modify-function signature="drawPolygon(const QPointF*,int,Qt::FillRule)" remove="all" />
+    <add-function signature="drawPolygon(QVector&lt;QPointF>,Qt::FillRule)">
         <inject-code>
             %BEGIN_ALLOW_THREADS
             %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2);
             %END_ALLOW_THREADS
         </inject-code>
     </add-function>
-    <modify-function signature="drawPolyline(const QPoint*, int)" remove="all" />
+    <modify-function signature="drawPolyline(const QPoint*,int)" remove="all" />
     <add-function signature="drawPolyline(QVector&lt;QPoint>)">
         <inject-code>
             <insert-template name="qpainter_drawlist" />
         </inject-code>
     </add-function>
-    <modify-function signature="drawPolyline(const QPointF*, int)" remove="all" />
+    <modify-function signature="drawPolyline(const QPointF*,int)" remove="all" />
     <add-function signature="drawPolyline(QVector&lt;QPointF>)">
         <inject-code>
             <insert-template name="qpainter_drawlist" />
         </inject-code>
     </add-function>
-    <modify-function signature="drawRoundRect(int, int, int, int, int, int)">
+    <modify-function signature="drawRoundRect(int,int,int,int,int,int)">
       <modify-argument index="5">
         <rename to="xRound"/>
       </modify-argument>
@@ -2295,7 +2295,7 @@
         <rename to="yRound"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="drawTiledPixmap(const QRect&amp;,const QPixmap&amp;, const QPoint&amp;)">
+    <modify-function signature="drawTiledPixmap(const QRect&amp;,const QPixmap&amp;,const QPoint&amp;)">
       <modify-argument index="3">
         <rename to="pos"/>
       </modify-argument>
@@ -2310,7 +2310,7 @@
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setRedirected(const QPaintDevice*, QPaintDevice*, const QPoint&amp;)">
+    <modify-function signature="setRedirected(const QPaintDevice*,QPaintDevice*,const QPoint&amp;)">
       <modify-argument index="1">
         <no-null-pointer/>
       </modify-argument>
@@ -3004,7 +3004,7 @@
         </insert-template>
       </inject-code>
     </modify-function>
-    <modify-function signature="copyDataTo(float *) const">
+    <modify-function signature="copyDataTo(float*)const">
       <modify-argument index="1">
         <remove-argument/>
       </modify-argument>
@@ -3035,11 +3035,11 @@
     </modify-function>
 
     <!-- ### "constData() const" and "data() const" are unnecessary in Python and their function is performed by "data()". -->
-    <modify-function signature="data() const" remove="all"/>
-    <modify-function signature="constData() const" remove="all"/>
+    <modify-function signature="data()const" remove="all"/>
+    <modify-function signature="constData()const" remove="all"/>
     <!-- ### -->
-    <modify-function signature="operator()(int, int) const" remove="all"/>
-    <modify-function signature="operator()(int, int)" remove="all"/>
+    <modify-function signature="operator()(int,int)const" remove="all"/>
+    <modify-function signature="operator()(int,int)" remove="all"/>
     <add-function signature="__mgetitem__" return-type="PyObject*">
        <inject-code>
          if (PySequence_Check(_key)) {
@@ -3082,9 +3082,9 @@
     </add-function>
 
     <!-- Qt5.5: XXX support the output variables! For now, I just suppressed the new methods. -->
-    <modify-function signature="getAxisAndAngle(float *, float *, float *, float *) const" since="5.5" remove="all" />
-    <modify-function signature="getAxisAndAngle(QVector3D *, float *) const" since="5.5" remove="all" />
-    <modify-function signature="getEulerAngles(float *, float *, float *) const" since="5.5" remove="all" />
+    <modify-function signature="getAxisAndAngle(float*,float*,float*,float*)const" since="5.5" remove="all" />
+    <modify-function signature="getAxisAndAngle(QVector3D*,float*)const" since="5.5" remove="all" />
+    <modify-function signature="getEulerAngles(float*,float*,float*)const" since="5.5" remove="all" />
   </value-type>
 
   <object-type name="QTouchEvent" since="4.6">
@@ -3202,7 +3202,7 @@
     This seems to be a related problem with unnamed structures in shiboken.
   -->
   <suppress-warning text="enum 'QMatrix4x4::enum_1' is specified in typesystem, but not declared"/>
-    
+
   <object-type name="QSessionManager">
     <extra-includes>
     </extra-includes>
@@ -3315,7 +3315,7 @@
       <modify-function signature="glDeleteSamplers(int,const unsigned int*)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
-      <modify-function signature="glDeleteTransformFeedbacks(int,const unsigned int *)">
+      <modify-function signature="glDeleteTransformFeedbacks(int,const unsigned int*)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
       <modify-function signature="glDeleteVertexArrays(int,const unsigned int*)">
@@ -3633,13 +3633,13 @@
       <modify-function signature="setUniformValueArray(int,const unsigned int*,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
-      <modify-function signature="setUniformValueArray(const char*,const float *,int,int)">
+      <modify-function signature="setUniformValueArray(const char*,const float*,int,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
       <modify-function signature="setUniformValueArray(const char*,const int*,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
-      <modify-function signature="setUniformValueArray(const char *,const unsigned int*,int)">
+      <modify-function signature="setUniformValueArray(const char*,const unsigned int*,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
   </object-type>
diff --git a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml
index 6bd5dd364..bcaa5fee3 100644
--- a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml
+++ b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml
@@ -44,7 +44,7 @@
     <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" />
 
     <value-type name="QHelpContentItem">
-      <modify-function signature="parent() const">
+      <modify-function signature="parent()const">
         <modify-argument index="return">
           <define-ownership owner="default"/>
         </modify-argument>
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index 8058954a1..ea34e0b02 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -59,9 +59,9 @@
   <object-type name="QAbstractVideoBuffer">
       <enum-type name="HandleType"/>
       <enum-type name="MapMode"/>
-      <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)" remove="all"/>
+      <modify-function signature="map(QAbstractVideoBuffer::MapMode,int*,int*)" remove="all"/>
       <!-- TODO: discuss a way to have this working with the virtual method.
-      <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)">
+      <modify-function signature="map(QAbstractVideoBuffer::MapMode,int*,int*)">
           <modify-argument index="0">
               <replace-type modified-type="PyObject"/>
           </modify-argument>
@@ -87,7 +87,7 @@
       <enum-type name="FieldType"/>
       <enum-type name="PixelFormat"/>
       <modify-function signature="bits(int)" remove="all"/>
-      <modify-function signature="bits(int) const" remove="all"/>
+      <modify-function signature="bits(int)const" remove="all"/>
   </value-type>
 
   <value-type name="QAudioBuffer"/>
@@ -108,7 +108,7 @@
         <define-ownership class="target" owner="c++"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="start(QIODevice *)">
+    <modify-function signature="start(QIODevice*)">
       <modify-argument index="1">
         <define-ownership class="target" owner="c++"/>
       </modify-argument>
@@ -121,7 +121,7 @@
         <define-ownership class="target" owner="c++"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="start(QIODevice *)">
+    <modify-function signature="start(QIODevice*)">
       <modify-argument index="1">
         <define-ownership class="target" owner="c++"/>
       </modify-argument>
@@ -132,7 +132,7 @@
   <object-type name="QAudioProbe"/>
   <value-type name="QAudioEncoderSettings"/>
   <object-type name="QAudioEncoderSettingsControl">
-      <modify-function signature="supportedSampleRates(const QAudioEncoderSettings &amp;, bool *) const" remove="all"/>
+      <modify-function signature="supportedSampleRates(const QAudioEncoderSettings &amp;,bool*)const" remove="all"/>
   </object-type>
 
   <object-type name="QAudioInput">
@@ -175,7 +175,7 @@
       <enum-type name="Position"/>
       <enum-type name="State"/>
       <enum-type name="Status"/>
-      <modify-function signature="setViewfinder(QVideoWidget *)">
+      <modify-function signature="setViewfinder(QVideoWidget*)">
         <modify-argument index="1">
             <replace-type modified-type="QObject *" />
         </modify-argument>
@@ -186,7 +186,7 @@
         %END_ALLOW_THREADS
         </inject-code>
       </modify-function>
-      <modify-function signature="setViewfinder(QGraphicsVideoItem *)">
+      <modify-function signature="setViewfinder(QGraphicsVideoItem*)">
         <modify-argument index="1">
             <replace-type modified-type="QObject *" />
         </modify-argument>
@@ -208,14 +208,14 @@
       <enum-type name="FlashMode" flags="FlashModes"/>
       <enum-type name="ExposureMode"/>
       <enum-type name="MeteringMode"/>
-      <modify-function signature="supportedApertures(bool *) const" remove="all"/>
-      <modify-function signature="supportedIsoSensitivities(bool *) const" remove="all"/>
-      <modify-function signature="supportedShutterSpeeds(bool *) const" remove="all"/>
+      <modify-function signature="supportedApertures(bool*)const" remove="all"/>
+      <modify-function signature="supportedIsoSensitivities(bool*)const" remove="all"/>
+      <modify-function signature="supportedShutterSpeeds(bool*)const" remove="all"/>
   </object-type>
   -->
   <object-type name="QCameraExposureControl">
       <enum-type name="ExposureParameter"/>
-      <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter, bool *) const" remove="all"/>
+      <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter,bool*)const" remove="all"/>
   </object-type>
   <value-type name="QCameraFocusZone">
       <enum-type name="FocusZoneStatus"/>
@@ -232,7 +232,7 @@
       <enum-type name="CaptureDestination" flags="CaptureDestinations"/>
       <enum-type name="DriveMode"/>
       <enum-type name="Error"/>
-      <modify-function signature="supportedResolutions(const QImageEncoderSettings &amp;, bool *) const" remove="all"/>
+      <modify-function signature="supportedResolutions(const QImageEncoderSettings &amp;,bool*)const" remove="all"/>
   </object-type>
   <object-type name="QCameraImageCaptureControl"/>
   <!-- Private destructor
@@ -254,7 +254,7 @@
 
   <value-type name="QImageEncoderSettings"/>
   <object-type name="QImageEncoderControl">
-      <modify-function signature="supportedResolutions(const QImageEncoderSettings &amp;, bool *) const" remove="all"/>
+      <modify-function signature="supportedResolutions(const QImageEncoderSettings &amp;,bool*)const" remove="all"/>
   </object-type>
 
   <object-type name="QMediaAudioProbeControl"/>
@@ -274,7 +274,7 @@
       <enum-type name="MediaStatus"/>
       <enum-type name="Flag" flags="Flags"/>
       <enum-type name="Error"/>
-      <modify-function signature="setVideoOutput(QVideoWidget *)">
+      <modify-function signature="setVideoOutput(QVideoWidget*)">
         <modify-argument index="1">
             <replace-type modified-type="QObject *" />
         </modify-argument>
@@ -285,7 +285,7 @@
         %END_ALLOW_THREADS
         </inject-code>
       </modify-function>
-      <modify-function signature="setVideoOutput(QGraphicsVideoItem *)">
+      <modify-function signature="setVideoOutput(QGraphicsVideoItem*)">
         <modify-argument index="1">
             <replace-type modified-type="QObject *" />
         </modify-argument>
@@ -306,9 +306,9 @@
       <enum-type name="Error"/>
       <enum-type name="State"/>
       <enum-type name="Status"/>
-      <modify-function signature="supportedAudioSampleRates(const QAudioEncoderSettings &amp;, bool *) const" remove="all"/>
-      <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &amp;, bool *) const" remove="all"/>
-      <modify-function signature="supportedResolutions(const QVideoEncoderSettings &amp;, bool *) const" remove="all"/>
+      <modify-function signature="supportedAudioSampleRates(const QAudioEncoderSettings &amp;,bool*)const" remove="all"/>
+      <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &amp;,bool*)const" remove="all"/>
+      <modify-function signature="supportedResolutions(const QVideoEncoderSettings &amp;,bool*)const" remove="all"/>
   </object-type>
   <object-type name="QMediaRecorderControl"/>
   <value-type name="QMediaResource"/>
@@ -345,8 +345,8 @@
   <object-type name="QVideoDeviceSelectorControl"/>
   <value-type name="QVideoEncoderSettings"/>
   <object-type name="QVideoEncoderSettingsControl">
-      <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &amp;, bool *) const" remove="all"/>
-      <modify-function signature="supportedResolutions(const QVideoEncoderSettings &amp;, bool *) const" remove="all"/>
+      <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &amp;,bool*)const" remove="all"/>
+      <modify-function signature="supportedResolutions(const QVideoEncoderSettings &amp;,bool*)const" remove="all"/>
   </object-type>
   <object-type name="QVideoFilterRunnable">
       <enum-type name="RunFlag" flags="RunFlags"/>
diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
index 06a402e3c..5378d0dfa 100644
--- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
+++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
@@ -64,8 +64,8 @@
         <enum-type name="SocketOption" since="4.6"/>
         <enum-type name="SocketState"/>
         <enum-type name="SocketType"/>
-        <modify-function signature="connectToHost(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>, QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" />
-        <modify-function signature="connectToHost(const QHostAddress&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
+        <modify-function signature="connectToHost(const QString&amp;,quint16,QFlags&lt;QIODevice::OpenModeFlag>,QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" />
+        <modify-function signature="connectToHost(const QHostAddress&amp;,quint16,QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
         <modify-function signature="disconnectFromHost()" allow-thread="yes" />
         <modify-function signature="waitForConnected(int)" allow-thread="yes" />
         <modify-function signature="waitForDisconnected(int)" allow-thread="yes" />
@@ -91,7 +91,7 @@
     </object-type>
     <object-type name="QTcpSocket"/>
     <object-type name="QUdpSocket">
-        <modify-function signature="readDatagram(char*, qint64, QHostAddress*, quint16*)" allow-thread="yes">
+        <modify-function signature="readDatagram(char*,qint64,QHostAddress*,quint16*)" allow-thread="yes">
             <modify-argument index="1">
                 <remove-argument/>
             </modify-argument>
@@ -120,7 +120,7 @@
             PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[quint16](port));
             </inject-code>
         </modify-function>
-        <modify-function signature="writeDatagram(const QByteArray&amp;, const QHostAddress&amp;, quint16)" allow-thread="yes"/>
+        <modify-function signature="writeDatagram(const QByteArray&amp;,const QHostAddress&amp;,quint16)" allow-thread="yes"/>
         <!-- ### writeDatagram(QByteArray, ...) does the trick -->
         <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&amp;,quint16)" remove="all"/>
         <!-- ### -->
@@ -153,18 +153,18 @@
     <object-type name="QNetworkAccessManager">
         <enum-type name="NetworkAccessibility" since="4.7"/>
         <enum-type name="Operation"/>
-        <modify-function signature="createRequest(QNetworkAccessManager::Operation, const QNetworkRequest&amp;, QIODevice *)">
+        <modify-function signature="createRequest(QNetworkAccessManager::Operation,const QNetworkRequest&amp;,QIODevice*)">
           <modify-argument index="3" invalidate-after-use="yes"/>
           <modify-argument index="return">
             <define-ownership class="target" owner="default"/>
           </modify-argument>
         </modify-function>
         <modify-function signature="get(const QNetworkRequest&amp;)" allow-thread="yes"/>
-        <modify-function signature="post(const QNetworkRequest &amp;, QIODevice *)" allow-thread="yes"/>
-        <modify-function signature="post(const QNetworkRequest &amp;, const QByteArray &amp;)" allow-thread="yes"/>
-        <modify-function signature="put(const QNetworkRequest &amp;, QIODevice *)" allow-thread="yes"/>
-        <modify-function signature="put(const QNetworkRequest &amp;, const QByteArray &amp;)" allow-thread="yes"/>
-        <modify-function signature="sendCustomRequest(const QNetworkRequest &amp;, const QByteArray &amp;, QIODevice *)" allow-thread="yes" since="4.7" />
+        <modify-function signature="post(const QNetworkRequest &amp;,QIODevice*)" allow-thread="yes"/>
+        <modify-function signature="post(const QNetworkRequest &amp;,const QByteArray &amp;)" allow-thread="yes"/>
+        <modify-function signature="put(const QNetworkRequest &amp;,QIODevice*)" allow-thread="yes"/>
+        <modify-function signature="put(const QNetworkRequest &amp;,const QByteArray &amp;)" allow-thread="yes"/>
+        <modify-function signature="sendCustomRequest(const QNetworkRequest &amp;,const QByteArray &amp;,QIODevice*)" allow-thread="yes" since="4.7" />
         <modify-function signature="setCookieJar(QNetworkCookieJar*)">
             <modify-argument index="1">
                 <define-ownership class="target" owner="c++"/>
@@ -301,7 +301,7 @@
     <object-type name="QSslSocket">
         <enum-type name="SslMode"/>
         <enum-type name="PeerVerifyMode"/>
-        <modify-function signature="connectToHostEncrypted(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>, QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" />
+        <modify-function signature="connectToHostEncrypted(const QString&amp;,quint16,QFlags&lt;QIODevice::OpenModeFlag>,QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" />
         <modify-function signature="waitForEncrypted(int)" allow-thread="yes" />
     </object-type>
     <!-- The above entries may be present in the system or not. Keep this section organized. -->
diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
index 38cec3188..9b7adb71a 100644
--- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
+++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
@@ -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">
@@ -115,7 +115,7 @@
         <include file-name="QImage" location="global"/>
         <include file-name="QPixmap" location="global"/>
     </extra-includes>
-    <modify-function signature="QGLWidget(QGLContext*, QWidget*, const QGLWidget*, QFlags&lt;Qt::WindowType&gt;)">
+    <modify-function signature="QGLWidget(QGLContext*,QWidget*,const QGLWidget*,QFlags&lt;Qt::WindowType&gt;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -156,7 +156,7 @@
 
   <object-type name="QGLShaderProgram" since="4.6">
     <!-- setAttributeArray -->
-    <modify-function signature="setAttributeArray(int, const QVector2D*, int)" rename="setAttributeArray2D">
+    <modify-function signature="setAttributeArray(int,const QVector2D*,int)" rename="setAttributeArray2D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -169,7 +169,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setAttributeArray(int, const QVector3D*, int)" rename="setAttributeArray3D">
+    <modify-function signature="setAttributeArray(int,const QVector3D*,int)" rename="setAttributeArray3D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -182,7 +182,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setAttributeArray(int, const QVector4D*, int)" rename="setAttributeArray4D">
+    <modify-function signature="setAttributeArray(int,const QVector4D*,int)" rename="setAttributeArray4D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -195,7 +195,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setAttributeArray(const char*, const QVector2D*, int)" rename="setAttributeArray2D">
+    <modify-function signature="setAttributeArray(const char*,const QVector2D*,int)" rename="setAttributeArray2D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -208,7 +208,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setAttributeArray(const char*, const QVector3D*, int)" rename="setAttributeArray3D">
+    <modify-function signature="setAttributeArray(const char*,const QVector3D*,int)" rename="setAttributeArray3D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -221,7 +221,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setAttributeArray(const char*, const QVector4D*, int)" rename="setAttributeArray4D">
+    <modify-function signature="setAttributeArray(const char*,const QVector4D*,int)" rename="setAttributeArray4D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -235,7 +235,7 @@
     </modify-function>
 
     <!-- setUniformValueArray -->
-    <modify-function signature="setUniformValueArray(int, const GLint*, int)" rename="setUniformValueArrayInt">
+    <modify-function signature="setUniformValueArray(int,const GLint*,int)" rename="setUniformValueArrayInt">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -251,7 +251,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const GLuint*, int)" rename="setUniformValueArrayUint">
+    <modify-function signature="setUniformValueArray(int,const GLuint*,int)" rename="setUniformValueArrayUint">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -267,7 +267,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QVector2D*, int)" rename="setUniformValueArray2D">
+    <modify-function signature="setUniformValueArray(int,const QVector2D*,int)" rename="setUniformValueArray2D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -283,7 +283,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QVector3D*, int)" rename="setUniformValueArray3D">
+    <modify-function signature="setUniformValueArray(int,const QVector3D*,int)" rename="setUniformValueArray3D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -299,7 +299,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QVector4D*, int)" rename="setUniformValueArray4D">
+    <modify-function signature="setUniformValueArray(int,const QVector4D*,int)" rename="setUniformValueArray4D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -315,7 +315,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix2x2*, int)" rename="setUniformValueArray2x2">
+    <modify-function signature="setUniformValueArray(int,const QMatrix2x2*,int)" rename="setUniformValueArray2x2">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -331,7 +331,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix2x3*, int)" rename="setUniformValueArray2x3">
+    <modify-function signature="setUniformValueArray(int,const QMatrix2x3*,int)" rename="setUniformValueArray2x3">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -347,7 +347,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix2x4*, int)" rename="setUniformValueArray2x4">
+    <modify-function signature="setUniformValueArray(int,const QMatrix2x4*,int)" rename="setUniformValueArray2x4">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -363,7 +363,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix3x2*, int)" rename="setUniformValueArray3x2">
+    <modify-function signature="setUniformValueArray(int,const QMatrix3x2*,int)" rename="setUniformValueArray3x2">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -379,7 +379,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix3x3*, int)" rename="setUniformValueArray3x3">
+    <modify-function signature="setUniformValueArray(int,const QMatrix3x3*,int)" rename="setUniformValueArray3x3">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -395,7 +395,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix3x4*, int)" rename="setUniformValueArray3x4">
+    <modify-function signature="setUniformValueArray(int,const QMatrix3x4*,int)" rename="setUniformValueArray3x4">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -411,7 +411,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix4x2*, int)" rename="setUniformValueArray4x2">
+    <modify-function signature="setUniformValueArray(int,const QMatrix4x2*,int)" rename="setUniformValueArray4x2">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -427,7 +427,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix4x3*, int)" rename="setUniformValueArray4x3">
+    <modify-function signature="setUniformValueArray(int,const QMatrix4x3*,int)" rename="setUniformValueArray4x3">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -443,7 +443,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(int, const QMatrix4x4*, int)" rename="setUniformValueArray4x4">
+    <modify-function signature="setUniformValueArray(int,const QMatrix4x4*,int)" rename="setUniformValueArray4x4">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -459,7 +459,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const GLint*, int)" rename="setUniformValueArrayInt">
+    <modify-function signature="setUniformValueArray(const char*,const GLint*,int)" rename="setUniformValueArrayInt">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -475,7 +475,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const GLuint*, int)" rename="setUniformValueArrayUint">
+    <modify-function signature="setUniformValueArray(const char*,const GLuint*,int)" rename="setUniformValueArrayUint">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -491,7 +491,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QVector2D*, int)" rename="setUniformValueArray2D">
+    <modify-function signature="setUniformValueArray(const char*,const QVector2D*,int)" rename="setUniformValueArray2D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -507,7 +507,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QVector3D*, int)" rename="setUniformValueArray3D">
+    <modify-function signature="setUniformValueArray(const char*,const QVector3D*,int)" rename="setUniformValueArray3D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -523,7 +523,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QVector4D*, int)" rename="setUniformValueArray4D">
+    <modify-function signature="setUniformValueArray(const char*,const QVector4D*,int)" rename="setUniformValueArray4D">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -539,7 +539,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix2x2*, int)" rename="setUniformValueArray2x2">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix2x2*,int)" rename="setUniformValueArray2x2">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -555,7 +555,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix2x3*, int)" rename="setUniformValueArray2x3">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix2x3*,int)" rename="setUniformValueArray2x3">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -571,7 +571,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix2x4*, int)" rename="setUniformValueArray2x4">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix2x4*,int)" rename="setUniformValueArray2x4">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -587,7 +587,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix3x2*, int)" rename="setUniformValueArray3x2">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix3x2*,int)" rename="setUniformValueArray3x2">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -603,7 +603,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix3x3*, int)" rename="setUniformValueArray3x3">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix3x3*,int)" rename="setUniformValueArray3x3">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -619,7 +619,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix3x4*, int)" rename="setUniformValueArray3x4">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix3x4*,int)" rename="setUniformValueArray3x4">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -635,7 +635,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix4x2*, int)" rename="setUniformValueArray4x2">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix4x2*,int)" rename="setUniformValueArray4x2">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -651,7 +651,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix4x3*, int)" rename="setUniformValueArray4x3">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix4x3*,int)" rename="setUniformValueArray4x3">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -667,7 +667,7 @@
         </inject-code>
     </modify-function>
 
-    <modify-function signature="setUniformValueArray(const char*, const QMatrix4x4*, int)" rename="setUniformValueArray4x4">
+    <modify-function signature="setUniformValueArray(const char*,const QMatrix4x4*,int)" rename="setUniformValueArray4x4">
         <modify-argument index="2" >
             <replace-type modified-type="PySequence" />
         </modify-argument>
@@ -693,8 +693,8 @@
     <!-- ### Use QMatrixZxY overloads -->
     <modify-function signature="setAttributeValue(int,const GLfloat*,int,int)" remove="all" />
     <modify-function signature="setAttributeValue(const char*,const GLfloat*,int,int)" remove="all" />
-    <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>
 
@@ -703,7 +703,7 @@
     <enum-type name="Access" since="4.7"/>
     <enum-type name="Type" since="4.7"/>
     <enum-type name="UsagePattern" since="4.7"/>
-    <modify-function signature="allocate(const void*, int)">
+    <modify-function signature="allocate(const void*,int)">
       <modify-argument index="1">
         <replace-type modified-type="QByteArray&amp;"/>
       </modify-argument>
@@ -730,7 +730,7 @@
         }
       </inject-code>
     </modify-function>
-    <modify-function signature="read(int, void*, int)">
+    <modify-function signature="read(int,void*,int)">
       <modify-argument index="2">
         <remove-argument/>
       </modify-argument>
@@ -749,7 +749,7 @@
         delete[] data;
       </inject-code>
     </modify-function>
-    <modify-function signature="write(int, const void*, int)">
+    <modify-function signature="write(int,const void*,int)">
       <modify-argument index="2">
         <replace-type modified-type="QByteArray&amp;"/>
       </modify-argument>
diff --git a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml
index 24f0de1d8..daf0ed763 100644
--- a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml
+++ b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml
@@ -50,7 +50,7 @@
     <enum-type name="PrintDialogOption" flags="PrintDialogOptions" />
     <enum-type name="PrintRange" />
   </object-type>
-  
+
   <object-type name="QPrintDialog">
     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
   </object-type>
diff --git a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml
index 54431a3af..385383fcc 100644
--- a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml
+++ b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml
@@ -54,7 +54,7 @@
              in generator tests folder. -->
     </primitive-type>
 
-    <add-function signature="qmlRegisterType(PyTypeObject, const char*, int, int, const char*)" return-type="int">
+    <add-function signature="qmlRegisterType(PyTypeObject,const char*,int,int,const char*)" return-type="int">
         <inject-documentation format="target" mode="append">
             This function registers the Python type in the QML system with the name qmlName, in the library imported from uri having the version number composed from versionMajor and versionMinor.
             Returns the QML type id.
@@ -123,7 +123,7 @@
         <enum-type name="ObjectOwnership" />
     </object-type>
     <object-type name="QQmlExpression">
-        <modify-function signature="evaluate(bool *)" allow-thread="yes">
+        <modify-function signature="evaluate(bool*)" allow-thread="yes">
             <modify-argument index="1">
                 <remove-argument />
             </modify-argument>
@@ -181,7 +181,7 @@
     <object-type name="QQmlPropertyMap" />
     <object-type name="QQmlPropertyValueSource" />
     <value-type name="QQmlScriptString">
-        <modify-function signature="numberLiteral(bool *) const" allow-thread="yes">
+        <modify-function signature="numberLiteral(bool*)const" allow-thread="yes">
             <modify-argument index="1">
                 <remove-argument />
             </modify-argument>
@@ -192,7 +192,7 @@
                 <insert-template name="fix_bool*"/>
             </inject-code>
         </modify-function>
-        <modify-function signature="booleanLiteral(bool *) const" allow-thread="yes">
+        <modify-function signature="booleanLiteral(bool*)const" allow-thread="yes">
             <modify-argument index="1">
                 <remove-argument />
             </modify-argument>
diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
index 5183ec798..d9373e86d 100644
--- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
+++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
@@ -70,7 +70,7 @@
         <enum-type name="Flag" flags="Flags" />
         <enum-type name="ItemChange" />
         <enum-type name="TransformOrigin" />
-        <modify-function signature="itemTransform(QQuickItem *, bool *) const" allow-thread="yes">
+        <modify-function signature="itemTransform(QQuickItem*,bool*)const" allow-thread="yes">
             <modify-argument index="2">
                 <remove-argument />
             </modify-argument>
diff --git a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml
index 2699f29d4..2e7222a16 100644
--- a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml
+++ b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml
@@ -71,7 +71,7 @@
     <modify-function signature="commit()" allow-thread="yes" />
     <modify-function signature="rollback()" allow-thread="yes" />
     <modify-function signature="transaction()" allow-thread="yes" />
-    <modify-function signature="registerSqlDriver(const QString &amp;, QSqlDriverCreatorBase*)">
+    <modify-function signature="registerSqlDriver(const QString&amp;,QSqlDriverCreatorBase*)">
       <modify-argument index="2">
         <define-ownership owner="c++"/>
       </modify-argument>
@@ -87,7 +87,7 @@
         <include file-name="QSize" location="global"/>
     </extra-includes>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
-    <modify-function signature="exec(const QString &amp;)" rename="exec_" allow-thread="yes" />
+    <modify-function signature="exec(const QString&amp;)" rename="exec_" allow-thread="yes" />
     <modify-function signature="prepare(const QString&amp;)" allow-thread="yes" />
     <modify-function signature="clear()" allow-thread="yes" />
     <modify-function signature="last()" allow-thread="yes" />
@@ -135,9 +135,9 @@
     <modify-function signature="beginTransaction()" allow-thread="yes" />
     <modify-function signature="commitTransaction()" allow-thread="yes" />
     <modify-function signature="rollbackTransaction()" allow-thread="yes" />
-    <modify-function signature="open(const QString &amp;, const QString&amp;, const QString&amp;, const QString&amp;, int, const QString&amp;)" allow-thread="yes" />
+    <modify-function signature="open(const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,int,const QString&amp;)" allow-thread="yes" />
     <!-- ### This is too low level for Python, and pointer would be useless for the Python programmer -->
-    <modify-function signature="handle() const" remove="all"/>
+    <modify-function signature="handle()const" remove="all"/>
     <!-- ### -->
   </object-type>
 
diff --git a/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml b/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml
index 059abb891..7d11970e7 100644
--- a/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml
+++ b/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml
@@ -52,7 +52,7 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="outputDevice() const">
+    <modify-function signature="outputDevice()const">
       <modify-argument index="return">
           <define-ownership class="target" owner="default"/>
       </modify-argument>
@@ -65,7 +65,7 @@
           <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QGraphicsSvgItem(const QString&amp;, QGraphicsItem*)">
+    <modify-function signature="QGraphicsSvgItem(const QString&amp;,QGraphicsItem*)">
       <modify-argument index="this">
           <parent index="2" action="add"/>
       </modify-argument>
diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml
index c976704b8..ae5e08949 100644
--- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml
+++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml
@@ -79,7 +79,7 @@
 
   <rejection class="QTest" function-name="compare_helper"/>
   <rejection class="QTest" function-name="toPrettyUnicode"/>
-  
+
   <rejection class="QTest" field-name="lastMouseButton"/>
   <rejection class="QTest" field-name="lastMouseTimestamp"/>
 
@@ -88,8 +88,8 @@
       The problem that costed my days of bug hunting is the fact that shiboken gives
       misleading error messages. The messages that I could not get rid of were
 
-    signature 'generateTouchEvent(QWidget*,QTouchDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: 
-    signature 'generateTouchEvent(QWindow*,QTouchDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: 
+    signature 'generateTouchEvent(QWidget*,QTouchDevice*,bool)' for function modification in 'QTest' not found. Possible candidates:
+    signature 'generateTouchEvent(QWindow*,QTouchDevice*,bool)' for function modification in 'QTest' not found. Possible candidates:
 
       I always thought that for some reason the functions were not recognized, or the arguments somehow
       do not match their declaration. Only late in the project, I learnt that also
@@ -114,32 +114,32 @@
 
     <rejection class="QTouchEventSequence"/>
     <object-type name="PySideQTouchEventSequence" target-lang-name="QTouchEventSequence" since="4.6" >
-        <modify-function signature="press(int, const QPoint&amp;, QWidget*)">
+        <modify-function signature="press(int,const QPoint&amp;,QWidget*)">
             <modify-argument index="return">
                 <define-ownership class="target" owner="default"/>
             </modify-argument>
         </modify-function>
-        <modify-function signature="press(int, const QPoint&amp;, QWindow*)">
+        <modify-function signature="press(int,const QPoint&amp;,QWindow*)">
             <modify-argument index="return">
                 <define-ownership class="target" owner="default"/>
             </modify-argument>
         </modify-function>
-        <modify-function signature="move(int, const QPoint&amp;, QWidget*)">
+        <modify-function signature="move(int,const QPoint&amp;,QWidget*)">
             <modify-argument index="return">
                 <define-ownership class="target" owner="default"/>
             </modify-argument>
         </modify-function>
-        <modify-function signature="move(int, const QPoint&amp;, QWindow*)">
+        <modify-function signature="move(int,const QPoint&amp;,QWindow*)">
             <modify-argument index="return">
                 <define-ownership class="target" owner="default"/>
             </modify-argument>
         </modify-function>
-        <modify-function signature="release(int, const QPoint&amp;, QWidget*)">
+        <modify-function signature="release(int,const QPoint&amp;,QWidget*)">
             <modify-argument index="return">
                 <define-ownership class="target" owner="default"/>
             </modify-argument>
         </modify-function>
-        <modify-function signature="release(int, const QPoint&amp;, QWindow*)">
+        <modify-function signature="release(int,const QPoint&amp;,QWindow*)">
             <modify-argument index="return">
                 <define-ownership class="target" owner="default"/>
             </modify-argument>
@@ -150,12 +150,12 @@
             </modify-argument>
         </modify-function>
     </object-type>
-    <modify-function signature="generateTouchEvent(QWidget*, QTouchDevice*, bool)" rename="touchEvent" since="4.6">
+    <modify-function signature="generateTouchEvent(QWidget*,QTouchDevice*,bool)" rename="touchEvent" since="4.6">
         <modify-argument index="return">
             <define-ownership class="target" owner="target"/>
         </modify-argument>
     </modify-function>
-    <modify-function signature="generateTouchEvent(QWindow*, QTouchDevice*, bool)" rename="touchEvent" since="4.6">
+    <modify-function signature="generateTouchEvent(QWindow*,QTouchDevice*,bool)" rename="touchEvent" since="4.6">
         <modify-argument index="return">
             <define-ownership class="target" owner="target"/>
         </modify-argument>
diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
index f6dd0333b..f18b8e818 100644
--- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
+++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
@@ -92,32 +92,32 @@
              %CPPSELF.addPluginPath(""); // force reload widgets
          </inject-code>
       </add-function>
-      <modify-function signature="createAction(QObject*, const QString&amp;)">
+      <modify-function signature="createAction(QObject*,const QString&amp;)">
         <modify-argument index="return">
           <parent index="1" action="add"/>
         </modify-argument>
       </modify-function>
 
-      <modify-function signature="createActionGroup(QObject*, const QString&amp;)">
+      <modify-function signature="createActionGroup(QObject*,const QString&amp;)">
         <modify-argument index="return">
           <parent index="1" action="add"/>
         </modify-argument>
       </modify-function>
 
-      <modify-function signature="createLayout(const QString&amp;, QObject*, const QString&amp;)">
+      <modify-function signature="createLayout(const QString&amp;,QObject*,const QString&amp;)">
         <modify-argument index="return">
           <parent index="2" action="add"/>
         </modify-argument>
       </modify-function>
 
-      <modify-function signature="createWidget(const QString&amp;, QWidget*, const QString&amp;)">
+      <modify-function signature="createWidget(const QString&amp;,QWidget*,const QString&amp;)">
         <modify-argument index="return">
             <parent index="2" action="add"/>
             <define-ownership class="target" owner="default"/>
         </modify-argument>
       </modify-function>
 
-      <modify-function signature="load(QIODevice*, QWidget*)">
+      <modify-function signature="load(QIODevice*,QWidget*)">
         <modify-argument index="2">
           <replace-default-expression with="0" />
           <rename to="parentWidget" />
@@ -132,7 +132,7 @@
      </modify-function>
 
       <!-- Syntax sugar -->
-      <add-function signature="load(QString, QWidget*)" return-type="QWidget*">
+      <add-function signature="load(QString,QWidget*)" return-type="QWidget*">
         <modify-argument index="2">
           <replace-default-expression with="0" />
           <rename to="parentWidget" />
diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
index 0f8d8da4e..3f51bedbf 100644
--- a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
+++ b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
@@ -53,7 +53,7 @@
     <enum-type name="Extension"/>
     <value-type name="Plugin"/>
     <value-type name="MimeType"/>
-    <modify-function signature="create(const QString &amp;, const QUrl &amp;, const QStringList &amp;, const QStringList &amp;) const">
+    <modify-function signature="create(const QString &amp;,const QUrl &amp;,const QStringList &amp;,const QStringList &amp;)const">
         <modify-argument index="return">
             <define-ownership class="native" owner="c++"/>
             <define-ownership class="target" owner="target"/>
@@ -83,7 +83,7 @@
             <reference-count action="set"/>
         </modify-argument>
     </modify-function>
-    <modify-function signature="page() const">
+    <modify-function signature="page()const">
         <modify-argument index="return">
             <define-ownership class="target" owner="default"/>
         </modify-argument>
@@ -162,7 +162,7 @@
     <value-type name="ExtensionReturn" />
     <value-type name="ViewportAttributes" />
 
-    <modify-function signature="extension(QWebPage::Extension, const QWebPage::ExtensionOption*, QWebPage::ExtensionReturn*)">
+    <modify-function signature="extension(QWebPage::Extension,const QWebPage::ExtensionOption*,QWebPage::ExtensionReturn*)">
         <template name="qwebpage_extension_argument_conversion">
         PyObject* %out = 0;
         // Cast the parameters according to the extension type
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 2899be47a..98ffb2af7 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -201,7 +201,7 @@
   <value-type name="QTableWidgetSelectionRange"/>
 
   <value-type name="QTreeWidgetItemIterator" >
-    <modify-function signature="QTreeWidgetItemIterator(QTreeWidget *, QFlags&lt;QTreeWidgetItemIterator::IteratorFlag&gt;)">
+    <modify-function signature="QTreeWidgetItemIterator(QTreeWidget*,QFlags&lt;QTreeWidgetItemIterator::IteratorFlag&gt;)">
         <modify-argument index="this">
             <parent index="1" action="add" />
         </modify-argument>
@@ -270,7 +270,7 @@
         PyObject *userTypeConstant =  PyInt_FromLong(QGraphicsItem::UserType);
         PyDict_SetItemString(Sbk_QGraphicsItem_Type.super.ht_type.tp_dict, "UserType", userTypeConstant);
     </inject-code>
-    <modify-function signature="setParentItem(QGraphicsItem *)">
+    <modify-function signature="setParentItem(QGraphicsItem*)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
@@ -282,7 +282,7 @@
         Shiboken::Object::setParent(pyParent, %PYARG_0);
     }
     </template>
-    <modify-function signature="scene() const">
+    <modify-function signature="scene()const">
         <inject-code position="end">
             <insert-template name="scene_return_parenting"/>
         </inject-code>
@@ -291,7 +291,7 @@
         </modify-argument>
     </modify-function>
 
-    <modify-function signature="parentItem() const">
+    <modify-function signature="parentItem()const">
       <modify-argument index="return">
         <define-ownership owner="target"/>
       </modify-argument>
@@ -299,7 +299,7 @@
         <parent index="return" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="parentWidget() const">
+    <modify-function signature="parentWidget()const">
         <modify-argument index="this">
           <parent index="return" action="add"/>
         </modify-argument>
@@ -435,12 +435,12 @@
         <reference-count action="set"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setItemDelegateForColumn(int, QAbstractItemDelegate*)">
+    <modify-function signature="setItemDelegateForColumn(int,QAbstractItemDelegate*)">
       <modify-argument index="2">
         <reference-count action="set"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setItemDelegateForRow(int, QAbstractItemDelegate*)">
+    <modify-function signature="setItemDelegateForRow(int,QAbstractItemDelegate*)">
       <modify-argument index="2">
         <reference-count action="set"/>
       </modify-argument>
@@ -450,21 +450,21 @@
         <replace-default-expression with="QStyleOptionViewItem()" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="model() const">
+    <modify-function signature="model()const">
       <modify-argument index="return">
         <!-- Defining ownership as "default" avoids the object to be automatically
              set as parent of the returned pointer. -->
         <define-ownership class="target" owner="default"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="selectionModel() const">
+    <modify-function signature="selectionModel()const">
       <modify-argument index="return">
         <!-- Defining ownership as "default" avoids the object to be automatically
              set as parent of the returned pointer. -->
         <define-ownership class="target" owner="default"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setIndexWidget(const QModelIndex &amp;, QWidget *)">
+    <modify-function signature="setIndexWidget(const QModelIndex &amp;,QWidget*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -672,12 +672,12 @@
     </modify-function>
   </object-type>
   <object-type name="QItemEditorCreatorBase">
-    <modify-function signature="createWidget(QWidget *) const">
+    <modify-function signature="createWidget(QWidget*)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
   </object-type>
   <object-type name="QItemEditorFactory">
-      <modify-function signature="registerEditor(int, QItemEditorCreatorBase *)">
+      <modify-function signature="registerEditor(int,QItemEditorCreatorBase*)">
       <modify-argument index="2">
         <reference-count action="set"/>
       </modify-argument>
@@ -685,7 +685,7 @@
         Shiboken::Object::releaseOwnership(%PYARG_2);
       </inject-code>
     </modify-function>
-    <modify-function signature="setDefaultFactory(QItemEditorFactory *)">
+    <modify-function signature="setDefaultFactory(QItemEditorFactory*)">
       <modify-argument index="1">
         <define-ownership owner="c++"/>
       </modify-argument>
@@ -761,7 +761,7 @@
        </inject-code>
    </modify-function>
 
-   <modify-function signature="addDockWidget(Qt::DockWidgetArea, QDockWidget*)">
+   <modify-function signature="addDockWidget(Qt::DockWidgetArea,QDockWidget*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -772,7 +772,7 @@
       </modify-argument>
     </modify-function>
     <!-- this fuction is declared when not defined QT_NO_TOOLBA -->
-    <modify-function signature="addToolBar(Qt::ToolBarArea, QToolBar*)">
+    <modify-function signature="addToolBar(Qt::ToolBarArea,QToolBar*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -809,7 +809,7 @@
     <enum-type name="AreaOption" flags="AreaOptions"/>
     <enum-type name="ViewMode"/>
     <enum-type name="WindowOrder"/>
-    <modify-function signature="addSubWindow(QWidget*, QFlags&lt;Qt::WindowType&gt;)" >
+    <modify-function signature="addSubWindow(QWidget*,QFlags&lt;Qt::WindowType&gt;)" >
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -835,8 +835,8 @@
     <inject-code class="native" position="beginning" file="glue/qmenu_glue.cpp"/>
 
     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
-    <modify-function signature="exec(const QPoint&amp;, QAction*)" rename="exec_" allow-thread="yes" />
-    <modify-function signature="exec(QList&lt;QAction*>, const QPoint&amp;, QAction*, QWidget*)" rename="exec_" allow-thread="yes" />
+    <modify-function signature="exec(const QPoint&amp;,QAction*)" rename="exec_" allow-thread="yes" />
+    <modify-function signature="exec(QList&lt;QAction*>,const QPoint&amp;,QAction*,QWidget*)" rename="exec_" allow-thread="yes" />
     <modify-function signature="addAction(const QString&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
@@ -855,7 +855,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addMenu(const QIcon &amp;, const QString &amp;)">
+    <modify-function signature="addMenu(const QIcon &amp;,const QString &amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -873,7 +873,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addMenu(const QIcon &amp;, const QString &amp;)">
+    <modify-function signature="addMenu(const QIcon &amp;,const QString &amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -881,7 +881,7 @@
     <!-- ### "setNoReplayFor(QWidget*)" is an internal method. -->
     <modify-function signature="setNoReplayFor(QWidget*)" remove="all" />
 
-    <add-function signature="addAction(QString&amp;, PyObject*, QKeySequence&amp;)">
+    <add-function signature="addAction(QString&amp;,PyObject*,QKeySequence&amp;)">
       <modify-argument index="3">
         <replace-default-expression with="0" />
       </modify-argument>
@@ -894,7 +894,7 @@
       </inject-code>
     </add-function>
 
-    <add-function signature="addAction(QIcon&amp;, QString&amp;, PyObject*, QKeySequence&amp;)">
+    <add-function signature="addAction(QIcon&amp;,QString&amp;,PyObject*,QKeySequence&amp;)">
       <modify-argument index="4">
         <replace-default-expression with="0" />
       </modify-argument>
@@ -942,7 +942,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <add-function signature="addAction(const QString&amp;, PyObject*)">
+    <add-function signature="addAction(const QString&amp;,PyObject*)">
       <inject-code class="target" position="beginning">
         %PYARG_0 = addActionWithPyObject(%CPPSELF, %1, %2);
       </inject-code>
@@ -1006,7 +1006,7 @@
   </object-type>
 
   <object-type name="QShortcut">
-    <add-function signature="QShortcut(QKeySequence&amp;, QWidget*, PyCallable*, Qt::ShortcutContext)">
+    <add-function signature="QShortcut(QKeySequence&amp;,QWidget*,PyCallable*,Qt::ShortcutContext)">
       <modify-argument index="4">
         <replace-default-expression with="Qt::WindowShortcut"/>
       </modify-argument>
@@ -1022,22 +1022,22 @@
   </object-type>
   <object-type name="QSpacerItem"/>
   <object-type name="QStatusBar">
-    <modify-function signature="addWidget(QWidget*, int)">
+    <modify-function signature="addWidget(QWidget*,int)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addPermanentWidget(QWidget*, int)">
+    <modify-function signature="addPermanentWidget(QWidget*,int)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertWidget(int, QWidget*, int)">
+    <modify-function signature="insertWidget(int,QWidget*,int)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertPermanentWidget(int, QWidget*, int)">
+    <modify-function signature="insertPermanentWidget(int,QWidget*,int)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -1078,22 +1078,22 @@
   </object-type>
   <object-type name="QTimeEdit"/>
   <object-type name="QToolBox">
-    <modify-function signature="addItem(QWidget*, const QIcon&amp;, const QString&amp;)">
+    <modify-function signature="addItem(QWidget*,const QIcon&amp;,const QString&amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addItem(QWidget*, const QString&amp;)">
+    <modify-function signature="addItem(QWidget*,const QString&amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertItem(int, QWidget*, const QIcon&amp;, const QString&amp;)">
+    <modify-function signature="insertItem(int,QWidget*,const QIcon&amp;,const QString&amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertItem(int, QWidget*, const QString&amp;)">
+    <modify-function signature="insertItem(int,QWidget*,const QString&amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -1110,12 +1110,12 @@
   </object-type>
   <object-type name="QToolButton">
     <enum-type name="ToolButtonPopupMode"/>
-    <modify-function signature="setDefaultAction(QAction *)">
+    <modify-function signature="setDefaultAction(QAction*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setMenu(QMenu *)">
+    <modify-function signature="setMenu(QMenu*)">
     </modify-function>
   </object-type>
   <object-type name="QToolTip"/>
@@ -1150,12 +1150,12 @@
     </modify-function>
   </object-type>
   <object-type name="QUndoStack">
-    <modify-function signature="createUndoAction(QObject*, const QString&amp;)const">
+    <modify-function signature="createUndoAction(QObject*,const QString&amp;)const">
       <modify-argument index="return">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="createRedoAction(QObject*, const QString&amp;)const">
+    <modify-function signature="createRedoAction(QObject*,const QString&amp;)const">
       <modify-argument index="return">
         <parent index="1" action="add"/>
       </modify-argument>
@@ -1167,22 +1167,22 @@
     </modify-function>
   </object-type>
   <object-type name="QUndoView">
-    <modify-function signature="setGroup(QUndoGroup *)">
+    <modify-function signature="setGroup(QUndoGroup*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setStack(QUndoStack *)">
+    <modify-function signature="setStack(QUndoStack*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QUndoView(QUndoGroup *,QWidget *)">
+    <modify-function signature="QUndoView(QUndoGroup*,QWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QUndoView(QUndoStack *,QWidget *)">
+    <modify-function signature="QUndoView(QUndoStack*,QWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -1210,14 +1210,14 @@
   </object-type>
   <object-type name="QGraphicsSceneDragDropEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneDragEnter || %1-&gt;type() == QEvent::GraphicsSceneDragLeave || %1-&gt;type() == QEvent::GraphicsSceneDragMove || %1-&gt;type() == QEvent::GraphicsSceneDrop" >
     <!-- ### "setMimeData(const QMimeData*)" is an internal method. -->
-    <modify-function signature="setMimeData(const QMimeData *)" remove="all"/>
+    <modify-function signature="setMimeData(const QMimeData*)" remove="all"/>
     <!-- ### "setSource(QWidget*)" is an internal method. -->
-    <modify-function signature="setSource(QWidget *)" remove="all"/>
+    <modify-function signature="setSource(QWidget*)" remove="all"/>
     <!-- ### -->
   </object-type>
   <object-type name="QGraphicsSceneEvent" copyable="false">
     <!-- ### "setWidget(QWidget*)" is an internal method. -->
-    <modify-function signature="setWidget(QWidget *)" remove="all"/>
+    <modify-function signature="setWidget(QWidget*)" remove="all"/>
   </object-type>
   <object-type name="QGraphicsSceneMoveEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneMove" />
   <object-type name="QGraphicsSceneResizeEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneResize" />
@@ -1287,7 +1287,7 @@
         <rename to="widget" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="hitTestComplexControl(QStyle::ComplexControl, const QStyleOptionComplex*, const QPoint&amp;, const QWidget*)const">
+    <modify-function signature="hitTestComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,const QPoint&amp;,const QWidget*)const">
       <modify-argument index="4">
         <replace-default-expression with="0"/>
         <rename to="widget" />
@@ -1305,9 +1305,9 @@
   </object-type>
   <object-type name="QColorDialog">
     <enum-type name="ColorDialogOption" flags="ColorDialogOptions"/>
-    <modify-function signature="getColor(const QColor&amp;, QWidget*, const QString&amp;, QFlags&lt;QColorDialog::ColorDialogOption>)" allow-thread="yes" />
+    <modify-function signature="getColor(const QColor&amp;,QWidget*,const QString&amp;,QFlags&lt;QColorDialog::ColorDialogOption>)" allow-thread="yes" />
     <!-- Qt5: obsolete -->
-    <modify-function signature="getRgba(unsigned int, bool*, QWidget*)" remove="all" />
+    <modify-function signature="getRgba(unsigned int,bool*,QWidget*)" remove="all" />
   </object-type>
 
   <object-type name="QLayout">
@@ -1356,12 +1356,12 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="addWidget(QWidget *)">
+    <modify-function signature="addWidget(QWidget*)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
-    <modify-function signature="addChildWidget(QWidget *)">
+    <modify-function signature="addChildWidget(QWidget*)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
@@ -1428,29 +1428,29 @@
 
     <enum-type name="Direction" />
 
-    <modify-function signature="addWidget(QWidget *, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+    <modify-function signature="addWidget(QWidget*,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
 
-    <modify-function signature="addLayout(QLayout *, int)">
+    <modify-function signature="addLayout(QLayout*,int)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
 
-    <modify-function signature="insertWidget(int, QWidget *, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+    <modify-function signature="insertWidget(int,QWidget*,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %2);
       </inject-code>
     </modify-function>
-    <modify-function signature="insertLayout(int, QLayout *, int)">
+    <modify-function signature="insertLayout(int,QLayout*,int)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %2);
       </inject-code>
     </modify-function>
-    <modify-function signature="insertItem(int, QLayoutItem *)">
+    <modify-function signature="insertItem(int,QLayoutItem*)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %2);
       </inject-code>
@@ -1469,7 +1469,7 @@
 
   <object-type name="QGridLayout">
     <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
-    <modify-function signature="itemAtPosition (int, int) const">
+    <modify-function signature="itemAtPosition (int,int)const">
       <modify-argument index="return">
         <define-ownership owner="default"/>
       </modify-argument>
@@ -1477,7 +1477,7 @@
         addLayoutOwnership(%CPPSELF, %0);
       </inject-code>
     </modify-function>
-    <modify-function signature="addWidget(QWidget *, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+    <modify-function signature="addWidget(QWidget*,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
       <modify-argument index="4">
         <rename to="alignment"/>
       </modify-argument>
@@ -1485,7 +1485,7 @@
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
-    <modify-function signature="addWidget(QWidget *, int, int, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+    <modify-function signature="addWidget(QWidget*,int,int,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
       <modify-argument index="6">
         <rename to="alignment"/>
       </modify-argument>
@@ -1493,7 +1493,7 @@
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
-    <modify-function signature="addLayout(QLayout *, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+    <modify-function signature="addLayout(QLayout*,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
       <modify-argument index="4">
         <rename to="alignment"/>
       </modify-argument>
@@ -1501,7 +1501,7 @@
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
-    <modify-function signature="addLayout(QLayout *, int, int, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+    <modify-function signature="addLayout(QLayout*,int,int,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
       <modify-argument index="6">
         <rename to="alignment"/>
       </modify-argument>
@@ -1509,7 +1509,7 @@
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
-    <modify-function signature="addItem(QLayoutItem *, int, int, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+    <modify-function signature="addItem(QLayoutItem*,int,int,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
       <modify-argument index="4">
         <rename to="rowSpan"/>
       </modify-argument>
@@ -1562,7 +1562,7 @@
     <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="setupViewport(QWidget*)" access="non-final"/>
     <modify-function signature="setScene(QGraphicsScene*)">
       <modify-argument index="1">
         <reference-count action="set"/>
@@ -1594,7 +1594,7 @@
     </modify-function>
 
     <!-- TODO: Support conversions on virtual function -->
-    <modify-function signature="drawItems(QPainter*, int, QGraphicsItem*[], const QStyleOptionGraphicsItem[])">
+    <modify-function signature="drawItems(QPainter*,int,QGraphicsItem*[],const QStyleOptionGraphicsItem[])">
         <modify-argument index="2">
             <remove-argument/>
             <conversion-rule class="native">
@@ -1647,7 +1647,7 @@
     <enum-type name="InputDialogOption"/>
     <enum-type name="InputMode"/>
 
-    <modify-function signature="getInt(QWidget*, const QString&amp;, const QString&amp;, int, int, int, int, bool*, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
+    <modify-function signature="getInt(QWidget*,const QString&amp;,const QString&amp;,int,int,int,int,bool*,QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
       <modify-argument index="8">
         <remove-default-expression/>
         <remove-argument/>
@@ -1657,7 +1657,7 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getItem(QWidget*, const QString&amp;, const QString&amp;, const QStringList&amp;, int, bool, bool*, QFlags&lt;Qt::WindowType&gt;,QFlags&lt;Qt::InputMethodHint&gt;)" allow-thread="yes">
+    <modify-function signature="getItem(QWidget*,const QString&amp;,const QString&amp;,const QStringList&amp;,int,bool,bool*,QFlags&lt;Qt::WindowType&gt;,QFlags&lt;Qt::InputMethodHint&gt;)" allow-thread="yes">
       <modify-argument index="7">
         <remove-default-expression/>
         <remove-argument/>
@@ -1667,7 +1667,7 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getMultiLineText(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, bool*, QFlags&lt;Qt::WindowType&gt;, QFlags&lt;Qt::InputMethodHint&gt;)" allow-thread="yes">
+    <modify-function signature="getMultiLineText(QWidget*,const QString&amp;,const QString&amp;,const QString&amp;,bool*,QFlags&lt;Qt::WindowType&gt;,QFlags&lt;Qt::InputMethodHint&gt;)" allow-thread="yes">
       <modify-argument index="5">
         <remove-default-expression/>
         <remove-argument/>
@@ -1677,7 +1677,7 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getText(QWidget*, const QString&amp;, const QString&amp;, QLineEdit::EchoMode, const QString&amp;, bool*, QFlags&lt;Qt::WindowType&gt;,QFlags&lt;Qt::InputMethodHint&gt;)" allow-thread="yes">
+    <modify-function signature="getText(QWidget*,const QString&amp;,const QString&amp;,QLineEdit::EchoMode,const QString&amp;,bool*,QFlags&lt;Qt::WindowType&gt;,QFlags&lt;Qt::InputMethodHint&gt;)" allow-thread="yes">
       <modify-argument index="6">
         <remove-default-expression/>
         <remove-argument/>
@@ -1687,7 +1687,7 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getDouble(QWidget*, const QString&amp;, const QString&amp;, double, double, double, int, bool*, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
+    <modify-function signature="getDouble(QWidget*,const QString&amp;,const QString&amp;,double,double,double,int,bool*,QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
       <modify-argument index="8">
         <remove-default-expression/>
         <remove-argument/>
@@ -1791,29 +1791,29 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addEllipse(const QRectF&amp;, const QPen&amp;, const QBrush&amp;)">
+    <modify-function signature="addEllipse(const QRectF&amp;,const QPen&amp;,const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addEllipse(qreal, qreal, qreal, qreal, const QPen&amp;, const QBrush&amp;)">
+    <modify-function signature="addEllipse(qreal,qreal,qreal,qreal,const QPen&amp;,const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addLine(const QLineF&amp;, const QPen&amp;)">
+    <modify-function signature="addLine(const QLineF&amp;,const QPen&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addLine(qreal, qreal, qreal, qreal, const QPen&amp;)">
+    <modify-function signature="addLine(qreal,qreal,qreal,qreal,const QPen&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addPath(const QPainterPath&amp;, const QPen&amp;, const QBrush&amp;)">
+    <modify-function signature="addPath(const QPainterPath&amp;,const QPen&amp;,const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
@@ -1823,28 +1823,28 @@
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addPolygon(const QPolygonF&amp;, const QPen&amp;, const QBrush&amp;)">
+    <modify-function signature="addPolygon(const QPolygonF&amp;,const QPen&amp;,const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addRect(const QRectF&amp;, const QPen&amp;, const QBrush&amp;)">
+    <modify-function signature="addRect(const QRectF&amp;,const QPen&amp;,const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addRect(qreal, qreal, qreal, qreal, const QPen&amp;, const QBrush&amp;)">
+    <modify-function signature="addRect(qreal,qreal,qreal,qreal,const QPen&amp;,const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addText(const QString&amp;, const QFont&amp;)">
+    <modify-function signature="addText(const QString&amp;,const QFont&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addSimpleText(const QString&amp;, const QFont&amp;)">
+    <modify-function signature="addSimpleText(const QString&amp;,const QFont&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
@@ -1860,7 +1860,7 @@
     </modify-function>
 
     <!-- use glue code -->
-    <modify-function signature="drawItems(QPainter*, int, QGraphicsItem**, const QStyleOptionGraphicsItem*, QWidget *)">
+    <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)">
         <modify-argument index="2">
             <remove-argument/>
         </modify-argument>
@@ -1915,7 +1915,7 @@
     <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="addTopLevelItem(QTreeWidgetItem *)">
+    <modify-function signature="addTopLevelItem(QTreeWidgetItem*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -1930,12 +1930,12 @@
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertTopLevelItem(int, QTreeWidgetItem *)">
+    <modify-function signature="insertTopLevelItem(int,QTreeWidgetItem*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertTopLevelItems(int, const QList&lt;QTreeWidgetItem*&gt; &amp;)">
+    <modify-function signature="insertTopLevelItems(int,const QList&lt;QTreeWidgetItem*&gt; &amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -1992,22 +1992,22 @@
   </object-type>
   <object-type name="QListWidgetItem" >
     <enum-type name="ItemType"/>
-    <modify-function signature="QListWidgetItem(const QString&amp;, QListWidget*, int)">
+    <modify-function signature="QListWidgetItem(const QString&amp;,QListWidget*,int)">
       <modify-argument index="this">
         <parent index="2" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QListWidgetItem(const QIcon&amp;, const QString&amp;, QListWidget*, int)">
+    <modify-function signature="QListWidgetItem(const QIcon&amp;,const QString&amp;,QListWidget*,int)">
       <modify-argument index="this">
         <parent index="3" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QListWidgetItem(QListWidget*, int)">
+    <modify-function signature="QListWidgetItem(QListWidget*,int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="listWidget() const">
+    <modify-function signature="listWidget()const">
       <modify-argument index="return">
         <define-ownership owner="target"/>
       </modify-argument>
@@ -2058,37 +2058,37 @@
     <modify-function signature="write(QDataStream&amp;)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidget*, int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidget*,int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidget*, const QStringList&amp;, int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidget*,const QStringList&amp;,int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidget*, QTreeWidgetItem*, int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidget*,QTreeWidgetItem*,int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*,int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*, const QStringList &amp;, int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*,const QStringList &amp;,int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*, QTreeWidgetItem*, int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*,QTreeWidgetItem*,int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addChild(QTreeWidgetItem *)">
+    <modify-function signature="addChild(QTreeWidgetItem*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2098,12 +2098,12 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertChild(int, QTreeWidgetItem *)">
+    <modify-function signature="insertChild(int,QTreeWidgetItem*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertChildren(int, const QList&lt;QTreeWidgetItem*&gt; &amp;)">
+    <modify-function signature="insertChildren(int,const QList&lt;QTreeWidgetItem*&gt; &amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2123,7 +2123,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="parent() const">
+    <modify-function signature="parent()const">
       <modify-argument index="return">
         <define-ownership class="target" owner="default"/>
       </modify-argument>
@@ -2134,7 +2134,7 @@
             Shiboken::Object::setParent(%PYARG_0, %PYSELF);
       </inject-code>
     </modify-function>
-    <modify-function signature="treeWidget() const">
+    <modify-function signature="treeWidget()const">
       <modify-argument index="return">
         <define-ownership class="target" owner="default"/>
       </modify-argument>
@@ -2148,7 +2148,7 @@
 
   </object-type>
   <object-type name="QListWidget">
-    <modify-function signature="setItemWidget(QListWidgetItem *, QWidget *)">
+    <modify-function signature="setItemWidget(QListWidgetItem*,QWidget*)">
       <modify-argument index="2">
         <parent index="1" action="add"/>
       </modify-argument>
@@ -2158,7 +2158,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertItem(int, QListWidgetItem*)">
+    <modify-function signature="insertItem(int,QListWidgetItem*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2189,7 +2189,7 @@
 
   <object-type name="QWidget">
     <!-- Qt5: remove native event for now -->
-    <modify-function signature="nativeEvent(const QByteArray &amp;, void *, long *)" remove="all" />
+    <modify-function signature="nativeEvent(const QByteArray &amp;,void*,long*)" remove="all" />
 
     <extra-includes>
       <include file-name="QIcon" location="global"/>
@@ -2206,7 +2206,7 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="setParent(QWidget*, QFlags&lt;Qt::WindowType&gt;)">
+    <modify-function signature="setParent(QWidget*,QFlags&lt;Qt::WindowType&gt;)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
@@ -2416,20 +2416,20 @@
             </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="insertAction(QAction*, QAction*)">
+    <modify-function signature="insertAction(QAction*,QAction*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="setLayout(QLayout *)">
+    <modify-function signature="setLayout(QLayout*)">
       <inject-code class="target" position="beginning">
         qwidgetSetLayout(%CPPSELF, %1);
         // %FUNCTION_NAME() - disable generation of function call.
       </inject-code>
     </modify-function>
     <modify-function signature="raise()" rename="raise_" />
-    <modify-function signature="setParent(QWidget*, QFlags&lt;Qt::WindowType>)">
+    <modify-function signature="setParent(QWidget*,QFlags&lt;Qt::WindowType>)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
@@ -2455,26 +2455,26 @@
       <include file-name="QPixmap" location="global"/>
     </extra-includes>
 
-    <modify-function signature="critical(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QMessageBox::StandardButton&gt;, QMessageBox::StandardButton)" allow-thread="yes"/>
-    <modify-function signature="information(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QMessageBox::StandardButton&gt;, QMessageBox::StandardButton)" allow-thread="yes"/>
-    <modify-function signature="question(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QMessageBox::StandardButton&gt;, QMessageBox::StandardButton)" allow-thread="yes"/>
-    <modify-function signature="warning(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QMessageBox::StandardButton&gt;, QMessageBox::StandardButton)" allow-thread="yes"/>
-    <modify-function signature="QMessageBox(const QString&amp;, const QString&amp;, QMessageBox::Icon, int, int, int, QWidget*, QFlags&lt;Qt::WindowType&gt;)" remove="all"/>
-    <modify-function signature="critical(QWidget*, const QString&amp;, const QString&amp;, int, int, int)" remove="all"/>
-    <modify-function signature="critical(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, const QString&amp;, const QString&amp;, int, int)" remove="all"/>
-    <modify-function signature="information(QWidget*, const QString&amp;, const QString&amp;, int, int, int)" remove="all"/>
-    <modify-function signature="information(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, const QString&amp;, const QString&amp;, int, int)" remove="all"/>
-    <modify-function signature="question(QWidget*, const QString&amp;, const QString&amp;, int, int, int)" remove="all"/>
-    <modify-function signature="question(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, const QString&amp;, const QString&amp;, int, int)" remove="all"/>
-    <modify-function signature="warning(QWidget*, const QString&amp;, const QString&amp;, int, int, int)" remove="all"/>
-    <modify-function signature="warning(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, const QString&amp;, const QString&amp;, int, int)" remove="all"/>
+    <modify-function signature="critical(QWidget*,const QString&amp;,const QString&amp;,QFlags&lt;QMessageBox::StandardButton&gt;,QMessageBox::StandardButton)" allow-thread="yes"/>
+    <modify-function signature="information(QWidget*,const QString&amp;,const QString&amp;,QFlags&lt;QMessageBox::StandardButton&gt;,QMessageBox::StandardButton)" allow-thread="yes"/>
+    <modify-function signature="question(QWidget*,const QString&amp;,const QString&amp;,QFlags&lt;QMessageBox::StandardButton&gt;,QMessageBox::StandardButton)" allow-thread="yes"/>
+    <modify-function signature="warning(QWidget*,const QString&amp;,const QString&amp;,QFlags&lt;QMessageBox::StandardButton&gt;,QMessageBox::StandardButton)" allow-thread="yes"/>
+    <modify-function signature="QMessageBox(const QString&amp;,const QString&amp;,QMessageBox::Icon,int,int,int,QWidget*,QFlags&lt;Qt::WindowType&gt;)" remove="all"/>
+    <modify-function signature="critical(QWidget*,const QString&amp;,const QString&amp;,int,int,int)" remove="all"/>
+    <modify-function signature="critical(QWidget*,const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,int,int)" remove="all"/>
+    <modify-function signature="information(QWidget*,const QString&amp;,const QString&amp;,int,int,int)" remove="all"/>
+    <modify-function signature="information(QWidget*,const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,int,int)" remove="all"/>
+    <modify-function signature="question(QWidget*,const QString&amp;,const QString&amp;,int,int,int)" remove="all"/>
+    <modify-function signature="question(QWidget*,const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,int,int)" remove="all"/>
+    <modify-function signature="warning(QWidget*,const QString&amp;,const QString&amp;,int,int,int)" remove="all"/>
+    <modify-function signature="warning(QWidget*,const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,const QString&amp;,int,int)" remove="all"/>
 
   </object-type>
   <object-type name="QAbstractSpinBox">
     <enum-type name="ButtonSymbols"/>
     <enum-type name="CorrectionMode"/>
     <enum-type name="StepEnabledFlag" flags="StepEnabled"/>
-    <modify-function signature="setLineEdit(QLineEdit *)">
+    <modify-function signature="setLineEdit(QLineEdit*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2487,7 +2487,7 @@
         <insert-template name="return_QString"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="validate(QString &amp;, int &amp;)const">
+    <modify-function signature="validate(QString &amp;,int &amp;)const">
       <modify-argument index="return">
         <replace-type modified-type="PyObject"/>
         <conversion-rule class="native">
@@ -2503,27 +2503,27 @@
   <object-type name="QTabWidget">
     <enum-type name="TabPosition"/>
     <enum-type name="TabShape"/>
-    <modify-function signature="addTab(QWidget*, const QString&amp;)">
+    <modify-function signature="addTab(QWidget*,const QString&amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addTab(QWidget*, const QIcon&amp;, const QString&amp;)">
+    <modify-function signature="addTab(QWidget*,const QIcon&amp;,const QString&amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertTab(int, QWidget*, const QIcon&amp;, const QString&amp;)">
+    <modify-function signature="insertTab(int,QWidget*,const QIcon&amp;,const QString&amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertTab(int, QWidget*, const QString&amp;)">
+    <modify-function signature="insertTab(int,QWidget*,const QString&amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setCornerWidget(QWidget*, Qt::Corner)">
+    <modify-function signature="setCornerWidget(QWidget*,Qt::Corner)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2587,13 +2587,13 @@
     </modify-function>
   </object-type>
   <object-type name="QLabel">
-    <modify-function signature="setBuddy(QWidget *)">
+    <modify-function signature="setBuddy(QWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="setMovie(QMovie *)">
+    <modify-function signature="setMovie(QMovie*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2621,9 +2621,9 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="getExistingDirectory(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QFileDialog::Option>)" allow-thread="yes" />
-    <modify-function signature="getExistingDirectoryUrl(QWidget*, const QString&amp;, const QUrl&amp;, QFlags&lt;QFileDialog::Option>, const QStringList&amp;)" />
-    <modify-function signature="getOpenFileName(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
+    <modify-function signature="getExistingDirectory(QWidget*,const QString&amp;,const QString&amp;,QFlags&lt;QFileDialog::Option>)" allow-thread="yes" />
+    <modify-function signature="getExistingDirectoryUrl(QWidget*,const QString&amp;,const QUrl&amp;,QFlags&lt;QFileDialog::Option>,const QStringList&amp;)" />
+    <modify-function signature="getOpenFileName(QWidget*,const QString&amp;,const QString&amp;,const QString&amp;,QString*,QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
       <modify-argument index="return">
         <replace-type modified-type="(fileName, selectedFilter)"/>
       </modify-argument>
@@ -2635,7 +2635,7 @@
         <insert-template name="return_for_QFileDialog"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="getOpenFileNames(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
+    <modify-function signature="getOpenFileNames(QWidget*,const QString&amp;,const QString&amp;,const QString&amp;,QString*,QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
       <modify-argument index="return">
         <replace-type modified-type="(fileNames, selectedFilter)"/>
       </modify-argument>
@@ -2648,7 +2648,7 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getOpenFileUrl(QWidget*, const QString&amp;, const QUrl&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;, const QStringList&amp;)" allow-thread="yes">
+    <modify-function signature="getOpenFileUrl(QWidget*,const QString&amp;,const QUrl&amp;,const QString&amp;,QString*,QFlags&lt;QFileDialog::Option&gt;,const QStringList&amp;)" allow-thread="yes">
       <modify-argument index="return">
         <replace-type modified-type="(fileName, selectedFilter)"/>
       </modify-argument>
@@ -2661,7 +2661,7 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getOpenFileUrls(QWidget*, const QString&amp;, const QUrl&amp;, const QString&amp;, QString *, QFlags&lt;QFileDialog::Option&gt;, const QStringList&amp;)" allow-thread="yes">
+    <modify-function signature="getOpenFileUrls(QWidget*,const QString&amp;,const QUrl&amp;,const QString&amp;,QString*,QFlags&lt;QFileDialog::Option&gt;,const QStringList&amp;)" allow-thread="yes">
       <modify-argument index="return">
         <replace-type modified-type="(fileName, selectedFilter)"/>
       </modify-argument>
@@ -2674,7 +2674,7 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getSaveFileName(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
+    <modify-function signature="getSaveFileName(QWidget*,const QString&amp;,const QString&amp;,const QString&amp;,QString*,QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
       <modify-argument index="return">
         <replace-type modified-type="(fileName, selectedFilter)"/>
       </modify-argument>
@@ -2687,7 +2687,7 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getSaveFileUrl(QWidget*, const QString&amp;, const QUrl&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;, const QStringList&amp;)" allow-thread="yes">
+    <modify-function signature="getSaveFileUrl(QWidget*,const QString&amp;,const QUrl&amp;,const QString&amp;,QString*,QFlags&lt;QFileDialog::Option&gt;,const QStringList&amp;)" allow-thread="yes">
       <modify-argument index="return">
         <replace-type modified-type="(fileName, selectedFilter)"/>
       </modify-argument>
@@ -2715,7 +2715,7 @@
   <object-type name="QScrollBar" />
   <object-type name="QAbstractScrollArea">
     <enum-type name="SizeAdjustPolicy"/>
-    <modify-function signature="setViewport(QWidget *)">
+    <modify-function signature="setViewport(QWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2756,7 +2756,7 @@
   </object-type>
   <object-type name="QRubberBand">
     <enum-type name="Shape"/>
-    <modify-function signature="QRubberBand(QRubberBand::Shape, QWidget*)">
+    <modify-function signature="QRubberBand(QRubberBand::Shape,QWidget*)">
       <modify-argument index="this">
         <parent index="2" action="add"/>
       </modify-argument>
@@ -2766,12 +2766,12 @@
     </modify-function>
   </object-type>
   <object-type name="QTableWidget">
-    <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)">
+    <modify-function signature="setHorizontalHeaderItem(int,QTableWidgetItem*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setItem(int, int, QTableWidgetItem *)">
+    <modify-function signature="setItem(int,int,QTableWidgetItem*)">
       <modify-argument index="3">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2791,12 +2791,12 @@
         <parent index="this" action="remove"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setItemPrototype(const QTableWidgetItem *)">
+    <modify-function signature="setItemPrototype(const QTableWidgetItem*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setVerticalHeaderItem(int, QTableWidgetItem *)">
+    <modify-function signature="setVerticalHeaderItem(int,QTableWidgetItem*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2834,12 +2834,12 @@
             </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="addWidget(QWidget *)">
+    <modify-function signature="addWidget(QWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertWidget(int, QWidget *)">
+    <modify-function signature="insertWidget(int,QWidget*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -2885,7 +2885,7 @@
       </modify-argument>
     </modify-function>
     <modify-function signature="del()" rename="del_" />
-    <modify-function signature="getTextMargins(int*, int*, int*, int*) const">
+    <modify-function signature="getTextMargins(int*,int*,int*,int*)const">
         <modify-argument index="0">
             <replace-type modified-type="PyObject *" />
         </modify-argument>
@@ -2981,19 +2981,19 @@
   <object-type name="QTextBrowser"/>
   <object-type name="QDoubleSpinBox"/>
   <object-type name="QButtonGroup">
-    <modify-function signature="addButton(QAbstractButton*, int)">
+    <modify-function signature="addButton(QAbstractButton*,int)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="removeButton(QAbstractButton *)">
+    <modify-function signature="removeButton(QAbstractButton*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setId(QAbstractButton *,int)">
+    <modify-function signature="setId(QAbstractButton*,int)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -3038,7 +3038,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addAction(const QIcon&amp;, const QString&amp;)">
+    <modify-function signature="addAction(const QIcon&amp;,const QString&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -3114,23 +3114,23 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setItemDelegate(QAbstractItemDelegate *)">
+    <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
       <modify-argument index="1">
         <reference-count action="set"/>
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setView(QAbstractItemView *)">
+    <modify-function signature="setView(QAbstractItemView*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setLineEdit(QLineEdit *)">
+    <modify-function signature="setLineEdit(QLineEdit*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setModel(QAbstractItemModel *)">
+    <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
         <no-null-pointer/>
         <reference-count action="set"/>
@@ -3156,7 +3156,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="print(QPagedPaintDevice*) const" rename="print_"/>
+    <modify-function signature="print(QPagedPaintDevice*)const" rename="print_"/>
   </object-type>
   <object-type name="QAction">
     <enum-type name="ActionEvent"/>
@@ -3459,7 +3459,7 @@
     </modify-function>
   </object-type>
   <object-type name="QGraphicsProxyWidget">
-    <modify-function signature="QGraphicsProxyWidget(QGraphicsItem*, QFlags&lt;Qt::WindowType&gt;)">
+    <modify-function signature="QGraphicsProxyWidget(QGraphicsItem*,QFlags&lt;Qt::WindowType&gt;)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml
index a2d665b0a..2dc29f815 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml
@@ -49,7 +49,7 @@
     <enum-type name="FocusRectPolicy"/>
     <enum-type name="WidgetSizePolicy"/>
   </object-type>
-  --> 
+  -->
   <rejection class="QWidget" function-name="macCGHandle"/>
   <rejection class="QWidget" function-name="macQDHandle"/>
 </typesystem>
diff --git a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml
index d78a1d77c..d5b2ec974 100644
--- a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml
+++ b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml
@@ -69,7 +69,7 @@
 
     <value-type name="QDomDocument">
         <!-- will be replaced in inject code -->
-        <modify-function signature="setContent(const QByteArray&amp;, bool, QString*, int*, int*)">
+        <modify-function signature="setContent(const QByteArray&amp;,bool,QString*,int*,int*)">
             <modify-argument index="3">
                 <remove-argument/>
                 <remove-default-expression/>
@@ -89,7 +89,7 @@
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
         </modify-function>
-        <modify-function signature="setContent(const QString&amp;, bool, QString*, int*, int*)">
+        <modify-function signature="setContent(const QString&amp;,bool,QString*,int*,int*)">
             <modify-argument index="3">
                 <remove-argument/>
                 <remove-default-expression/>
@@ -109,7 +109,7 @@
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
         </modify-function>
-        <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)">
+        <modify-function signature="setContent(QIODevice*,bool,QString*,int*,int*)">
             <modify-argument index="3">
                 <remove-argument/>
                 <remove-default-expression/>
@@ -129,7 +129,7 @@
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
         </modify-function>
-        <modify-function signature="setContent(const QByteArray&amp;, QString*, int*, int*)">
+        <modify-function signature="setContent(const QByteArray&amp;,QString*,int*,int*)">
             <modify-argument index="2">
                 <remove-argument/>
                 <remove-default-expression/>
@@ -209,7 +209,7 @@
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
         </modify-function>
-        <modify-function signature="setContent(const QString&amp;, QString*,int*,int*)">
+        <modify-function signature="setContent(const QString&amp;,QString*,int*,int*)">
             <modify-argument index="2">
                 <remove-argument/>
                 <remove-default-expression/>
@@ -244,7 +244,7 @@
     <value-type name="QDomNode">
         <enum-type name="EncodingPolicy"/>
         <enum-type name="NodeType"/>
-        <modify-function signature="save(QTextStream&amp;, int, QDomNode::EncodingPolicy)const" allow-thread="yes"/>
+        <modify-function signature="save(QTextStream&amp;,int,QDomNode::EncodingPolicy)const" allow-thread="yes"/>
     </value-type>
 
     <value-type name="QDomNodeList" />
@@ -281,7 +281,7 @@
     </template>
 
     <object-type name="QXmlEntityResolver">
-        <modify-function signature="resolveEntity(const QString&amp;, const QString&amp;, QXmlInputSource*&amp;)">
+        <modify-function signature="resolveEntity(const QString&amp;,const QString&amp;,QXmlInputSource*&amp;)">
             <modify-argument index="3">
                 <remove-argument/>
             </modify-argument>
@@ -308,7 +308,7 @@
                 <define-ownership owner="c++"/>
             </modify-argument>
         </modify-function>
-        <modify-function signature="resolveEntity(const QString&amp;, const QString&amp;, QXmlInputSource*&amp;)">
+        <modify-function signature="resolveEntity(const QString&amp;,const QString&amp;,QXmlInputSource*&amp;)">
             <modify-argument index="3">
                 <remove-argument/>
             </modify-argument>
diff --git a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
index 888595ccc..c597b41d1 100644
--- a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
+++ b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
@@ -44,7 +44,7 @@
 
     <object-type name="QXmlSchema" since="4.6" /> <!-- Qt scoped pointer does not allow declare this as value type -->
     <object-type name="QXmlSchemaValidator" since="4.6">
-      <modify-function signature="schema() const">
+      <modify-function signature="schema()const">
         <modify-argument index="return">
           <replace-type modified-type="QXmlSchema*"/>
           <define-ownership owner="target"/>
@@ -70,7 +70,7 @@
         <primitive-type name="PrefixCode"/>
         <primitive-type name="LocalNameCode"/>
         <!-- ### These methods aren't part of Qt public API -->
-        <modify-function signature="QXmlName(QXmlName::NamespaceCode, QXmlName::LocalNameCode, QXmlName::PrefixCode)" remove="all"/>
+        <modify-function signature="QXmlName(QXmlName::NamespaceCode,QXmlName::LocalNameCode,QXmlName::PrefixCode)" remove="all"/>
         <modify-function signature="setNamespaceURI(QXmlName::NamespaceCode)" remove="all" />
         <modify-function signature="localName()const" remove="all" />
         <modify-function signature="prefix()const" remove="all" />
@@ -101,7 +101,7 @@
         <modify-function signature="kind()const" remove="all" />
         <modify-function signature="isDeepEqual(const QXmlNodeModelIndex&amp;)const" remove="all" />
         <modify-function signature="compareOrder(const QXmlNodeModelIndex &amp;)const" remove="all" />
-        <modify-function signature="sendNamespaces(QAbstractXmlReceiver *)const" remove="all" />
+        <modify-function signature="sendNamespaces(QAbstractXmlReceiver*)const" remove="all" />
         <modify-function signature="namespaceBindings()const" remove="all" />
         <modify-function signature="namespaceForPrefix(QXmlName::PrefixCode)const" remove="all" />
         <modify-function signature="stringValue()const" remove="all" />
-- 
cgit v1.2.3