From b31bc37dca4fe47d16e00519dd9441c15a990689 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Tue, 29 Nov 2016 14:39:05 +0100
Subject: [PATCH] Scxml: Simplify code

Change-Id: Ia1ea8527054a9c94e5f40cca665f7f4b0a5c53e7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
index 4e531934587..abbe889472e 100644
--- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
@@ -492,7 +492,7 @@ void GraphicsScene::endTagChange(ScxmlDocument::TagChange change, ScxmlTag *tag,
 
         if (childItem) {
             BaseItem *newParentItem = findItem(tag->parentTag());
-            BaseItem *oldParentItem = childItem ? childItem->parentBaseItem() : nullptr;
+            BaseItem *oldParentItem = childItem->parentBaseItem();
 
             QPointF sPos = childItem->scenePos();
             if (oldParentItem) {