use new action map API instead of ActionManager::get_action

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 4d51bbce1033e8691647da15d01b0728bcbb774b..c930254cbec197cbe6ba902d067d6d2bc4fd64ea 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -213,18 +213,17 @@ CheckOption::CheckOption (string const & i, string const & n, Glib::RefPtr<Gtk::
        _button->signal_toggled().connect (sigc::mem_fun (*this, &CheckOption::toggled));
 
        Gtkmm2ext::Activatable::set_related_action (act);
-       if (_action) {
+       assert (_action);
 
-               action_sensitivity_changed ();
+       action_sensitivity_changed ();
 
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
-               if (tact) {
-                       action_toggled ();
-                       tact->signal_toggled().connect (sigc::mem_fun (*this, &CheckOption::action_toggled));
-               }
-
-               _action->connect_property_changed ("sensitive", sigc::mem_fun (*this, &CheckOption::action_sensitivity_changed));
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
+       if (tact) {
+               action_toggled ();
+               tact->signal_toggled().connect (sigc::mem_fun (*this, &CheckOption::action_toggled));
        }
+
+       _action->connect_property_changed ("sensitive", sigc::mem_fun (*this, &CheckOption::action_sensitivity_changed));
 }
 
 void
@@ -232,7 +231,7 @@ CheckOption::action_toggled ()
 {
        Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
        if (tact) {
-               _button->set_active(tact->get_active());
+               _button->set_active (tact->get_active());
        }
 }
 
@@ -247,7 +246,7 @@ CheckOption::toggled ()
 {
        Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
 
-       tact->set_active( _button->get_active() );
+       tact->set_active (_button->get_active ());
 }