From 2927e38cb46d3aa2cf278238d2a585d96f669d91 Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Fri, 19 Nov 2010 17:56:10 -0200
Subject: namespace Shiboken::BaseType renamed to Shiboken::ObjectType.

---
 tests/samplebinding/typesystem_sample.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/samplebinding/typesystem_sample.xml')

diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 37fa4742e..fb46eb2f7 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -178,9 +178,9 @@
                     if ((*it)->isLayoutType()) {
                         ObjectTypeLayout* l = reinterpret_cast&lt;ObjectTypeLayout*>(*it);
                         reparent_layout_items(parent, %CONVERTTOPYTHON[ObjectTypeLayout*](l));
-                        Wrapper::setParent(layout, %CONVERTTOPYTHON[ObjectTypeLayout*](l));
+                        Shiboken::Wrapper::setParent(layout, %CONVERTTOPYTHON[ObjectTypeLayout*](l));
                     } else {
-                        Wrapper::setParent(parent, %CONVERTTOPYTHON[ObjectType*](*it));
+                        Shiboken::Wrapper::setParent(parent, %CONVERTTOPYTHON[ObjectType*](*it));
                     }
                 }
             }
@@ -709,8 +709,8 @@
             <modify-argument index="return">
                 <replace-type modified-type="PySequence"/>
                 <conversion-rule class="native">
-                    AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 0));
-                    AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 1));
+                    Shiboken::AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 0));
+                    Shiboken::AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 1));
                     %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](_py_ok_);
                     %2 = %CONVERTTOCPP[Str*](_py_ret_);
                 </conversion-rule>
@@ -914,7 +914,7 @@
             <inject-code class="target" position="beginning">
                 int argc;
                 char** argv;
-                if (!sequenceToArgcArgv(%PYARG_1, &amp;argc, &amp;argv)) {
+                if (!Shiboken::sequenceToArgcArgv(%PYARG_1, &amp;argc, &amp;argv)) {
                     PyErr_SetString(PyExc_TypeError, "error");
                     return 0;
                 }
@@ -938,7 +938,7 @@
             <inject-code class="target" position="beginning">
                 int argc;
                 char** argv;
-                if (!sequenceToArgcArgv(%PYARG_1, &amp;argc, &amp;argv)) {
+                if (!Shiboken::sequenceToArgcArgv(%PYARG_1, &amp;argc, &amp;argv)) {
                     PyErr_SetString(PyExc_TypeError, "error");
                     return 0;
                 }
-- 
cgit v1.2.3


From 535c799dbbd9f6eb89560caf409ae6bd2d8122b1 Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Fri, 19 Nov 2010 18:01:23 -0200
Subject: Namespace Shiboken::Wrapper renamed to Shiboken::Object.

---
 tests/samplebinding/typesystem_sample.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/samplebinding/typesystem_sample.xml')

diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index fb46eb2f7..c54da9899 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -178,9 +178,9 @@
                     if ((*it)->isLayoutType()) {
                         ObjectTypeLayout* l = reinterpret_cast&lt;ObjectTypeLayout*>(*it);
                         reparent_layout_items(parent, %CONVERTTOPYTHON[ObjectTypeLayout*](l));
-                        Shiboken::Wrapper::setParent(layout, %CONVERTTOPYTHON[ObjectTypeLayout*](l));
+                        Shiboken::Object::setParent(layout, %CONVERTTOPYTHON[ObjectTypeLayout*](l));
                     } else {
-                        Shiboken::Wrapper::setParent(parent, %CONVERTTOPYTHON[ObjectType*](*it));
+                        Shiboken::Object::setParent(parent, %CONVERTTOPYTHON[ObjectType*](*it));
                     }
                 }
             }
@@ -1176,7 +1176,7 @@
             </modify-argument>
             <inject-code class="target" position="end">
                 %RETURN_TYPE %0 = %TYPE::%FUNCTION_NAME();
-                %PYARG_0 = Shiboken::Wrapper::newObject(&amp;SbkObject_Type, %0, false, false);
+                %PYARG_0 = Shiboken::Object::newObject(&amp;SbkObject_Type, %0, false, false);
             </inject-code>
         </modify-function>
     </value-type>
-- 
cgit v1.2.3