use ActionManager namespace, rather than ActionMap objects

6 files changed, 20 insertions, 17 deletions

diff --git a/libs/surfaces/cc121/gui.cc b/libs/surfaces/cc121/gui.cc
index ca06887102..e81e5655b7 100644
--- a/libs/surfaces/cc121/gui.cc
+++ b/libs/surfaces/cc121/gui.cc
@@ -26,6 +26,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 
+#include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
@@ -378,7 +379,7 @@ CC121GUI::build_available_action_menu ()
 	vector<string> keys;
 	vector<Glib::RefPtr<Gtk::Action> > actions;
 
-	Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+	ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
 
 	typedef std::map<string,TreeIter> NodeMap;
 	NodeMap nodes;
diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc
index 68c89007b1..6f445380cc 100644
--- a/libs/surfaces/faderport/gui.cc
+++ b/libs/surfaces/faderport/gui.cc
@@ -25,6 +25,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 
+#include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
@@ -359,7 +360,7 @@ FPGUI::build_available_action_menu ()
 	vector<string> keys;
 	vector<Glib::RefPtr<Gtk::Action> > actions;
 
-	Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+	ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
 
 	typedef std::map<string,TreeIter> NodeMap;
 	NodeMap nodes;
diff --git a/libs/surfaces/faderport8/gui.cc b/libs/surfaces/faderport8/gui.cc
index 3a537de028..a6e0731d33 100644
--- a/libs/surfaces/faderport8/gui.cc
+++ b/libs/surfaces/faderport8/gui.cc
@@ -26,6 +26,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 
+#include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
@@ -354,7 +355,7 @@ FP8GUI::build_available_action_menu ()
 	vector<string> keys;
 	vector<Glib::RefPtr<Gtk::Action> > actions;
 
-	Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+	ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
 
 	typedef std::map<string,TreeIter> NodeMap;
 	NodeMap nodes;
diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index 708fc5328c..b2dc987c13 100644
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -460,7 +460,7 @@ MackieControlProtocolGUI::build_available_action_menu ()
 	NodeMap nodes;
 	NodeMap::iterator r;
 
-	Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+	ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
 
 	vector<string>::iterator k;
 	vector<string>::iterator p;
diff --git a/libs/surfaces/maschine2/callbacks.cc b/libs/surfaces/maschine2/callbacks.cc
index 32466fc7be..b95f29032c 100644
--- a/libs/surfaces/maschine2/callbacks.cc
+++ b/libs/surfaces/maschine2/callbacks.cc
@@ -51,23 +51,23 @@ Maschine2::connect_signals ()
 	/* Actions */
 	Glib::RefPtr<Gtk::Action> act;
 #if 0
-	act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility"));
+	act = ActionManager::find_action (X_("Editor"), X_("ToggleMeasureVisibility"));
 	if (act) {
 		Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
 		tact->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_grid_change));
 	}
 #endif
-	act = ActionManager::get_action (X_("Editor"), X_("snap-off"));
+	act = ActionManager::find_action (X_("Editor"), X_("snap-off"));
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
 	}
-	act = ActionManager::get_action (X_("Editor"), X_("snap-magnetic"));
+	act = ActionManager::find_action (X_("Editor"), X_("snap-magnetic"));
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
 	}
-	act = ActionManager::get_action (X_("Editor"), X_("snap-normal"));
+	act = ActionManager::find_action (X_("Editor"), X_("snap-normal"));
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
@@ -167,7 +167,7 @@ Maschine2::notify_parameter_changed (std::string param)
 void
 Maschine2::notify_grid_change ()
 {
-	Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility"));
+	Glib::RefPtr<Gtk::Action> act = ActionManager::find_action (X_("Editor"), X_("ToggleMeasureVisibility"));
 	if (act) {
 		Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
 		_ctrl->button (M2Contols::Grid)->set_color (tact->get_active () ? COLOR_WHITE : 0);
@@ -183,12 +183,12 @@ Maschine2::notify_snap_change ()
 		return;
 	}
 
-	Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("snap-magnetic"));
+	Glib::RefPtr<Gtk::Action> act = ActionManager::find_action (X_("Editor"), X_("snap-magnetic"));
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		if (ract->get_active ()) { rgba = COLOR_GRAY; }
 	}
-	act = ActionManager::get_action (X_("Editor"), X_("snap-normal"));
+	act = ActionManager::find_action (X_("Editor"), X_("snap-normal"));
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		if (ract->get_active ()) { rgba = COLOR_WHITE; }
@@ -257,7 +257,7 @@ Maschine2::button_action (const std::string& group, const std::string& item)
 void
 Maschine2::button_grid ()
 {
-	Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility"));
+	Glib::RefPtr<Gtk::Action> act = ActionManager::find_action (X_("Editor"), X_("ToggleMeasureVisibility"));
 	if (act) {
 		Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
 		tact->set_active (!tact->get_active ());
@@ -288,19 +288,19 @@ Maschine2::button_snap_released ()
 	_ctrl->button (M2Contols::Grid)->set_blinking (false);
 
 	const char* action = 0;
-	Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("snap-off"));
+	Glib::RefPtr<Gtk::Action> act = ActionManager::find_action (X_("Editor"), X_("snap-off"));
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		if (ract->get_active ()) { action = "snap-normal"; }
 	}
 
-	act = ActionManager::get_action (X_("Editor"), X_("snap-normal"));
+	act = ActionManager::find_action (X_("Editor"), X_("snap-normal"));
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		if (ract->get_active ()) { action = "snap-magnetic"; }
 	}
 
-	act = ActionManager::get_action (X_("Editor"), X_("snap-magnetic"));
+	act = ActionManager::find_action (X_("Editor"), X_("snap-magnetic"));
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		if (ract->get_active ()) { action = "snap-off"; }
@@ -311,7 +311,7 @@ Maschine2::button_snap_released ()
 		return;
 	}
 
-	act = ActionManager::get_action (X_("Editor"), action);
+	act = ActionManager::find_action (X_("Editor"), action);
 	if (act) {
 		Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
 		ract->set_active (true);
diff --git a/libs/surfaces/us2400/gui.cc b/libs/surfaces/us2400/gui.cc
index 3d115cbd7b..7a81033b11 100644
--- a/libs/surfaces/us2400/gui.cc
+++ b/libs/surfaces/us2400/gui.cc
@@ -375,7 +375,7 @@ US2400ProtocolGUI::build_available_action_menu ()
 	NodeMap nodes;
 	NodeMap::iterator r;
 
-	Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+	ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
 
 	vector<string>::iterator k;
 	vector<string>::iterator p;