From a1524b78b632d99aa6076391d0d77e46271dd7c8 Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Thu, 28 Oct 2010 17:32:33 -0200
Subject: Fix bug#409 - "function -- PySide.QtUiTools.QUiLoader.load(...) --
 takes bytes-string (but not unicode-string)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewer: Renato Araújo <renato.filho@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>
---
 PySide/QtUiTools/typesystem_uitools.xml |  2 +-
 tests/QtUiTools/uiloader_test.py        | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/PySide/QtUiTools/typesystem_uitools.xml b/PySide/QtUiTools/typesystem_uitools.xml
index 82acb0486..2f94f21ae 100644
--- a/PySide/QtUiTools/typesystem_uitools.xml
+++ b/PySide/QtUiTools/typesystem_uitools.xml
@@ -77,7 +77,7 @@
      </modify-function>
 
       <!-- Syntax sugar -->
-      <add-function signature="load(const char*, QWidget*)" return-type="QWidget*">
+      <add-function signature="load(QString, QWidget*)" return-type="QWidget*">
         <extra-includes>
           <include file-name="glue/uitools_loadui.h" location="local"/>
         </extra-includes>
diff --git a/tests/QtUiTools/uiloader_test.py b/tests/QtUiTools/uiloader_test.py
index fe3725ba1..0b397a003 100644
--- a/tests/QtUiTools/uiloader_test.py
+++ b/tests/QtUiTools/uiloader_test.py
@@ -25,6 +25,19 @@ class QUioaderTeste(UsesQApplication):
         self.assertNotEqual(child, None)
         self.assertEqual(w.findChild(QWidget, "grandson_object"), child.findChild(QWidget, "grandson_object"))
 
+    def testLoadFileUnicodeFilePath(self):
+        filePath = unicode(os.path.join(os.path.dirname(__file__), 'test.ui'))
+        loader = QUiLoader()
+        parent = QWidget()
+        w = loader.load(filePath, parent)
+        self.assertNotEqual(w, None)
+
+        self.assertEqual(len(parent.children()), 1)
+
+        child = w.findChild(QWidget, "child_object")
+        self.assertNotEqual(child, None)
+        self.assertEqual(w.findChild(QWidget, "grandson_object"), child.findChild(QWidget, "grandson_object"))
+
 if __name__ == '__main__':
     unittest.main()
 
-- 
cgit v1.2.3