diff options
author | Hugo Lima <hugo.lima@openbossa.org> | 2010-03-29 18:08:42 -0300 |
---|---|---|
committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-03-30 17:41:39 -0300 |
commit | 6046687f8f78e1b674e7b4265ce5fb93dce078eb (patch) | |
tree | 79a3112183e662212ab5aa553f3a2dcaaedf3f9f /libshiboken/basewrapper.cpp | |
parent | 8af03b6247eb8620ebc91bed8006206a70e24d79 (diff) |
Removed "Shibo" prefix from ShiboParent and ShiboChildrenList.
We are under Shiboken namespace, so there is no need for yet another prefix.
Diffstat (limited to 'libshiboken/basewrapper.cpp')
-rw-r--r-- | libshiboken/basewrapper.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp index 7bcd09ff8..620021700 100644 --- a/libshiboken/basewrapper.cpp +++ b/libshiboken/basewrapper.cpp @@ -47,7 +47,7 @@ void removeParent(SbkBaseWrapper* child) if (!child->parentInfo->parent) return; - ShiboChildrenList& oldBrothers = child->parentInfo->parent->parentInfo->children; + ChildrenList& oldBrothers = child->parentInfo->parent->parentInfo->children; oldBrothers.remove(child); child->parentInfo->parent = 0; Py_DECREF(child); @@ -77,13 +77,13 @@ void setParent(PyObject* parent, PyObject* child) SbkBaseWrapper* parent_ = reinterpret_cast<SbkBaseWrapper*>(parent); SbkBaseWrapper* child_ = reinterpret_cast<SbkBaseWrapper*>(child); if (!child_->parentInfo) - child_->parentInfo = new ShiboParentInfo; + child_->parentInfo = new ParentInfo; if (!parentIsNull) { if (!parent_->parentInfo) - parent_->parentInfo = new ShiboParentInfo; + parent_->parentInfo = new ParentInfo; // do not re-add a child - ShiboChildrenList& children = parent_->parentInfo->children; + ChildrenList& children = parent_->parentInfo->children; if (std::find(children.begin(), children.end(), child_) != children.end()) return; } @@ -111,7 +111,7 @@ static void _destroyParentInfo(SbkBaseWrapper* obj, bool removeFromParent) { if (removeFromParent && obj->parentInfo->parent) removeParent(obj); - ShiboChildrenList::iterator it = obj->parentInfo->children.begin(); + ChildrenList::iterator it = obj->parentInfo->children.begin(); for (; it != obj->parentInfo->children.end(); ++it) { SbkBaseWrapper*& child = *it; _destroyParentInfo(child, false); |