1.1 --- a/gui/graph_displayer_canvas.h	Wed Jun 29 12:52:20 2005 +0000
     1.2 +++ b/gui/graph_displayer_canvas.h	Wed Jun 29 15:41:33 2005 +0000
     1.3 @@ -70,7 +70,7 @@
     1.4    ///reaction of any action happened in the territory
     1.5    ///of the canvas
     1.6    ///DEPRECATED!!!!
     1.7 -  bool event_handler(GdkEvent* e, Node n);
     1.8 +  bool eventHandler(GdkEvent* e, Node n);
     1.9  
    1.10    ///actual event handler
    1.11    ///
    1.12 @@ -78,38 +78,38 @@
    1.13    sigc::connection actual_handler;
    1.14  
    1.15    ///event handler for the case when move-tool is active
    1.16 -  bool move_event_handler(GdkEvent*);
    1.17 +  bool moveEventHandler(GdkEvent*);
    1.18    ///event handler for the case when create_node-tool is active
    1.19 -  bool create_node_event_handler(GdkEvent*);
    1.20 +  bool createNodeEventHandler(GdkEvent*);
    1.21    ///event handler for the case when create_edge-tool is active
    1.22 -  bool create_edge_event_handler(GdkEvent*);
    1.23 +  bool createEdgeEventHandler(GdkEvent*);
    1.24    ///event handler for the case when eraser-tool is active
    1.25 -  bool eraser_event_handler(GdkEvent*);
    1.26 +  bool eraserEventHandler(GdkEvent*);
    1.27    ///event handler for the case when eraser-tool is active
    1.28 -  bool edge_map_edit_event_handler(GdkEvent*);
    1.29 +  bool edgeMapEditEventHandler(GdkEvent*);
    1.30  
    1.31  public:
    1.32    ///Moves the text to new place
    1.33 -  void text_reposition(xy<double>);
    1.34 +  void textReposition(xy<double>);
    1.35    ///Activates an edge belonging to a BrokenEdge
    1.36 -  void toggle_edge_activity(BrokenEdge*, bool);
    1.37 +  void toggleEdgeActivity(BrokenEdge*, bool);
    1.38  
    1.39  public:
    1.40    ///\return the actual tool in hand
    1.41 -  int get_actual_tool();
    1.42 +  int getActualTool();
    1.43  
    1.44  private:
    1.45    ///Deletes the given element.
    1.46 -  void delete_item(NodeIt);
    1.47 +  void deleteItem(NodeIt);
    1.48    ///Deletes the given element.
    1.49 -  void delete_item(EdgeIt);
    1.50 +  void deleteItem(EdgeIt);
    1.51    ///Deletes the given element.
    1.52 -  void delete_item(Graph::Edge);
    1.53 +  void deleteItem(Graph::Edge);
    1.54  
    1.55  private:
    1.56  
    1.57    ///The graph, on which we work
    1.58 -  Graph g;
    1.59 +  Graph & g;
    1.60  
    1.61    ///Map of nodes of graph
    1.62    Graph::NodeMap<Gnome::Canvas::Ellipse *> nodesmap;