Adjust the allow-thread behavior

This adds and remove the usage of:
    allow-thread="yes"
in some typesystem entries.

This also adapt the usage of the Py_BEGIN/END_ALLOW_THREAD
macro inside the snippets used by other typesystem entries.
The main reason is that in some cases not the whole snippet
requires to be inside such state, but only when calling the
C++ equivalent function.

Task-number: PYSIDE-803
Change-Id: Ifa9c8cee2713c453e4d5c624aaa862e75559180c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 37 insertions, 14 deletions

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 695fd670f..f64a8fd73 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -1415,6 +1415,11 @@
   </value-type>
   <object-type name="QLockFile">
       <enum-type name="LockError"/>
+      <modify-function signature="isLocked()const" allow-thread="yes"/>
+      <modify-function signature="lock()" allow-thread="yes"/>
+      <modify-function signature="removeStaleLockFile()" allow-thread="yes"/>
+      <modify-function signature="tryLock(int)" allow-thread="yes"/>
+      <modify-function signature="unlock()" allow-thread="yes"/>
   </object-type>
   <object-type name="QMessageAuthenticationCode"/>
   <object-type name="QSignalBlocker"/>
@@ -1457,12 +1462,13 @@
   <object-type name="QThread">
     <enum-type name="Priority"/>
     <modify-function signature="currentThreadId()" remove="all"/>
-    <modify-function signature="run()" thread="yes"/>
+    <modify-function signature="run()" allow-thread="yes"/>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
     <modify-function signature="msleep(unsigned long)" allow-thread="yes"/>
     <modify-function signature="sleep(unsigned long)" allow-thread="yes"/>
     <modify-function signature="usleep(unsigned long)" allow-thread="yes"/>
     <modify-function signature="wait(unsigned long)" allow-thread="yes"/>
+    <modify-function signature="yieldCurrentThread()" allow-thread="yes"/>
     <modify-function signature="start(QThread::Priority)" allow-thread="yes">
       <modify-argument index="1">
         <rename to="priority"/>
@@ -1518,6 +1524,11 @@
         <define-ownership class="native" owner="c++"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="dataChanged(const QModelIndex&amp;,const QModelIndex&amp;,const QVector&lt;int&gt;&amp;)" allow-thread="yes"/>
+    <modify-function signature="layoutAboutToBeChanged(const QList&lt;QPersistentModelIndex&gt;&amp;,QAbstractItemModel::LayoutChangeHint)" allow-thread="yes"/>
+    <modify-function signature="layoutChanged(const QList&lt;QPersistentModelIndex&gt;&amp;,QAbstractItemModel::LayoutChangeHint)" allow-thread="yes"/>
+    <modify-function signature="beginResetModel()" allow-thread="yes"/>
+    <modify-function signature="endResetModel()" allow-thread="yes"/>
   </object-type>
   <value-type name="QItemSelection">
     <include file-name="QList" location="global"/>
@@ -1718,13 +1729,13 @@
      <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-receivers"/>
    </modify-function>
 
-   <modify-function signature="destroyed(QObject*)">
+   <modify-function signature="destroyed(QObject*)" allow-thread="yes">
      <modify-argument index="1">
        <rename to="object"/>
      </modify-argument>
    </modify-function>
 
-   <modify-function signature="sender()const">
+   <modify-function signature="sender()const" allow-thread="yes">
       <modify-argument index="return">
          <define-ownership owner="default"/>
       </modify-argument>
@@ -2202,6 +2213,8 @@
     <modify-function signature="flush()" allow-thread="yes"/>
   </object-type>
   <object-type name="QFile">
+    <modify-function signature="open(QFlags&lt;QIODevice::OpenModeFlag&gt;)" allow-thread="yes"/>
+    <modify-function signature="open(int,QFlags&lt;QIODevice::OpenModeFlag&gt;,QFlags&lt;QFileDevice::FileHandleFlag&gt;)" allow-thread="yes"/>
     <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="link(const QString&amp;)" allow-thread="yes"/>
@@ -2279,7 +2292,7 @@
     <enum-type name="LibraryLocation"/>
   </object-type>
   <object-type name="QMutexLocker" copyable="no">
-    <modify-function signature="QMutexLocker(QBasicMutex*)" allow-thread="yes">
+    <modify-function signature="QMutexLocker(QBasicMutex*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="mutex()const0"/>
         </modify-argument>
@@ -2298,23 +2311,24 @@
 
   <!-- Qt5 addition -->
   <object-type name="QBasicMutex">
-    <modify-function signature="lock()" allow-thread="yes"/>
-    <modify-function signature="tryLock()" allow-thread="yes"/>
+    <modify-function signature="lock()"/>
+    <modify-function signature="tryLock()"/>
   </object-type>
 
   <object-type name="QMutex">
     <enum-type name="RecursionMode"/>
     <modify-function signature="lock()" allow-thread="yes"/>
+    <modify-function signature="unlock()" allow-thread="yes"/>
     <modify-function signature="tryLock(int)" allow-thread="yes"/>
   </object-type>
   <object-type name="QRecursiveMutex" since="5.14"/>
   <object-type name="QRandomGenerator" since="5.10">
-      <modify-function signature="global()" rename="global_" allow-thread="yes"/>
+      <modify-function signature="global()" rename="global_"/>
       <modify-function signature="operator()()" remove="all"/>
       <modify-function signature="generate(quint32*,quint32*)" remove="all"/>
   </object-type>
   <object-type name="QRandomGenerator64" since="5.10">
-      <modify-function signature="global()" rename="global_" allow-thread="yes"/>
+      <modify-function signature="global()" rename="global_"/>
       <modify-function signature="operator()()" remove="all"/>
   </object-type>
   <object-type name="QSemaphore">
@@ -2338,7 +2352,9 @@
     <extra-includes>
       <!-- Qt5: private <include file-name="QAbstractFileEngine" location="global"/> -->
     </extra-includes>
-    <modify-function signature="createLocalFile(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="createNativeFile(QFile&amp;)" allow-thread="yes"/>
+    <modify-function signature="createNativeFile(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="open()" allow-thread="yes"/>
   </object-type>
   <object-type name="QTemporaryDir"/>
   <object-type name="QMimeData">
@@ -2385,7 +2401,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)" allow-thread="yes">
         <modify-argument index="1">
             <replace-type modified-type="PyBuffer"/>
         </modify-argument>
@@ -2778,16 +2794,23 @@
   </object-type>
 
   <object-type name="QThreadPool">
-    <modify-function signature="start(QRunnable*,int)">
+    <modify-function signature="clear()" allow-thread="yes"/>
+    <modify-function signature="activeThreadCount()const" allow-thread="yes"/>
+    <modify-function signature="releaseThread()" allow-thread="yes"/>
+    <modify-function signature="reserveThread()" allow-thread="yes"/>
+    <modify-function signature="setMaxThreadCount(int)" allow-thread="yes"/>
+    <modify-function signature="waitForDone(int)" allow-thread="yes"/>
+    <modify-function signature="start(QRunnable*,int)" allow-thread="yes">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="tryStart(QRunnable*)">
+    <modify-function signature="tryStart(QRunnable*)" allow-thread="yes">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="tryTake(QRunnable*)" allow-thread="yes"/>
 
     <modify-function signature="globalInstance()" >
       <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="releaseownership"/>
@@ -2873,7 +2896,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">
         <modify-argument index="2">
             <remove-argument />
         </modify-argument>
@@ -2884,7 +2907,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">
         <modify-argument index="2">
             <remove-argument />
         </modify-argument>