summaryrefslogtreecommitdiffstats
path: root/libshiboken/conversions.h
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-11-19 16:56:22 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-11-19 16:56:22 -0200
commit36b1807b8c5fe75faf87a593ac0e1d7e9ac8b887 (patch)
tree7abdab9e114a8837f01d093634063848ef6975a1 /libshiboken/conversions.h
parentb2096155a231797afd397acc8908acb691f3c732 (diff)
downloadshiboken-36b1807b8c5fe75faf87a593ac0e1d7e9ac8b887.tar.gz
shiboken-36b1807b8c5fe75faf87a593ac0e1d7e9ac8b887.tar.xz
shiboken-36b1807b8c5fe75faf87a593ac0e1d7e9ac8b887.zip
Rename SbkBaseType back to SbkObjectType.
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 d6a3dd5e..afc4989f 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -99,7 +99,7 @@ struct CppObjectCopier<T, true>
{
static inline T* copy(const T& obj)
{
- return reinterpret_cast<T*>(BaseType::copy(reinterpret_cast<SbkBaseType*>(SbkType<T>()), &obj));
+ return reinterpret_cast<T*>(BaseType::copy(reinterpret_cast<SbkObjectType*>(SbkType<T>()), &obj));
}
};
@@ -113,7 +113,7 @@ inline PyObject* createWrapper(const T* cppobj, bool hasOwnership = false, bool
const char* typeName = 0;
if (!isExactType)
typeName = typeid(*const_cast<T*>(cppobj)).name();
- return Wrapper::newObject(reinterpret_cast<SbkBaseType*>(SbkType<T>()),
+ return Wrapper::newObject(reinterpret_cast<SbkObjectType*>(SbkType<T>()),
const_cast<T*>(cppobj), hasOwnership, isExactType, typeName);
}
@@ -213,7 +213,7 @@ struct ValueTypeConverter
{
if (PyObject_TypeCheck(pyobj, SbkType<T>()))
return true;
- SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(SbkType<T>());
+ SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<T>());
return BaseType::isExternalConvertible(shiboType, pyobj);
}
static inline PyObject* toPython(void* cppobj) { return toPython(*reinterpret_cast<T*>(cppobj)); }
@@ -231,7 +231,7 @@ struct ValueTypeConverter
static inline T toCpp(PyObject* pyobj)
{
if (!PyObject_TypeCheck(pyobj, SbkType<T>())) {
- SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(SbkType<T>());
+ SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<T>());
if (BaseType::hasExternalCppConversions(shiboType) && isConvertible(pyobj)) {
T* cptr = reinterpret_cast<T*>(BaseType::callExternalCppConversion(shiboType, pyobj));
std::auto_ptr<T> cptr_auto_ptr(cptr);
@@ -271,7 +271,7 @@ struct ObjectTypeConverter
{
if (pyobj == Py_None)
return 0;
- SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(pyobj->ob_type);
+ SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(pyobj->ob_type);
if (BaseType::hasCast(shiboType))
return reinterpret_cast<T*>(BaseType::cast(shiboType, reinterpret_cast<SbkObject*>(pyobj), SbkType<T>()));
return (T*) Wrapper::cppPointer(reinterpret_cast<SbkObject*>(pyobj), SbkType<T>());