Add removeChild and killChild to ObjectType test

2 files changed, 27 insertions, 7 deletions

diff --git a/tests/libsample/objecttype.cpp b/tests/libsample/objecttype.cpp
index e6a42d6d8..711a72f5b 100644
--- a/tests/libsample/objecttype.cpp
+++ b/tests/libsample/objecttype.cpp
@@ -53,24 +53,42 @@ ObjectType::~ObjectType()
 }
 
 void
+ObjectType::removeChild(const ObjectType *child)
+{
+    for(ObjectTypeList::iterator child_iter = m_children.begin();
+        child_iter != m_children.end(); child_iter++) {
+        if (this == *child_iter)
+            m_children.erase(child_iter);
+    }
+}
+
+void
 ObjectType::setParent(ObjectType* parent)
 {
     if (m_parent == parent)
         return;
 
-    if (m_parent) {
-        for(ObjectTypeList::iterator child_iter = m_parent->m_children.begin();
-            child_iter != m_parent->m_children.end(); child_iter++) {
-            if (this == *child_iter)
-                m_parent->m_children.erase(child_iter);
-        }
-    }
+    if (m_parent)
+        m_parent->removeChild(this);
 
     m_parent = parent;
     if (m_parent)
         m_parent->m_children.push_back(this);
 }
 
+void ObjectType::killChild(const Str &name)
+{
+    for (ObjectTypeList::iterator child_iter = m_children.begin();
+         child_iter != m_children.end(); child_iter++) {
+
+        if ((*child_iter)->objectName() == name) {
+            this->removeChild(*child_iter);
+            delete *child_iter;
+            break;
+        }
+    }
+}
+
 void
 ObjectType::setObjectName(const Str& name)
 {
diff --git a/tests/libsample/objecttype.h b/tests/libsample/objecttype.h
index 8a97c669a..74b6e40e6 100644
--- a/tests/libsample/objecttype.h
+++ b/tests/libsample/objecttype.h
@@ -68,6 +68,8 @@ public:
     void setParent(ObjectType* parent);
     ObjectType* parent() const { return m_parent; }
     const ObjectTypeList& children() const { return m_children; }
+    void killChild(const Str& name);
+    void removeChild(const ObjectType *child);
 
     Str objectName() const;
     void setObjectName(const Str& name);