diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 23:29:48 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 23:29:48 +0000 |
commit | 64dc5427e4f5339a16a018692dd94f476c53cae9 (patch) | |
tree | 83b76bb578698dbfcde040aa9013a7351190a9b5 /gtk2_ardour/editor_imageframe.cc | |
parent | d7de23db0f325aaa1dd573739bc9e33925ebdfce (diff) |
make all use of bind/mem_fun be explicitly sigc::
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_imageframe.cc')
-rw-r--r-- | gtk2_ardour/editor_imageframe.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc index d5d9481b5d..2de23ec7f4 100644 --- a/gtk2_ardour/editor_imageframe.cc +++ b/gtk2_ardour/editor_imageframe.cc @@ -74,7 +74,7 @@ Editor::add_imageframe_time_axis(const string & track_name, void* src) } else { - Gtkmm2ext::UI::instance()->call_slot(bind(mem_fun(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ; + Gtkmm2ext::UI::instance()->call_slot(sigc::bind(sigc::mem_fun(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ; } } @@ -129,10 +129,10 @@ Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) void Editor::add_imageframe_marker_time_axis(const string & track_name, TimeAxisView* marked_track, void* src) { - // Can we only bind 2 data Items? - // @todo we really want to bind the src attribute too, for the moment tracks can only be added remotely, + // Can we only sigc::bind 2 data Items? + // @todo we really want to sigc::bind the src attribute too, for the moment tracks can only be added remotely, // so this is not too much of an issue, however will need to be looked at again - Gtkmm2ext::UI::instance()->call_slot(sigc::bind(mem_fun(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ; + Gtkmm2ext::UI::instance()->call_slot(sigc::bind(sigc::mem_fun(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ; } void @@ -1092,8 +1092,8 @@ Editor::handle_new_imageframe_time_axis_view(const string & track_name, void* sr row[route_display_columns.tv] = iftav; route_list_display.get_selection()->select (row); - iftav->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)iftav)) ; - iftav->gui_changed.connect(mem_fun(*this, &Editor::handle_gui_changes)) ; + iftav->GoingAway.connect(sigc::bind(sigc::mem_fun(*this, &Editor::remove_route), (TimeAxisView*)iftav)) ; + iftav->gui_changed.connect(sigc::mem_fun(*this, &Editor::handle_gui_changes)) ; } void @@ -1109,7 +1109,7 @@ Editor::handle_new_imageframe_marker_time_axis_view(const string & track_name, T row[route_display_columns.tv] = mta; route_list_display.get_selection()->select (row); - mta->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)mta)) ; + mta->GoingAway.connect(sigc::bind(sigc::mem_fun(*this, &Editor::remove_route), (TimeAxisView*)mta)) ; } |