some (unfinished) work on incorporating Ben's rev 6919 changes regarding track select...

[ardour.git] / gtk2_ardour / editor_cursors.cc

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index bedff567011139ddb742a7f1ece4b53074fa258a..89d2fcbaa1aa2b4949797d122f9b0bfcf75cdb00 100644 (file)
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 #include "utils.h"
 #include "editor.h"
 
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -47,7 +46,7 @@ EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,Ardour
        canvas_item.property_arrow_shape_c() = 9.0;
 
        canvas_item.set_data ("cursor", this);
-       canvas_item.signal_event().connect (bind (mem_fun (ed, callbck), &canvas_item));
+       canvas_item.signal_event().connect (sigc::bind (sigc::mem_fun (ed, callbck), &canvas_item));
        current_frame = 1; /* force redraw at 0 */
 }
 
@@ -60,7 +59,7 @@ void
 EditorCursor::set_position (nframes64_t frame)
 {
        PositionChanged (frame);
-       
+
        double new_pos =  editor.frame_to_unit (frame);
 
        if (new_pos != points.front().get_x()) {
@@ -76,12 +75,12 @@ EditorCursor::set_position (nframes64_t frame)
 void
 EditorCursor::set_length (double units)
 {
-       length = units; 
+       length = units;
        points.back().set_y (points.front().get_y() + length);
        canvas_item.property_points() = points;
 }
 
-void 
+void
 EditorCursor::set_y_axis (double position)
 {
         points.front().set_y (position);