Updated type system files to use the new %BEGIN_ALLOW_THREADS and %END_ALLOW_THREADS variables.

Reviewed by Lauro Moura <lauro.neto@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>

3 files changed, 46 insertions, 46 deletions

diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index ded4c720b..7194e643c 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -5124,9 +5124,9 @@
     <template name="fix_args,int*,ItemRole*">
         int _row;
         QFormLayout::ItemRole _role;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %CPPSELF->%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_row, &amp;_role);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(_row, _role);
     </template>
 
diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml
index 9d8fb1fb8..1bf07debb 100644
--- a/PySide/QtXml/typesystem_xml.xml
+++ b/PySide/QtXml/typesystem_xml.xml
@@ -37,9 +37,9 @@
         int _errorLine_ = 0;
         int _errorColumn_ = 0;
 
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_errorMsg_, &amp;_errorLine_, &amp;_errorColumn_);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(_ret_, _errorMsg_, _errorLine_, _errorColumn_);
     </template>
 
@@ -271,9 +271,9 @@
             <inject-code class="target" position="end">
                 QXmlInputSource* _qxmlinputsource_arg_ = 0;
 
-                PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+                %BEGIN_ALLOW_THREADS
                 %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
-                PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+                %END_ALLOW_THREADS
 
                 %PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_);
             </inject-code>
@@ -297,9 +297,9 @@
             </modify-argument>
             <inject-code class="target" position="end">
                 QXmlInputSource* _qxmlinputsource_arg_ = 0;
-                PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+                %BEGIN_ALLOW_THREADS
                 %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
-                PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+                %END_ALLOW_THREADS
                 %PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_);
             </inject-code>
         </modify-function>
diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml
index ed0d6bdc9..24c531e96 100644
--- a/PySide/typesystem_templates.xml
+++ b/PySide/typesystem_templates.xml
@@ -31,65 +31,65 @@
     <!-- Templates to fix bool* parameters -->
     <template name="fix_bool*">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="fix_args,bool*">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;ok_);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="fix_arg,bool*,arg">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, &amp;ok_, %3);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="fix_bool*,arg">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="fix_bool*,arg,arg">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="fix_bool*,arg,arg,arg">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, &amp;ok_, %9);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="fix_arg,arg,arg,arg,arg,arg,bool*,arg">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, &amp;ok_, %8);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="fix_arg,arg,arg,arg,arg,bool*,arg">
         bool ok_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, &amp;ok_, %7);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
     <template name="get_slice">
@@ -120,33 +120,33 @@
 
     <template name="fix_args,QRectF*">
         QRectF rect_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;rect_);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = %CONVERTTOPYTHON[QRectF](rect_);
     </template>
 
     <template name="fix_args,QRect*">
         QRect rect_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;rect_);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = %CONVERTTOPYTHON[QRect](rect_);
     </template>
 
     <template name="fix_char*">
         char val_;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;val_);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, val_);
     </template>
 
     <template name="fix_number*,number*,number*,number*">
         $TYPE a, b, c, d;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(a, b, c, d);
     </template>
 
@@ -169,9 +169,9 @@
 
     <template name="fix_int*,int*,int*,int*,int*">
         int a, b, c, d, e;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, &amp;e);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(a, b, c, d, e);
     </template>
     <template name="fix_qreal*,qreal*,qreal*,qreal*,qreal*">
@@ -190,17 +190,17 @@
     <template name="fix_return_args,int*">
         RETURNTYPE _ret;
         int _arg;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         _ret = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_arg);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(_ret, _arg);
     </template>
 
     <template name="fix_args,number*,number*">
         $TYPE a, b;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;a, &amp;b);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(a, b);
     </template>
 
@@ -214,9 +214,9 @@
     <template name="fix_arg,int*,int*">
         %RETURN_TYPE _ret;
         int a, b;
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         _ret = %CPPSELF.%FUNCTION_NAME(%1, &amp;a, &amp;b);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(_ret, a, b);
     </template>
 
@@ -225,16 +225,16 @@
     </template>
 
     <template name="return_tuple_QValidator_QString_int">
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %RETURN_TYPE(%CPPSELF.%FUNCTION_NAME(%1, %2));
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, %1, %2);
     </template>
 
     <template name="return_for_QFileDialog">
-        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6);
-        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+        %END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(retval_, %4);
     </template>
    <template name="set_qapp_parent_for_orphan">