summaryrefslogtreecommitdiffstats
path: root/tests/samplebinding/typesystem_sample.xml
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-11-23 14:56:27 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-11-23 14:58:15 -0200
commit521cf2b6190a89ecaf19fff925c75bb47b72fa49 (patch)
tree454a90c8211326a4046e76e13141389ddab14de0 /tests/samplebinding/typesystem_sample.xml
parent81a8bd714bf4ea7783277052da932d8a7a909fd1 (diff)
parent605bbf8d03eaf5c90b1efdb17eabfa66fedc24be (diff)
downloadshiboken-521cf2b6190a89ecaf19fff925c75bb47b72fa49.tar.gz
shiboken-521cf2b6190a89ecaf19fff925c75bb47b72fa49.tar.xz
shiboken-521cf2b6190a89ecaf19fff925c75bb47b72fa49.zip
Merge branch 'fixapi'
Reviewer: Renato Ara├║jo <renato.filho@openbossa.org> Luciano Wolf <luciano.wolf@openbossa.org> Conflicts: generator/cppgenerator.cpp libshiboken/basewrapper.cpp libshiboken/basewrapper_p.h
Diffstat (limited to 'tests/samplebinding/typesystem_sample.xml')
-rw-r--r--tests/samplebinding/typesystem_sample.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index b0fff8dc..fb133b51 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -183,9 +183,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::Object::setParent(layout, %CONVERTTOPYTHON[ObjectTypeLayout*](l));
} else {
- Wrapper::setParent(parent, %CONVERTTOPYTHON[ObjectType*](*it));
+ Shiboken::Object::setParent(parent, %CONVERTTOPYTHON[ObjectType*](*it));
}
}
}
@@ -714,8 +714,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>
@@ -919,7 +919,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;
}
@@ -943,7 +943,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;
}
@@ -1181,7 +1181,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>