aboutsummaryrefslogtreecommitdiffstats
path: root/libshiboken/conversions.h
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-11-09 18:42:02 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:08:56 -0300
commite3148eaf9a7be5633d1ff4339ba94f0a9f085930 (patch)
treecf8dc033aa20ccd9efe24c6eb18ea9be1b9224ec /libshiboken/conversions.h
parent0151116f107393fe342fb491e68d67edefc33ddb (diff)
setCppPointer and getCppPointer moved to namespace Shiboken::Wrapper
Diffstat (limited to 'libshiboken/conversions.h')
-rw-r--r--libshiboken/conversions.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index e443dad17..4cead3439 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -150,7 +150,7 @@ struct Converter<T*>
static T* toCpp(PyObject* pyobj)
{
if (Shiboken_TypeCheck(pyobj, T))
- return (T*) getCppPointer(pyobj, SbkType<T>());
+ return (T*) Wrapper::cppPointer(pyobj, SbkType<T>());
else if (Converter<T>::isConvertible(pyobj))
return CppObjectCopier<T>::copy(Converter<T>::toCpp(pyobj));
@@ -243,7 +243,7 @@ struct ValueTypeConverter
}
assert(false);
}
- return *reinterpret_cast<T*>(getCppPointer(pyobj, SbkType<T>()));
+ return *reinterpret_cast<T*>(Wrapper::cppPointer(pyobj, SbkType<T>()));
}
};
@@ -277,8 +277,8 @@ struct ObjectTypeConverter
return 0;
SbkBaseWrapperType* shiboType = reinterpret_cast<SbkBaseWrapperType*>(pyobj->ob_type);
if (shiboType->mi_specialcast)
- return (T*) shiboType->mi_specialcast(getCppPointer(pyobj, SbkType<T>()), reinterpret_cast<SbkBaseWrapperType*>(SbkType<T>()));
- return (T*) getCppPointer(pyobj, SbkType<T>());
+ return (T*) shiboType->mi_specialcast(Wrapper::cppPointer(pyobj, SbkType<T>()), reinterpret_cast<SbkBaseWrapperType*>(SbkType<T>()));
+ return (T*) Wrapper::cppPointer(pyobj, SbkType<T>());
}
};
@@ -587,7 +587,7 @@ struct StdListConverter
static StdList toCpp(PyObject* pyobj)
{
if (PyObject_TypeCheck(pyobj, SbkType<StdList>()))
- return *reinterpret_cast<StdList*>(getCppPointer(pyobj, SbkType<StdList>()));
+ return *reinterpret_cast<StdList*>(Wrapper::cppPointer(pyobj, SbkType<StdList>()));
StdList result;
for (int i = 0; i < PySequence_Size(pyobj); i++) {