PySide6: Simplify rename-to/replace-default-expression in typeystem files

Remove unneeded values or specify them in the add-function signature.

Change-Id: I9561432f7aedb56d796496d338d2bf660e30c17c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 536d72708c046684de6fc5746db1102bb1d50715)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

5 files changed, 14 insertions, 74 deletions

diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index 14a587d7c..01a43b519 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -891,10 +891,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)">
-        <modify-argument index="8">
-          <replace-default-expression with="Qt::LocalTime"/>
-        </modify-argument>
+    <add-function signature="QDateTime(int,int,int,int,int,int,int,int=Qt::LocalTime)">
         <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qdatetime-1"/>
     </add-function>
     <add-function signature="QDateTime(int,int,int,int,int,int)">
@@ -1531,16 +1528,7 @@
             <replace-default-expression with="0"/>
         </modify-argument>
     </modify-function>
-    <add-function signature="createIndex(int,int,PyObject*)const" return-type="QModelIndex">
-        <modify-argument index="1">
-            <rename to="row"/>
-        </modify-argument>
-        <modify-argument index="2">
-            <rename to="column"/>
-        </modify-argument>
-        <modify-argument index="3">
-            <rename to="ptr"/>
-        </modify-argument>
+    <add-function signature="createIndex(int@row@,int@column@,PyObject*@ptr@)const" return-type="QModelIndex">
         <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qabstractitemmodel-createindex"/>
         <inject-documentation mode="append" format="target">
             Creates a model index for the given row and column with the internal pointer ptr.
@@ -1690,29 +1678,17 @@
         <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-connect-3"/>
     </modify-function>
     <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-connect"/>
-    <add-function signature="connect(const QObject*,const char*,PyCallable*,Qt::ConnectionType)"
+    <add-function signature="connect(const QObject*,const char*,PyCallable*,Qt::ConnectionType@type@=Qt::AutoConnection)"
                   return-type="QMetaObject::Connection" static="yes">
-        <modify-argument index="4">
-            <rename to="type"/>
-            <replace-default-expression with="Qt::AutoConnection"/>
-        </modify-argument>
         <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-connect-4"/>
     </add-function>
     <!-- static version -->
-    <add-function signature="connect(const char*,PyCallable*,Qt::ConnectionType)"
+    <add-function signature="connect(const char*,PyCallable*,Qt::ConnectionType@type@=Qt::AutoConnection)"
                   return-type="QMetaObject::Connection">
-        <modify-argument index="3">
-            <rename to="type"/>
-            <replace-default-expression with="Qt::AutoConnection"/>
-        </modify-argument>
         <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-connect-5"/>
     </add-function>
-    <add-function signature="connect(const char*,const QObject*,const char*,Qt::ConnectionType)"
+    <add-function signature="connect(const char*,const QObject*,const char*,Qt::ConnectionType@type@=Qt::AutoConnection)"
                   return-type="QMetaObject::Connection">
-        <modify-argument index="4">
-            <rename to="type"/>
-            <replace-default-expression with="Qt::AutoConnection"/>
-        </modify-argument>
         <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-connect-6"/>
     </add-function>
 
@@ -1728,7 +1704,7 @@
 
 
     <inject-code class="native" file="../glue/qtcore.cpp" snippet="qobject-findchild-1"/>
-    <add-function signature="findChild(PyTypeObject*@type@,const QString&amp;@name@,Qt::FindChildOptions@options@=Qt::FindChildrenRecursively)"
+    <add-function signature="findChild(PyTypeObject*@type@,const QString&amp;@name@={},Qt::FindChildOptions@options@=Qt::FindChildrenRecursively)"
                   return-type="PyObject*">
         <inject-documentation format="target" mode="append">
         To find the child of a certain QObject, the first argument of this function should be the child's type, and the second the name of the child:
@@ -1747,11 +1723,8 @@
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>
-      <modify-argument index="2">
-          <replace-default-expression with="QString()"/>
-      </modify-argument>
     </add-function>
-    <add-function signature="findChildren(PyTypeObject*@type@,const QString&amp;@name@,Qt::FindChildOptions@options@=Qt::FindChildrenRecursively)"
+    <add-function signature="findChildren(PyTypeObject*@type@,const QString&amp;@name@={},Qt::FindChildOptions@options@=Qt::FindChildrenRecursively)"
                   return-type="PySequence*" >
         <inject-documentation format="target" mode="append">
         Like the method *findChild*, the first parameter should be the child's type.
@@ -1760,9 +1733,6 @@
         <modify-argument index="return">
             <parent index="this" action="add"/>
         </modify-argument>
-        <modify-argument index="2">
-            <replace-default-expression with="QString()"/>
-        </modify-argument>
     </add-function>
     <add-function signature="findChildren(PyTypeObject*@type@,const QRegularExpression&amp;@pattern@,Qt::FindChildOptions@options@=Qt::FindChildrenRecursively)"
                   return-type="PySequence*" >
@@ -2397,11 +2367,7 @@
   </value-type>
   <object-type name="QSocketNotifier">
     <enum-type name="Type"/>
-    <add-function signature="QSocketNotifier(PyObject*, QSocketNotifier::Type, QObject*)">
-      <modify-argument index="3">
-        <replace-default-expression with="0"/>
-        <rename to="parent"/>
-      </modify-argument>
+    <add-function signature="QSocketNotifier(PyObject*, QSocketNotifier::Type, QObject*@parent@=nullptr)">
       <inject-code file="../glue/qtcore.cpp" snippet="qsocketnotifier"/>
     </add-function>
   </object-type>
diff --git a/sources/pyside6/PySide6/QtDesigner/typesystem_designer.xml b/sources/pyside6/PySide6/QtDesigner/typesystem_designer.xml
index 9bdc63d18..0c9d80641 100644
--- a/sources/pyside6/PySide6/QtDesigner/typesystem_designer.xml
+++ b/sources/pyside6/PySide6/QtDesigner/typesystem_designer.xml
@@ -102,11 +102,8 @@
       </modify-argument>
     </modify-function>
     <!-- Force VARARGS/keyword arguments by giving a default parameters -->
-    <add-function signature='registerCustomWidget(PyObject*,const QString&amp; @xml@ = {}, const QString&amp; @tool_tip@ = {}, const QString&amp; @group@ = {}, const QString&amp; @module@ = {}, bool @container@ = false, const QString&amp; @icon@ = {})'
+    <add-function signature='registerCustomWidget(PyObject*@customWidgetType@,const QString&amp; @xml@ = {}, const QString&amp; @tool_tip@ = {}, const QString&amp; @group@ = {}, const QString&amp; @module@ = {}, bool @container@ = false, const QString&amp; @icon@ = {})'
                   return-type='void' static='true'>
-       <modify-argument index="1">
-          <rename to="customWidgetType"/>
-       </modify-argument>
        <inject-code class="target" position="beginning" file="../glue/qtdesigner.cpp" snippet="qtdesigner-registercustomwidget"/>
     </add-function>
   </object-type>
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
index a22e9c85c..b1d5ff585 100644
--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
@@ -245,17 +245,11 @@
     </modify-function>
   </object-type>
   <object-type name="QShortcut">
-    <add-function signature="QShortcut(QKeySequence&amp;,QObject*,PyCallable*,Qt::ShortcutContext)">
-      <modify-argument index="4">
-        <replace-default-expression with="Qt::WindowShortcut"/>
-      </modify-argument>
+    <add-function signature="QShortcut(QKeySequence&amp;,QObject*,PyCallable*,Qt::ShortcutContext=Qt::WindowShortcut)">
       <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qshortcut-1"/>
       <inject-code class="target" position="end" file="../glue/qtgui.cpp" snippet="qshortcut-2"/>
     </add-function>
-    <add-function signature="QShortcut(QKeySequence::StandardKey,QObject*,PyCallable*,Qt::ShortcutContext)">
-      <modify-argument index="4">
-        <replace-default-expression with="Qt::WindowShortcut"/>
-      </modify-argument>
+    <add-function signature="QShortcut(QKeySequence::StandardKey,QObject*,PyCallable*,Qt::ShortcutContext=Qt::WindowShortcut)">
       <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qshortcut-1"/>
       <inject-code class="target" position="end" file="../glue/qtgui.cpp" snippet="qshortcut-2"/>
     </add-function>
@@ -565,10 +559,7 @@
   </value-type>
 
   <value-type name="QPixmap" >
-    <add-function signature="QPixmap(const QImage&amp;)">
-        <modify-argument index="1">
-            <rename to="image"/>
-        </modify-argument>
+    <add-function signature="QPixmap(const QImage&amp;@image@)">
         <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qpixmap"/>
     </add-function>
     <modify-function signature="QPixmap(const char*const[])">
@@ -1726,9 +1717,6 @@
       </modify-argument>
     </modify-function>
     <modify-function signature="text(QString&amp;,QClipboard::Mode)const">
-      <modify-argument index="2">
-        <replace-default-expression with="QClipboard::Clipboard"/>
-      </modify-argument>
       <modify-argument index="return">
         <replace-type modified-type="(retval, subtype)"/>
       </modify-argument>
diff --git a/sources/pyside6/PySide6/QtUiTools/typesystem_uitools.xml b/sources/pyside6/PySide6/QtUiTools/typesystem_uitools.xml
index a8bf52112..05ef69eb9 100644
--- a/sources/pyside6/PySide6/QtUiTools/typesystem_uitools.xml
+++ b/sources/pyside6/PySide6/QtUiTools/typesystem_uitools.xml
@@ -49,10 +49,7 @@
       </extra-includes>
       <inject-code class="native" position="beginning" file="../glue/qtuitools.cpp" snippet="uitools-loadui"/>
       <inject-code file="../glue/qtuitools.cpp" snippet="quiloader"/>
-      <add-function signature="registerCustomWidget(PyObject*)" return-type="void">
-         <modify-argument index="1">
-            <rename to="customWidgetType"/>
-         </modify-argument>
+      <add-function signature="registerCustomWidget(PyObject*@customWidgetType@)" return-type="void">
          <inject-documentation format="target" mode="append">
          Registers a Python created custom widget to QUiLoader, so it can be recognized when
          loading a `.ui` file. The custom widget type is passed via the ``customWidgetType`` argument.
@@ -130,11 +127,7 @@
      </modify-function>
 
       <!-- Syntax sugar -->
-      <add-function signature="load(PyPathLike,QWidget*)" return-type="QWidget*">
-        <modify-argument index="2">
-          <replace-default-expression with="0"/>
-          <rename to="parentWidget"/>
-        </modify-argument>
+      <add-function signature="load(PyPathLike,QWidget*@parentWidget@=nullptr)" return-type="QWidget*">
         <modify-argument index="return">
           <define-ownership class="target" owner="target"/>
         </modify-argument>
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml
index bd35e1c39..ae309ca70 100644
--- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml
@@ -1176,27 +1176,23 @@
     <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const">
       <modify-argument index="3" invalidate-after-use="yes"/>
       <modify-argument index="4">
-        <replace-default-expression with="0"/>
         <rename to="widget"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="drawControl(QStyle::ControlElement,const QStyleOption*,QPainter*,const QWidget*)const">
       <modify-argument index="3" invalidate-after-use="yes"/>
       <modify-argument index="4">
-        <replace-default-expression with="0"/>
         <rename to="widget"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="drawPrimitive(QStyle::PrimitiveElement,const QStyleOption*,QPainter*,const QWidget*)const">
       <modify-argument index="3" invalidate-after-use="yes"/>
       <modify-argument index="4">
-        <replace-default-expression with="0"/>
         <rename to="widget"/>
       </modify-argument>
     </modify-function>
     <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"/>
       </modify-argument>
     </modify-function>