Rename CommandsModule::get_command_by_name to getCommandByName.

This commit is contained in:
David Capello 2011-01-20 20:49:03 -03:00
parent 3887173fac
commit cf2f042cbf
14 changed files with 24 additions and 24 deletions

View File

@ -395,7 +395,7 @@ bool app_realloc_recent_list()
if (jmenuitem_has_submenu_opened(list_menuitem))
return false;
Command* cmd_open_file = CommandsModule::instance()->get_command_by_name(CommandId::OpenFile);
Command* cmd_open_file = CommandsModule::instance()->getCommandByName(CommandId::OpenFile);
Widget* submenu = jmenuitem_get_submenu(list_menuitem);
if (submenu) {
@ -484,7 +484,7 @@ void TabsBarHandler::clickTab(Tabs* tabs, void* data, int button)
// middle-button: close the sprite
if (data && (button & 4)) {
Command* close_file_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::CloseFile);
CommandsModule::instance()->getCommandByName(CommandId::CloseFile);
UIContext::instance()->executeCommand(close_file_cmd, NULL);
}

View File

@ -146,7 +146,7 @@ try_again:;
// Does we need to save the sprite?
if (save_it) {
Command* save_command =
CommandsModule::instance()->get_command_by_name(CommandId::SaveFile);
CommandsModule::instance()->getCommandByName(CommandId::SaveFile);
context->executeCommand(save_command);
goto try_again;

View File

@ -537,7 +537,7 @@ void ConfigureTools::onSetGridClick()
}
else {
Command* grid_settings_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::GridSettings);
CommandsModule::instance()->getCommandByName(CommandId::GridSettings);
UIContext::instance()->executeCommand(grid_settings_cmd, NULL);
}

View File

@ -67,7 +67,7 @@ void InvertMaskCommand::onExecute(Context* context)
if (!has_mask) {
// so we select all
Command* mask_all_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::MaskAll);
CommandsModule::instance()->getCommandByName(CommandId::MaskAll);
context->executeCommand(mask_all_cmd);
}
// invert the current mask

View File

@ -69,7 +69,7 @@ CommandsModule* CommandsModule::instance()
return m_instance;
}
Command* CommandsModule::get_command_by_name(const char* name)
Command* CommandsModule::getCommandByName(const char* name)
{
if (!name)
return NULL;

View File

@ -47,7 +47,7 @@ public:
static CommandsModule* instance();
Command* get_command_by_name(const char* name);
Command* getCommandByName(const char* name);
};
#endif

View File

@ -78,7 +78,7 @@ void check_for_dropped_files()
// open all files
Command* cmd_open_file =
CommandsModule::instance()->get_command_by_name(CommandId::OpenFile);
CommandsModule::instance()->getCommandByName(CommandId::OpenFile);
Params params;
for (std::vector<base::string>::iterator

View File

@ -538,7 +538,7 @@ static bool anieditor_msg_proc(JWidget widget, JMessage msg)
if (anieditor->clk_frame == anieditor->hot_frame) {
UIContext::instance()
->executeCommand(CommandsModule::instance()
->get_command_by_name(CommandId::FrameProperties));
->getCommandByName(CommandId::FrameProperties));
}
else {
const SpriteReader sprite((Sprite*)anieditor->sprite);

View File

@ -908,7 +908,7 @@ JAccel add_keyboard_shortcut_to_execute_command(const char* shortcut_string, con
if (!shortcut) {
shortcut = new Shortcut(Shortcut_ExecuteCommand);
shortcut->command = CommandsModule::instance()->get_command_by_name(command_name);
shortcut->command = CommandsModule::instance()->getCommandByName(command_name);
shortcut->params = params ? params->clone(): new Params;
shortcuts->push_back(shortcut);
@ -1042,7 +1042,7 @@ bool Shortcut::is_pressed_from_key_array()
static Shortcut* get_keyboard_shortcut_for_command(const char* command_name, Params* params)
{
Command* command = CommandsModule::instance()->get_command_by_name(command_name);
Command* command = CommandsModule::instance()->getCommandByName(command_name);
if (!command)
return NULL;

View File

@ -137,7 +137,7 @@ static int load_root_menu()
const char* command_key = xmlKey->Attribute("shortcut");
if (command_name && command_key) {
Command* command = CommandsModule::instance()->get_command_by_name(command_name);
Command* command = CommandsModule::instance()->getCommandByName(command_name);
if (command) {
// Read params
Params params;
@ -290,7 +290,7 @@ static JWidget convert_xmlelem_to_menuitem(TiXmlElement* elem)
const char* command_name = elem->Attribute("command");
Command* command =
command_name ? CommandsModule::instance()->get_command_by_name(command_name):
command_name ? CommandsModule::instance()->getCommandByName(command_name):
NULL;
// load params

View File

@ -417,7 +417,7 @@ bool ColorBar::onProcessMessage(JMessage msg)
case HOTCOLOR_FGCOLOR:
case HOTCOLOR_BGCOLOR: {
Command* paledit_cmd = CommandsModule::instance()->get_command_by_name(CommandId::PaletteEditor);
Command* paledit_cmd = CommandsModule::instance()->getCommandByName(CommandId::PaletteEditor);
Params params;
params.set("target", (m_hot == HOTCOLOR_FGCOLOR ? "foreground": "background"));
params.set("open", "true");

View File

@ -1140,7 +1140,7 @@ bool Editor::onProcessMessage(JMessage msg)
// Call the eyedropper command
else if (current_tool->getInk(msg->mouse.right ? 1: 0)->isEyedropper()) {
Command* eyedropper_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::Eyedropper);
CommandsModule::instance()->getCommandByName(CommandId::Eyedropper);
Params params;
params.set("target", msg->mouse.right ? "background": "foreground");
@ -1441,7 +1441,7 @@ bool Editor::onProcessMessage(JMessage msg)
case WHEEL_FRAME:
if (m_state == EDITOR_STATE_STANDBY) {
Command* command = CommandsModule::instance()->get_command_by_name
Command* command = CommandsModule::instance()->getCommandByName
((dz < 0) ? CommandId::GotoNextFrame:
CommandId::GotoPreviousFrame);
if (command)

View File

@ -683,7 +683,7 @@ bool StatusBar::onProcessMessage(JMessage msg)
else {
// Call "Donate" command
Command* donate = CommandsModule::instance()
->get_command_by_name(CommandId::Donate);
->getCommandByName(CommandId::Donate);
Params params;
UIContext::instance()->executeCommand(donate, &params);
@ -770,12 +770,12 @@ static void ani_button_command(Button* widget, AniAction action)
Command* cmd = NULL;
switch (action) {
//case ACTION_LAYER: cmd = CommandsModule::instance()->get_command_by_name(CommandId::LayerProperties); break;
case ACTION_FIRST: cmd = CommandsModule::instance()->get_command_by_name(CommandId::GotoFirstFrame); break;
case ACTION_PREV: cmd = CommandsModule::instance()->get_command_by_name(CommandId::GotoPreviousFrame); break;
case ACTION_PLAY: cmd = CommandsModule::instance()->get_command_by_name(CommandId::PlayAnimation); break;
case ACTION_NEXT: cmd = CommandsModule::instance()->get_command_by_name(CommandId::GotoNextFrame); break;
case ACTION_LAST: cmd = CommandsModule::instance()->get_command_by_name(CommandId::GotoLastFrame); break;
//case ACTION_LAYER: cmd = CommandsModule::instance()->getCommandByName(CommandId::LayerProperties); break;
case ACTION_FIRST: cmd = CommandsModule::instance()->getCommandByName(CommandId::GotoFirstFrame); break;
case ACTION_PREV: cmd = CommandsModule::instance()->getCommandByName(CommandId::GotoPreviousFrame); break;
case ACTION_PLAY: cmd = CommandsModule::instance()->getCommandByName(CommandId::PlayAnimation); break;
case ACTION_NEXT: cmd = CommandsModule::instance()->getCommandByName(CommandId::GotoNextFrame); break;
case ACTION_LAST: cmd = CommandsModule::instance()->getCommandByName(CommandId::GotoLastFrame); break;
}
if (cmd)

View File

@ -277,7 +277,7 @@ bool ToolBar::onProcessMessage(JMessage msg)
toolrc = getToolGroupBounds(-1);
if (msg->mouse.y >= toolrc.y && msg->mouse.y < toolrc.y+toolrc.h) {
Command* conf_tools_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::ConfigureTools);
CommandsModule::instance()->getCommandByName(CommandId::ConfigureTools);
UIContext::instance()->executeCommand(conf_tools_cmd);
}