1.1 --- a/graph_displayer_canvas.h	Wed Aug 17 15:20:18 2005 +0000
     1.2 +++ b/graph_displayer_canvas.h	Thu Aug 18 13:33:49 2005 +0000
     1.3 @@ -23,27 +23,27 @@
     1.4  
     1.5    ///Changes the linewidth attribute according to the given map.
     1.6    ///\param mapname is the name of the map which contains the new values
     1.7 -  int changeEdgeWidth (std::string mapname, Graph::Edge new_item=INVALID);
     1.8 +  int changeEdgeWidth (std::string mapname, Edge new_item=INVALID);
     1.9  
    1.10    ///Changes the linecolor attribute according to the given map.
    1.11    ///\param mapname is the name of the map which contains the new values
    1.12 -  int changeEdgeColor (std::string mapname, Graph::Edge new_item=INVALID);
    1.13 +  int changeEdgeColor (std::string mapname, Edge new_item=INVALID);
    1.14  
    1.15    ///Changes the text of line attribute according to the given map.
    1.16    ///\param mapname is the name of the map which contains the new values
    1.17 -  int changeEdgeText (std::string mapname, Graph::Edge new_item=INVALID);
    1.18 +  int changeEdgeText (std::string mapname, Edge new_item=INVALID);
    1.19  
    1.20    ///Changes the linewidth attribute according to the given map.
    1.21    ///\param mapname is the name of the map which contains the new values
    1.22 -  int changeNodeRadius (std::string mapname, Graph::Node new_item=INVALID);
    1.23 +  int changeNodeRadius (std::string mapname, Node new_item=INVALID);
    1.24  
    1.25    ///Changes the linecolor attribute according to the given map.
    1.26    ///\param mapname is the name of the map which contains the new values
    1.27 -  int changeNodeColor (std::string mapname, Graph::Node new_item=INVALID);
    1.28 +  int changeNodeColor (std::string mapname, Node new_item=INVALID);
    1.29  
    1.30    ///Changes the text of line attribute according to the given map.
    1.31    ///\param mapname is the name of the map which contains the new values
    1.32 -  int changeNodeText (std::string mapname, Graph::Node new_item=INVALID);
    1.33 +  int changeNodeText (std::string mapname, Node new_item=INVALID);
    1.34  
    1.35    ///Callback for 'ViewZoomIn' action.
    1.36    virtual void zoomIn();
    1.37 @@ -119,11 +119,9 @@
    1.38  
    1.39  private:
    1.40    ///Deletes the given element.
    1.41 -  void deleteItem(NodeIt);
    1.42 +  void deleteItem(Node);
    1.43    ///Deletes the given element.
    1.44 -  void deleteItem(EdgeIt);
    1.45 -  ///Deletes the given element.
    1.46 -  void deleteItem(Graph::Edge);
    1.47 +  void deleteItem(Edge);
    1.48  
    1.49  private:
    1.50  
    1.51 @@ -166,9 +164,9 @@
    1.52    ///1. we cannot query the item at he cursor as fast as it could not cause a Segmentation Fault
    1.53    ///2. we would like to handle only ony item per movement, therefore quering it is not a working solution
    1.54    Gnome::Canvas::Item * active_item, * target_item;
    1.55 -  Graph::NodeIt active_node;
    1.56 -  Graph::EdgeIt active_edge;
    1.57 -  Graph::EdgeIt forming_edge;
    1.58 +  Node active_node;
    1.59 +  Edge active_edge;
    1.60 +  Edge forming_edge;
    1.61  
    1.62    std::string nodemap_to_edit, edgemap_to_edit;
    1.63