From 05f6cc364ff1c559ea59eeafa9835b74ec14947e Mon Sep 17 00:00:00 2001
From: Aleksei Kanash <sc.kanash.aleksei@gmail.com>
Date: Mon, 3 Sep 2012 19:25:42 +0300
Subject: [PATCH] Additional fix to Sankore-979 - improved cleaning mechanism
 for items on board.

---
 src/domain/UBGraphicsGroupContainerItem.cpp | 14 ++++++++++++++
 src/domain/UBGraphicsGroupContainerItem.h   |  2 ++
 src/frameworks/UBCoreGraphicsScene.cpp      | 14 +++-----------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/domain/UBGraphicsGroupContainerItem.cpp b/src/domain/UBGraphicsGroupContainerItem.cpp
index 10be1c4d..95b95af3 100644
--- a/src/domain/UBGraphicsGroupContainerItem.cpp
+++ b/src/domain/UBGraphicsGroupContainerItem.cpp
@@ -79,6 +79,8 @@ void UBGraphicsGroupContainerItem::addToGroup(QGraphicsItem *item)
     item->setPos(mapFromItem(item, 0, 0));
 
     item->scene()->removeItem(item);
+    if (corescene())
+        corescene()->removeItemFromDeletion(item);
     item->setParentItem(this);
 
     // removing position from translation component of the new transform
@@ -225,6 +227,18 @@ void UBGraphicsGroupContainerItem::destroy() {
     remove();
 }
 
+void UBGraphicsGroupContainerItem::clearSource()
+{
+    foreach(QGraphicsItem *child, childItems())
+    {
+        UBGraphicsItem *item = dynamic_cast<UBGraphicsItem *>(child);
+        if (item)
+        {
+            item->clearSource();
+        }
+    }
+}
+
 void UBGraphicsGroupContainerItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (mDelegate->mousePressEvent(event)) {
diff --git a/src/domain/UBGraphicsGroupContainerItem.h b/src/domain/UBGraphicsGroupContainerItem.h
index 00f643d3..e8fa77eb 100644
--- a/src/domain/UBGraphicsGroupContainerItem.h
+++ b/src/domain/UBGraphicsGroupContainerItem.h
@@ -39,6 +39,8 @@ public:
     virtual void setUuid(const QUuid &pUuid);
     void destroy();
 
+    virtual void clearSource();
+
 protected:
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
diff --git a/src/frameworks/UBCoreGraphicsScene.cpp b/src/frameworks/UBCoreGraphicsScene.cpp
index 1f306425..69297da7 100644
--- a/src/frameworks/UBCoreGraphicsScene.cpp
+++ b/src/frameworks/UBCoreGraphicsScene.cpp
@@ -52,6 +52,8 @@ UBCoreGraphicsScene::~UBCoreGraphicsScene()
 
 void UBCoreGraphicsScene::addItem(QGraphicsItem* item)
 {
+    addItemToDeletion(item);
+
     if (item->type() == UBGraphicsGroupContainerItem::Type && item->childItems().count()) {
         foreach (QGraphicsItem *curItem, item->childItems()) {
             removeItemFromDeletion(curItem);
@@ -76,17 +78,7 @@ bool UBCoreGraphicsScene::deleteItem(QGraphicsItem* item)
 {
     if(mItemsToDelete.contains(item))
     {
-        UBGraphicsItem* item_casted = 0;
-        switch (item->type())
-        {
-        case UBGraphicsMediaItem::Type:
-                item_casted = dynamic_cast<UBGraphicsMediaItem*>(item);
-                break;
-        case UBGraphicsW3CWidgetItem::Type:
-                item_casted = dynamic_cast<UBGraphicsWidgetItem*>(item);
-                break;
-        }
-
+        UBGraphicsItem *item_casted = dynamic_cast<UBGraphicsItem *>(item);
         if (0 != item_casted)
             item_casted->clearSource();