summaryrefslogtreecommitdiffstats
path: root/libshiboken/conversions.h
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-11-19 17:56:10 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-11-23 13:37:10 -0200
commitea46607ca87ce2233529c8177ab51424337613d2 (patch)
treec26635ef06122ccc296a32fa3d9057636b65413c /libshiboken/conversions.h
parent36b1807b8c5fe75faf87a593ac0e1d7e9ac8b887 (diff)
downloadshiboken-ea46607ca87ce2233529c8177ab51424337613d2.tar.gz
shiboken-ea46607ca87ce2233529c8177ab51424337613d2.tar.xz
shiboken-ea46607ca87ce2233529c8177ab51424337613d2.zip
namespace Shiboken::BaseType renamed to Shiboken::ObjectType.
Diffstat (limited to 'libshiboken/conversions.h')
-rw-r--r--libshiboken/conversions.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index afc4989f..5d0048fe 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<SbkObjectType*>(SbkType<T>()), &obj));
+ return reinterpret_cast<T*>(ObjectType::copy(reinterpret_cast<SbkObjectType*>(SbkType<T>()), &obj));
}
};
@@ -214,7 +214,7 @@ struct ValueTypeConverter
if (PyObject_TypeCheck(pyobj, SbkType<T>()))
return true;
SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<T>());
- return BaseType::isExternalConvertible(shiboType, pyobj);
+ return ObjectType::isExternalConvertible(shiboType, pyobj);
}
static inline PyObject* toPython(void* cppobj) { return toPython(*reinterpret_cast<T*>(cppobj)); }
static inline PyObject* toPython(const T& cppobj)
@@ -232,8 +232,8 @@ struct ValueTypeConverter
{
if (!PyObject_TypeCheck(pyobj, SbkType<T>())) {
SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<T>());
- if (BaseType::hasExternalCppConversions(shiboType) && isConvertible(pyobj)) {
- T* cptr = reinterpret_cast<T*>(BaseType::callExternalCppConversion(shiboType, pyobj));
+ if (ObjectType::hasExternalCppConversions(shiboType) && isConvertible(pyobj)) {
+ T* cptr = reinterpret_cast<T*>(ObjectType::callExternalCppConversion(shiboType, pyobj));
std::auto_ptr<T> cptr_auto_ptr(cptr);
return *cptr;
}
@@ -272,8 +272,8 @@ struct ObjectTypeConverter
if (pyobj == Py_None)
return 0;
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>()));
+ if (ObjectType::hasCast(shiboType))
+ return reinterpret_cast<T*>(ObjectType::cast(shiboType, reinterpret_cast<SbkObject*>(pyobj), SbkType<T>()));
return (T*) Wrapper::cppPointer(reinterpret_cast<SbkObject*>(pyobj), SbkType<T>());
}
};