From 952f9f0bda958afa36421c6af828f55f643a3deb Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Tue, 17 May 2011 16:34:08 -0300
Subject: Fix bug 686 - "Request to make Q[Mutex|Read|Write]Locker context
 managers"

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Luciano Wolf <luciano.wolf@openbossa.org>
---
 PySide/QtCore/typesystem_core.xml | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

(limited to 'PySide')

diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 029fa1fc8..5a53261b7 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -1154,10 +1154,32 @@
     <modify-function signature="tryLockForWrite(int)" allow-thread="yes"/>
   </object-type>
   <object-type name="QReadLocker">
+    <modify-function signature="QReadLocker(QReadWriteLock*)">
+        <modify-argument index="1">
+            <reference-count action="set"/>
+        </modify-argument>
+    </modify-function>
     <modify-function signature="relock()" allow-thread="yes" />
+    <add-function signature="__enter__()" />
+    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+        <inject-code>
+            %CPPSELF.unlock();
+        </inject-code>
+    </add-function>
   </object-type>
   <object-type name="QWriteLocker">
+    <modify-function signature="QWriteLocker(QReadWriteLock*)">
+        <modify-argument index="1">
+            <reference-count action="set"/>
+        </modify-argument>
+    </modify-function>
     <modify-function signature="relock()" allow-thread="yes" />
+    <add-function signature="__enter__()" />
+    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+        <inject-code>
+            %CPPSELF.unlock();
+        </inject-code>
+    </add-function>
   </object-type>
   <object-type name="QDirIterator">
     <enum-type name="IteratorFlag" flags="IteratorFlags"/>
@@ -2023,13 +2045,23 @@
     <enum-type name="LibraryLocation"/>
   </object-type>
   <object-type name="QMutexLocker" copyable="no">
-    <modify-function signature="QMutexLocker(QMutex*)" allow-thread="yes" />
+    <modify-function signature="QMutexLocker(QMutex*)" allow-thread="yes">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="mutex()const0"/>
+        </modify-argument>
+    </modify-function>
     <modify-function signature="relock()" allow-thread="yes"/>
     <modify-function signature="mutex() const">
       <modify-argument index="return">
-        <parent index="this" action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
+    <add-function signature="__enter__()" />
+    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+        <inject-code>
+            %CPPSELF.unlock();
+        </inject-code>
+    </add-function>
   </object-type>
 
   <object-type name="QMutex">
-- 
cgit v1.2.3