Changeset 1643:9285f3777553 in lemon-0.x for gui/graph_displayer_canvas.h

Timestamp:

08/18/05 15:33:49 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2156

Message:

• The number of gcc-4.0 warnings has significantly decreases.
• Some code clean-up in gui

File:

• gui/graph_displayer_canvas.h (modified) (3 diffs)

gui/graph_displayer_canvas.h

@@ -24 +24 @@
   ///Changes the linewidth attribute according to the given map.
   ///\param mapname is the name of the map which contains the new values
-  int changeEdgeWidth (std::string mapname, Graph::Edge new_item=INVALID);
+  int changeEdgeWidth (std::string mapname, Edge new_item=INVALID);
 
   ///Changes the linecolor attribute according to the given map.
   ///\param mapname is the name of the map which contains the new values
-  int changeEdgeColor (std::string mapname, Graph::Edge new_item=INVALID);
+  int changeEdgeColor (std::string mapname, Edge new_item=INVALID);
 
   ///Changes the text of line attribute according to the given map.
   ///\param mapname is the name of the map which contains the new values
-  int changeEdgeText (std::string mapname, Graph::Edge new_item=INVALID);
+  int changeEdgeText (std::string mapname, Edge new_item=INVALID);
 
   ///Changes the linewidth attribute according to the given map.
   ///\param mapname is the name of the map which contains the new values
-  int changeNodeRadius (std::string mapname, Graph::Node new_item=INVALID);
+  int changeNodeRadius (std::string mapname, Node new_item=INVALID);
 
   ///Changes the linecolor attribute according to the given map.
   ///\param mapname is the name of the map which contains the new values
-  int changeNodeColor (std::string mapname, Graph::Node new_item=INVALID);
+  int changeNodeColor (std::string mapname, Node new_item=INVALID);
 
   ///Changes the text of line attribute according to the given map.
   ///\param mapname is the name of the map which contains the new values
-  int changeNodeText (std::string mapname, Graph::Node new_item=INVALID);
+  int changeNodeText (std::string mapname, Node new_item=INVALID);
 
   ///Callback for 'ViewZoomIn' action.
@@ -120 +120 @@
 private:
   ///Deletes the given element.
-  void deleteItem(NodeIt);
+  void deleteItem(Node);
   ///Deletes the given element.
-  void deleteItem(EdgeIt);
-  ///Deletes the given element.
-  void deleteItem(Graph::Edge);
+  void deleteItem(Edge);
 
 private:
@@ -167 +165 @@
   ///2. we would like to handle only ony item per movement, therefore quering it is not a working solution
   Gnome::Canvas::Item * active_item, * target_item;
-  Graph::NodeIt active_node;
-  Graph::EdgeIt active_edge;
-  Graph::EdgeIt forming_edge;
+  Node active_node;
+  Edge active_edge;
+  Edge forming_edge;
 
   std::string nodemap_to_edit, edgemap_to_edit;