1.1 --- a/broken_edge.cc	Wed Jun 29 12:52:20 2005 +0000
     1.2 +++ b/broken_edge.cc	Wed Jun 29 15:41:33 2005 +0000
     1.3 @@ -7,8 +7,8 @@
     1.4  
     1.5    arrow=new Gnome::Canvas::Polygon(g);
     1.6    *arrow << Gnome::Canvas::Properties::fill_color("red");
     1.7 -  arrow->signal_event().connect(sigc::mem_fun(*this, &BrokenEdge::edge_former_event_handler));
     1.8 -  set_points(p);
     1.9 +  arrow->signal_event().connect(sigc::mem_fun(*this, &BrokenEdge::edgeFormerEventHandler));
    1.10 +  setPoints(p);
    1.11  }
    1.12  
    1.13  BrokenEdge::~BrokenEdge()
    1.14 @@ -16,7 +16,7 @@
    1.15    if(arrow)delete(arrow);
    1.16  }
    1.17  
    1.18 -void BrokenEdge::set_points(Gnome::Canvas::Points p, bool move)
    1.19 +void BrokenEdge::setPoints(Gnome::Canvas::Points p, bool move)
    1.20  {
    1.21    bool set_arrow=false;
    1.22    if(!move)
    1.23 @@ -103,24 +103,24 @@
    1.24      }
    1.25  }
    1.26  
    1.27 -bool BrokenEdge::edge_former_event_handler(GdkEvent* e)
    1.28 +bool BrokenEdge::edgeFormerEventHandler(GdkEvent* e)
    1.29  {
    1.30    switch(e->type)
    1.31      {
    1.32      case GDK_BUTTON_PRESS:
    1.33        //we mark the location of the event to be able to calculate parameters of dragging
    1.34 -      if(gdc.get_actual_tool()!=CREATE_NODE)
    1.35 +      if(gdc.getActualTool()!=CREATE_NODE)
    1.36  	{
    1.37 -	  gdc.toggle_edge_activity(this, true);
    1.38 +	  gdc.toggleEdgeActivity(this, true);
    1.39  	  clicked_x=e->button.x;
    1.40  	  clicked_y=e->button.y;
    1.41  	  isbutton=true;
    1.42  	}
    1.43        break;
    1.44      case GDK_BUTTON_RELEASE:
    1.45 -      if(gdc.get_actual_tool()!=CREATE_NODE)
    1.46 +      if(gdc.getActualTool()!=CREATE_NODE)
    1.47  	{
    1.48 -	  gdc.toggle_edge_activity(this, false);
    1.49 +	  gdc.toggleEdgeActivity(this, false);
    1.50  	  isbutton=false;
    1.51  	}
    1.52        break;
    1.53 @@ -142,8 +142,8 @@
    1.54  	  points_new.push_back(my_points[1]=Gnome::Art::Point(my_points[1].get_x()+dx,my_points[1].get_y()+dy));
    1.55  	  points_new.push_back(my_points[2]);
    1.56  
    1.57 -	  set_points(points_new);
    1.58 -	  gdc.text_reposition(xy<double>(my_points[1].get_x(),my_points[1].get_y()));
    1.59 +	  setPoints(points_new);
    1.60 +	  gdc.textReposition(xy<double>(my_points[1].get_x(),my_points[1].get_y()));
    1.61  
    1.62  	  clicked_x=e->motion.x;
    1.63  	  clicked_y=e->motion.y;
    1.64 @@ -155,7 +155,7 @@
    1.65    return true;
    1.66  }
    1.67  
    1.68 -xy<double> BrokenEdge::get_arrow_pos()
    1.69 +xy<double> BrokenEdge::getArrowPos()
    1.70  {
    1.71    xy<double> ret_val(my_points[1].get_x(),my_points[1].get_y());
    1.72    return ret_val;