diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-23 14:56:27 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:11:58 -0300 |
| commit | 0cd491e63633d33d70e5453c10e60258947340e3 (patch) | |
| tree | 60ee74820fb1535e301a9872d9228e522fabf2e4 /tests | |
| parent | d17a105e2e71afd1f0b20576b73dcd95b5ca1806 (diff) | |
| parent | 21f0343984ddf5aeb5c163cd87540658f5bf4990 (diff) | |
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')
| -rw-r--r-- | tests/samplebinding/typesystem_sample.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml index b0fff8dc6..fb133b516 100644 --- a/tests/samplebinding/typesystem_sample.xml +++ b/tests/samplebinding/typesystem_sample.xml @@ -183,9 +183,9 @@ if ((*it)->isLayoutType()) { ObjectTypeLayout* l = reinterpret_cast<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, &argc, &argv)) { + if (!Shiboken::sequenceToArgcArgv(%PYARG_1, &argc, &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, &argc, &argv)) { + if (!Shiboken::sequenceToArgcArgv(%PYARG_1, &argc, &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(&SbkObject_Type, %0, false, false); + %PYARG_0 = Shiboken::Object::newObject(&SbkObject_Type, %0, false, false); </inject-code> </modify-function> </value-type> |