From 9e701f76f7478ea078e58076c91fee0d2ec505b4 Mon Sep 17 00:00:00 2001
From: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Date: Mon, 29 Jun 2009 15:07:17 -0300
Subject: QGraphicsAnchorLayoutPrivate: Avoiding extra loops in getGraphParts

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index 9413ec3..26207e1 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -1327,12 +1327,14 @@ QGraphicsAnchorLayoutPrivate::getGraphParts(Orientation orientation)
     }
 
     QList<QSimplexConstraint *> trunkConstraints;
+    QList<QSimplexConstraint *> nonTrunkConstraints;
     QSet<QSimplexVariable *> trunkVariables;
 
     trunkVariables += edgeL1;
     trunkVariables += edgeL2;
 
     bool dirty;
+    bool hasNonTrunkConstraints = false;
     do {
         dirty = false;
 
@@ -1358,7 +1360,9 @@ QGraphicsAnchorLayoutPrivate::getGraphParts(Orientation orientation)
                 it = remainingConstraints.erase(it);
                 dirty = true;
             } else {
-                ++it;
+                nonTrunkConstraints += c;
+                it = remainingConstraints.erase(it);
+                hasNonTrunkConstraints = true;
             }
         }
     } while (dirty);
@@ -1366,15 +1370,8 @@ QGraphicsAnchorLayoutPrivate::getGraphParts(Orientation orientation)
     QList< QList<QSimplexConstraint *> > result;
     result += trunkConstraints;
 
-    if (!remainingConstraints.isEmpty()) {
-        QList<QSimplexConstraint *> nonTrunkConstraints;
-        QLinkedList<QSimplexConstraint *>::iterator it = remainingConstraints.begin();
-        while (it != remainingConstraints.end()) {
-            nonTrunkConstraints += *it;
-            ++it;
-        }
+    if (hasNonTrunkConstraints)
         result += nonTrunkConstraints;
-    }
 
     return result;
 }
-- 
cgit v0.12