From ffac87c44a3cc8e2941fb49d08d2df6ba52562e3 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Tue, 5 Oct 2010 13:19:23 +0200
Subject: [PATCH] QmlDesigner.NodeInstances: Cleanup paint methode

Reviewed-By: Thomas Hartmann
---
 .../instances/graphicsobjectnodeinstance.cpp  | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
index 65b15d4d130..83232f53f28 100644
--- a/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
@@ -195,23 +195,20 @@ void GraphicsObjectNodeInstance::paintRecursively(QGraphicsItem *graphicsItem, Q
 
 void GraphicsObjectNodeInstance::paint(QPainter *painter) const
 {
-    painter->save();
-    Q_ASSERT(graphicsObject());
-    if (hasContent()) {
-        QStyleOptionGraphicsItem option;
-        initOption(graphicsObject(), &option, painter->transform());
-        graphicsObject()->paint(painter, &option);
+    if (graphicsObject()) {
+        painter->save();
+        if (hasContent()) {
+            QStyleOptionGraphicsItem option;
+            initOption(graphicsObject(), &option, painter->transform());
+            graphicsObject()->paint(painter, &option);
 
-    }
-    foreach(QGraphicsItem *graphicsItem, graphicsObject()->childItems()) {
-        QGraphicsObject *graphicsObject = qgraphicsitem_cast<QGraphicsObject*>(graphicsItem);
-        if (graphicsObject
-            && !nodeInstanceView()->hasInstanceForObject(graphicsObject))
+        }
+
+        foreach(QGraphicsItem *graphicsItem, graphicsObject()->childItems())
             paintRecursively(graphicsItem, painter);
+
+        painter->restore();
     }
-
-
-    painter->restore();
 }
 
 QPair<QGraphicsObject*, bool> GraphicsObjectNodeInstance::createGraphicsObject(const NodeMetaInfo &metaInfo, QDeclarativeContext *context)