QGraphicsAnchorLayout: Apply Jan-Arve's patch

Applying the patch sent by email.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>

1 files changed, 19 insertions, 8 deletions

diff --git a/src/gui/graphicsview/qgraph_p.h b/src/gui/graphicsview/qgraph_p.h
index 4a6bc8f..e487eca 100644
--- a/src/gui/graphicsview/qgraph_p.h
+++ b/src/gui/graphicsview/qgraph_p.h
@@ -68,7 +68,8 @@ public:
         return iterator(this,false);
     }
 
-    EdgeData *edgeData(Vertex *first, Vertex *second) {
+    EdgeData *edgeData(Vertex* first, Vertex* second) {
+        Q_ASSERT(m_graph.value(first));
         return m_graph.value(first)->value(second);
     }
 
@@ -81,11 +82,20 @@ public:
 
     void removeEdge(Vertex *first, Vertex *second)
     {
-        // Creates a bidirectional edge
+        // Removes a bidirectional edge
         EdgeData *data = edgeData(first, second);
+        removeDirectedEdge(first, second);
+        removeDirectedEdge(second, first);
         if (data) delete data;
+    }
+
+    EdgeData *takeEdge(Vertex* first, Vertex* second)
+    {
+        // Removes a bidirectional edge
+        EdgeData *data = edgeData(first, second);
         removeDirectedEdge(first, second);
         removeDirectedEdge(second, first);
+        return data;
     }
 
     QList<Vertex *> adjacentVertices(Vertex *vertex) const
@@ -163,12 +173,13 @@ protected:
     void removeDirectedEdge(Vertex *from, Vertex *to)
     {
         QHash<Vertex *, EdgeData *> *adjacentToFirst = m_graph.value(from);
-        adjacentToFirst->remove(to);
-        if (adjacentToFirst->isEmpty()) {
-           //nobody point to 'from' so we can remove it from the graph
-           QHash<Vertex *, EdgeData *> *adjacentToFirst = m_graph.take(from);
-           delete adjacentToFirst;
-           delete from;
+        if (adjacentToFirst) {
+            adjacentToFirst->remove(to);
+            if (adjacentToFirst->isEmpty()) {
+                //nobody point to 'from' so we can remove it from the graph
+                m_graph.remove(from);
+                delete adjacentToFirst;
+            }
         }
     }