diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-12 15:02:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-12 15:02:15 +0000 |
| commit | 8687895abba4209a6de8d8a8fc1bda5996f0d875 (patch) | |
| tree | a2123e967e7c9906d787a5cec94ec53894d32734 /gtk2_ardour/option_editor.cc | |
| parent | 0c80b01f4724922a95d22fc441d6854da001c442 (diff) | |
remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/option_editor.cc')
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 8674bc0630..b67180cb09 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -25,7 +25,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace Gtk; using namespace ARDOUR; @@ -71,7 +70,7 @@ OptionEditorBox::add_to_page (OptionEditorPage* p) add_widget_to_page (p, _box); } -BoolOption::BoolOption (string const & i, string const & n, slot<bool> g, slot<bool, bool> s) +BoolOption::BoolOption (string const & i, string const & n, sigc::slot<bool> g, sigc::slot<bool, bool> s) : Option (i, n), _get (g), _set (s) @@ -99,7 +98,7 @@ BoolOption::toggled () _set (_button->get_active ()); } -EntryOption::EntryOption (string const & i, string const & n, slot<string> g, slot<bool, string> s) +EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string> g, sigc::slot<bool, string> s) : Option (i, n), _get (g), _set (s) |