diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 21:19:23 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 21:19:23 +0000 |
| commit | d38e2213d79b1c8952c776a3b60f7709457edc0c (patch) | |
| tree | 4d441ade9897b3c4749bfeb53c18f5841bdafbf9 /gtk2_ardour/keyboard.cc | |
| parent | e493b2b7c4fbbbfc457f02babf9546289b430177 (diff) | |
replaced slot() with mem_fun() and ptr_fun().
git-svn-id: svn://localhost/trunk/ardour2@29 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/keyboard.cc')
| -rw-r--r-- | gtk2_ardour/keyboard.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index e0d2314b2f..cf127f82cf 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -80,7 +80,7 @@ Keyboard::Keyboard () /* some global key actions */ - KeyboardTarget::add_action ("close-dialog", slot (*this, &Keyboard::close_current_dialog)); + KeyboardTarget::add_action ("close-dialog", mem_fun(*this, &Keyboard::close_current_dialog)); XMLNode* node = ARDOUR_UI::instance()->keyboard_settings(); set_state (*node); @@ -849,17 +849,17 @@ Keyboard::register_target (KeyboardTarget *kt) return; } - kt->window().enter_notify_event.connect (bind (slot (*this, &Keyboard::enter_window), kt)); - kt->window().leave_notify_event.connect (slot (*this, &Keyboard::leave_window)); + kt->window().enter_notify_event.connect (bind (mem_fun(*this, &Keyboard::enter_window), kt)); + kt->window().leave_notify_event.connect (mem_fun(*this, &Keyboard::leave_window)); - kt->GoingAway.connect (bind (slot (*this, &Keyboard::maybe_unset_target), kt)); - kt->Hiding.connect (bind (slot (*this, &Keyboard::maybe_unset_target), kt)); + kt->GoingAway.connect (bind (mem_fun(*this, &Keyboard::maybe_unset_target), kt)); + kt->Hiding.connect (bind (mem_fun(*this, &Keyboard::maybe_unset_target), kt)); } void Keyboard::set_current_dialog (ArdourDialog* dialog) { - ENSURE_GUI_THREAD(bind (slot (*this, &Keyboard::set_current_dialog), dialog)); + ENSURE_GUI_THREAD(bind (mem_fun(*this, &Keyboard::set_current_dialog), dialog)); current_dialog = dialog; @@ -868,13 +868,13 @@ Keyboard::set_current_dialog (ArdourDialog* dialog) if (find (known_dialogs.begin(), known_dialogs.end(), dialog) == known_dialogs.end()) { current_dialog->GoingAway.connect - (bind (slot (*this, &Keyboard::set_current_dialog), + (bind (mem_fun(*this, &Keyboard::set_current_dialog), reinterpret_cast<ArdourDialog *>(0))); current_dialog->Hiding.connect - (bind (slot (*this, &Keyboard::set_current_dialog), + (bind (mem_fun(*this, &Keyboard::set_current_dialog), reinterpret_cast<ArdourDialog *>(0))); - current_dialog->unmap_event.connect (slot (*this, &Keyboard::current_dialog_vanished)); + current_dialog->unmap_event.connect (mem_fun(*this, &Keyboard::current_dialog_vanished)); known_dialogs.push_back (dialog); } |