diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2019-01-14 14:14:23 +0000 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2019-01-14 14:14:23 +0000 |
| commit | 8f9e63575fe527eb1cbeceda7565da189e00948b (patch) | |
| tree | 9e866599c3a1019c0efed2d1d5964dced810a8fd /libs | |
| parent | 9d1fa8f820c365d58aab2a620b5d49d6ec5310e7 (diff) | |
Clarify which version of 'ActionManager::get_action()' we're calling
For MSVC, the parameter 'false' (i.e. 0) can be considered as either a bool or a pointer - so it'll map to both declarations of ActionManager::get_action()
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/mackie/gui.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc index 54032d15a4..7181677128 100644 --- a/libs/surfaces/mackie/gui.cc +++ b/libs/surfaces/mackie/gui.cc @@ -639,7 +639,7 @@ MackieControlProtocolGUI::refresh_function_key_editor () row[function_key_columns.plain] = action; } else { - act = ActionManager::get_action (action.c_str(), false); + act = ActionManager::get_action (action, false); if (act) { row[function_key_columns.plain] = act->get_label(); } else { @@ -663,7 +663,7 @@ MackieControlProtocolGUI::refresh_function_key_editor () /* Probably a key alias */ row[function_key_columns.shift] = action; } else { - act = ActionManager::get_action (action.c_str(), false); + act = ActionManager::get_action (action, false); if (act) { row[function_key_columns.shift] = act->get_label(); } else { @@ -681,7 +681,7 @@ MackieControlProtocolGUI::refresh_function_key_editor () /* Probably a key alias */ row[function_key_columns.control] = action; } else { - act = ActionManager::get_action (action.c_str(), false); + act = ActionManager::get_action (action, false); if (act) { row[function_key_columns.control] = act->get_label(); } else { @@ -698,7 +698,7 @@ MackieControlProtocolGUI::refresh_function_key_editor () /* Probably a key alias */ row[function_key_columns.option] = action; } else { - act = ActionManager::get_action (action.c_str(), false); + act = ActionManager::get_action (action, false); if (act) { row[function_key_columns.option] = act->get_label(); } else { @@ -715,7 +715,7 @@ MackieControlProtocolGUI::refresh_function_key_editor () /* Probably a key alias */ row[function_key_columns.cmdalt] = action; } else { - act = ActionManager::get_action (action.c_str(), false); + act = ActionManager::get_action (action, false); if (act) { row[function_key_columns.cmdalt] = act->get_label(); } else { @@ -728,7 +728,7 @@ MackieControlProtocolGUI::refresh_function_key_editor () if (action.empty()) { row[function_key_columns.shiftcontrol] = defstring; } else { - act = ActionManager::get_action (action.c_str(), false); + act = ActionManager::get_action (action, false); if (act) { row[function_key_columns.shiftcontrol] = act->get_label(); } else { @@ -760,7 +760,7 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib return; } } - Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second.c_str(), false); + Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second, false); if (act || remove) { /* update visible text, using string supplied by |