# HG changeset patch
# User alpar
# Date 1125056261 0
# Node ID e40c41eae31f6cfe3ef03f0a47b9dbab039cb5a5
# Parent  422906271d2263c91baf5b0c4bb19b1cdaf93be6
No comment.

diff -r 422906271d22 -r e40c41eae31f gui/all_include.h
--- a/gui/all_include.h	Fri Aug 26 11:03:59 2005 +0000
+++ b/gui/all_include.h	Fri Aug 26 11:37:41 2005 +0000
@@ -42,6 +42,8 @@
 typedef Graph::Node Node;
 typedef Graph::Edge Edge;
 typedef Graph::EdgeIt EdgeIt;
+typedef Graph::InEdgeIt InEdgeIt;
+typedef Graph::OutEdgeIt OutEdgeIt;
 typedef Graph::NodeIt NodeIt;
 
 const std::string prog_name = "LEMON Graph Editor";
diff -r 422906271d22 -r e40c41eae31f gui/graph_displayer_canvas-event.cc
--- a/gui/graph_displayer_canvas-event.cc	Fri Aug 26 11:03:59 2005 +0000
+++ b/gui/graph_displayer_canvas-event.cc	Fri Aug 26 11:37:41 2005 +0000
@@ -141,12 +141,8 @@
         clicked_x=new_x;
         clicked_y=new_y;
 
-	//all the edges connected to the moved point has to be redrawn
-        EdgeIt ei;
 
-        mapstorage.graph.firstOut(ei,active_node);
-
-        for(;ei!=INVALID;mapstorage.graph.nextOut(ei))
+        for(OutEdgeIt ei(mapstorage.graph,active_node);ei!=INVALID;++ei)
         {
             Gnome::Canvas::Points coos;
             double x1, x2, y1, y2;
@@ -173,8 +169,7 @@
 	    edgetextmap[ei]->property_y().set_value(text_pos.y);
         }
 
-        mapstorage.graph.firstIn(ei,active_node);
-        for(;ei!=INVALID;mapstorage.graph.nextIn(ei))
+        for(InEdgeIt ei(mapstorage.graph,active_node);ei!=INVALID;++ei)
         {
             Gnome::Canvas::Points coos;
             double x1, x2, y1, y2;
@@ -483,24 +478,23 @@
 		{
                   mapstorage.modified = true;
 
-		  //collecting edges to delete
-		  EdgeIt e;
 		  std::set<Graph::Edge> edges_to_delete;
 
-		  mapstorage.graph.firstOut(e,active_node);
-		  for(;e!=INVALID;mapstorage.graph.nextOut(e))
+		  for(OutEdgeIt e(mapstorage.graph,active_node);e!=INVALID;++e)
 		    {
 		      edges_to_delete.insert(e);
 		    }
-
-		  mapstorage.graph.firstIn(e,active_node);
-		  for(;e!=INVALID;mapstorage.graph.nextIn(e))
+		  
+		  for(InEdgeIt e(mapstorage.graph,active_node);e!=INVALID;++e)
 		    {
 		      edges_to_delete.insert(e);
 		    }
-
+		  
 		  //deleting collected edges
-		  for(std::set<Graph::Edge>::iterator edge_set_it=edges_to_delete.begin();edge_set_it!=edges_to_delete.end();edge_set_it++)
+		  for(std::set<Graph::Edge>::iterator
+			edge_set_it=edges_to_delete.begin();
+		      edge_set_it!=edges_to_delete.end();
+		      ++edge_set_it)
 		    {
 		      deleteItem(*edge_set_it);
 		    }