Updated ObjectType and ObjectTypeLayout to resemble the Qt's QLayout class.

Also added more test cases that use ObjectTypeLayout.

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/libsample/objecttypelayout.cpp b/tests/libsample/objecttypelayout.cpp
index 06c4555b4..92180418f 100644
--- a/tests/libsample/objecttypelayout.cpp
+++ b/tests/libsample/objecttypelayout.cpp
@@ -33,9 +33,26 @@
 */
 
 #include "objecttypelayout.h"
+#include <iostream>
+
+using namespace std;
 
 void ObjectTypeLayout::addObject(ObjectType* obj)
 {
+    if (obj->isLayoutType()) {
+        ObjectTypeLayout* l = reinterpret_cast<ObjectTypeLayout*>(obj);
+        if (l->parent()) {
+            cerr << "[WARNING] ObjectTypeLayout::addObject: layout '" << l->objectName().cstring();
+            cerr << "' already has a parent." << endl;
+            return;
+        }
+
+        l->setParent(this);
+
+        if (parent() && !parent()->isLayoutType())
+            l->reparentChildren(parent());
+    }
+
     m_objects.push_back(obj);
 }
 
@@ -43,3 +60,15 @@ std::list< ObjectType* > ObjectTypeLayout::objects() const
 {
     return m_objects;
 }
+
+void ObjectTypeLayout::reparentChildren(ObjectType* parent)
+{
+    std::list<ObjectType*>::const_iterator it = m_objects.begin();
+    for (; it != m_objects.end(); ++it) {
+        if ((*it)->isLayoutType())
+            reinterpret_cast<ObjectTypeLayout*>(*it)->reparentChildren(parent);
+        else
+            (*it)->setParent(parent);
+    }
+}
+