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/session_import_dialog.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/session_import_dialog.cc')
| -rw-r--r-- | gtk2_ardour/session_import_dialog.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc index 61f046e4ca..5511a0d68f 100644 --- a/gtk2_ardour/session_import_dialog.cc +++ b/gtk2_ardour/session_import_dialog.cc @@ -47,7 +47,7 @@ SessionImportDialog::SessionImportDialog (ARDOUR::Session & target) : Gtkmm2ext::set_size_request_to_display_given_text (file_entry, X_("Kg/quite/a/reasonable/size/for/files/i/think"), 5, 8); file_browse_button.set_name ("EditorGTKButton"); - file_browse_button.signal_clicked().connect (mem_fun(*this, &SessionImportDialog::browse)); + file_browse_button.signal_clicked().connect (sigc::mem_fun(*this, &SessionImportDialog::browse)); file_hbox.set_spacing (5); file_hbox.set_border_width (5); @@ -79,20 +79,20 @@ SessionImportDialog::SessionImportDialog (ARDOUR::Session & target) : // Connect signals Gtk::CellRendererToggle *toggle = dynamic_cast<Gtk::CellRendererToggle *> (session_browser.get_column_cell_renderer (1)); - toggle->signal_toggled().connect(mem_fun (*this, &SessionImportDialog::update)); - session_browser.signal_row_activated().connect(mem_fun (*this, &SessionImportDialog::show_info)); + toggle->signal_toggled().connect(sigc::mem_fun (*this, &SessionImportDialog::update)); + session_browser.signal_row_activated().connect(sigc::mem_fun (*this, &SessionImportDialog::show_info)); get_vbox()->pack_start (session_scroll, false, false); // Buttons cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - cancel_button->signal_clicked().connect (mem_fun (*this, &SessionImportDialog::end_dialog)); + cancel_button->signal_clicked().connect (sigc::mem_fun (*this, &SessionImportDialog::end_dialog)); ok_button = add_button (_("Import"), Gtk::RESPONSE_ACCEPT); - ok_button->signal_clicked().connect (mem_fun (*this, &SessionImportDialog::do_merge)); + ok_button->signal_clicked().connect (sigc::mem_fun (*this, &SessionImportDialog::do_merge)); // prompt signals - ElementImporter::Rename.connect (mem_fun (*this, &SessionImportDialog::open_rename_dialog)); - ElementImporter::Prompt.connect (mem_fun (*this, &SessionImportDialog::open_prompt_dialog)); + ElementImporter::Rename.connect (sigc::mem_fun (*this, &SessionImportDialog::open_rename_dialog)); + ElementImporter::Prompt.connect (sigc::mem_fun (*this, &SessionImportDialog::open_prompt_dialog)); // Finalize show_all(); |