From 3d1dde2be4b071b02a5abb4df23d1a6aa3a52411 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Mon, 21 Jul 2014 14:11:59 +0200
Subject: [PATCH] QmlDesigner:  reduce complexity in DragTool::dragMoveEvent

Change-Id: Icacf450bfdb6dac277ec37d1e1c61145035b3913
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 .../components/formeditor/dragtool.cpp        | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
index f72fe435816..f2c28ebd986 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
@@ -334,25 +334,21 @@ void DragTool::createDragNode(const QMimeData *mimeData, const QPointF &scenePos
 
 void DragTool::dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event)
 {
-    if (!m_blockMove) {
-        if (!m_isAborted) {
-            if (canHandleMimeData(event->mimeData())) {
-                event->accept();
-                if (m_dragNode.isValid()) {
-                    FormEditorItem *targetContainerItem = targetContainerOrRootItem(itemList);
-                    if (targetContainerItem) {
-                        move(event->scenePos(), itemList);
-                    } else {
-                        end();
-                        m_dragNode.destroy();
-                    }
-                } else {
-                    createDragNode(event->mimeData(), event->scenePos(), itemList);
-                }
+    if (!m_blockMove && !m_isAborted && canHandleMimeData(event->mimeData())) {
+        event->accept();
+        if (m_dragNode.isValid()) {
+            FormEditorItem *targetContainerItem = targetContainerOrRootItem(itemList);
+            if (targetContainerItem) {
+                move(event->scenePos(), itemList);
+            } else {
+                end();
+                m_dragNode.destroy();
             }
         } else {
-            event->ignore();
+            createDragNode(event->mimeData(), event->scenePos(), itemList);
         }
+    } else{
+        event->ignore();
     }
 }