From bf4b2c7660adc99b6a8b83748787f0ea078ad13b Mon Sep 17 00:00:00 2001
From: renatofilho <renato.filho@openbossa.org>
Date: Wed, 22 Sep 2010 16:59:46 -0300
Subject: Port old boost code used in QtUiTools.

fixes bug #376.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>
---
 PySide/QtUiTools/typesystem_uitools.xml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'PySide/QtUiTools/typesystem_uitools.xml')

diff --git a/PySide/QtUiTools/typesystem_uitools.xml b/PySide/QtUiTools/typesystem_uitools.xml
index 7ea988b3d..a188aa34b 100644
--- a/PySide/QtUiTools/typesystem_uitools.xml
+++ b/PySide/QtUiTools/typesystem_uitools.xml
@@ -48,13 +48,27 @@
       </modify-function>
 
       <modify-function signature="load(QIODevice*, QWidget*)">
+        <extra-includes>
+          <include file-name="glue/uitools_loadui.h" location="local"/> 
+        </extra-includes>
+        <modify-argument index="2">
+          <replace-default-expression with="0" />
+          <rename to="parentWidget" />
+        </modify-argument>
         <modify-argument index="return">
           <parent index="2" action="add"/>
         </modify-argument>
-      </modify-function>
+        <inject-code>
+            //Avoid calling the original function: %CPPSELF.load
+            %PYARG_0 = quiloader_load_ui_from_device(%CPPSELF, %1, %2);
+        </inject-code>
+     </modify-function>
 
       <!-- Syntax sugar -->
       <add-function signature="load(const char*, QWidget*)" return-type="QWidget*">
+        <extra-includes>
+          <include file-name="glue/uitools_loadui.h" location="local"/> 
+        </extra-includes>
         <modify-argument index="2">
           <replace-default-expression with="0" />
           <rename to="parentWidget" />
@@ -63,11 +77,8 @@
           <parent index="2" action="add"/>
         </modify-argument>
         <inject-code>
-            QFile f(%1);
-            if (f.open(QIODevice::ReadOnly | QIODevice::Text))
-                %PYARG_0 = %CONVERTTOPYTHON[QWidget*](%CPPSELF.load(&amp;f, %2));
-            else
-                PyErr_SetString(PyExc_RuntimeError, "Unable to open ui file");
+            //Avoid calling the original function: %CPPSELF.load
+            %PYARG_0 = quiloader_load_ui(%CPPSELF, %1, %2);
         </inject-code>
       </add-function>
     </object-type>
-- 
cgit v1.2.3