aboutsummaryrefslogtreecommitdiffstats
path: root/libshiboken/bindingmanager.cpp
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2009-12-08 11:59:57 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2009-12-08 12:09:49 -0300
commitf38e34a3a987f15e947d45efb0ef7ffeb7f3275e (patch)
tree4908d7da9ea33cb6e19378633e0a401b57c0ef65 /libshiboken/bindingmanager.cpp
parentdc1ca0f9a9aa216973a6ab1f458f0f965033530d (diff)
Renamed a lot of Shiboken things with "Py" prefix to use "Sbk" prefix.
To avoid confusion of Python stuff with Shiboken generated stuff. For example: a C++ class called "String" would have the PyString_Type wrapper generated for it, mixing with the proper Python PyString_Type; now the generate code will have things like SbkString_Type, SbkString_New, SbkString_someMethod, and so on. PyBaseWrapper and its variants were renamed to SbkBaseWrapper. PyType<T>() is now SbkType<T>() PyEnumObject was renamed to SbkEnumObject.
Diffstat (limited to 'libshiboken/bindingmanager.cpp')
-rw-r--r--libshiboken/bindingmanager.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/libshiboken/bindingmanager.cpp b/libshiboken/bindingmanager.cpp
index 5788b1108..6b08829e7 100644
--- a/libshiboken/bindingmanager.cpp
+++ b/libshiboken/bindingmanager.cpp
@@ -86,7 +86,7 @@ void BindingManager::assignWrapper(PyObject* wrapper, const void* cptr)
void BindingManager::releaseWrapper(PyObject* wrapper)
{
- void* cptr = PyBaseWrapper_cptr(wrapper);
+ void* cptr = SbkBaseWrapper_cptr(wrapper);
m_d->releaseWrapper(cptr);
if (((ShiboTypeObject*) wrapper->ob_type)->mi_offsets) {
int* offset = ((ShiboTypeObject*) wrapper->ob_type)->mi_offsets;
@@ -138,14 +138,14 @@ PyObject* BindingManager::getOverride(const void* cptr, const char* methodName)
return 0;
}
-void BindingManager::invalidateWrapper(PyBaseWrapper* wrapper)
+void BindingManager::invalidateWrapper(SbkBaseWrapper* wrapper)
{
- if (!PyBaseWrapper_validCppObject(wrapper))
+ if (!SbkBaseWrapper_validCppObject(wrapper))
return;
- PyBaseWrapper_setValidCppObject(wrapper, false);
- PyBaseWrapper_setOwnership(wrapper, false);
+ SbkBaseWrapper_setValidCppObject(wrapper, false);
+ SbkBaseWrapper_setOwnership(wrapper, false);
// If it is a parent invalidate all children.
- if (PyBaseWrapper_hasParentInfo(wrapper)) {
+ if (SbkBaseWrapper_hasParentInfo(wrapper)) {
ShiboChildrenList::iterator it = wrapper->parentInfo->children.begin();
for (; it != wrapper->parentInfo->children.end(); ++it)
invalidateWrapper(*it);
@@ -160,13 +160,13 @@ void BindingManager::invalidateWrapper(const void* cptr)
invalidateWrapper(iter->second);
}
-void BindingManager::transferOwnershipToCpp(PyBaseWrapper* wrapper)
+void BindingManager::transferOwnershipToCpp(SbkBaseWrapper* wrapper)
{
if (wrapper->parentInfo)
Shiboken::removeParent(wrapper);
- if (PyBaseWrapper_containsCppWrapper(wrapper))
- PyBaseWrapper_setOwnership(wrapper, false);
+ if (SbkBaseWrapper_containsCppWrapper(wrapper))
+ SbkBaseWrapper_setOwnership(wrapper, false);
else
invalidateWrapper(wrapper);
}