diff options
Diffstat (limited to 'fluid/app/shell_command.cxx')
| -rw-r--r-- | fluid/app/shell_command.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fluid/app/shell_command.cxx b/fluid/app/shell_command.cxx index a4b664fda..05bc28ec0 100644 --- a/fluid/app/shell_command.cxx +++ b/fluid/app/shell_command.cxx @@ -426,7 +426,7 @@ void run_shell_command(const std::string &cmd, int flags) { */ Fd_Shell_Command::Fd_Shell_Command() : shortcut(0), - storage(fld::Tool_Store::USER), + storage(FLD_TOOL_STORE_USER), condition(0), flags(0), shell_menu_item_(nullptr) @@ -460,7 +460,7 @@ Fd_Shell_Command::Fd_Shell_Command(const std::string &in_name) : name(in_name), label(in_name), shortcut(0), - storage(fld::Tool_Store::USER), + storage(FLD_TOOL_STORE_USER), condition(Fd_Shell_Command::ALWAYS), command("echo \"Hello, FLUID!\""), flags(Fd_Shell_Command::SAVE_PROJECT|Fd_Shell_Command::SAVE_SOURCECODE), @@ -595,7 +595,7 @@ void Fd_Shell_Command::write(Fl_Preferences &prefs, bool save_location) { void Fd_Shell_Command::read(class fld::io::Project_Reader *in) { const char *c = in->read_word(1); if (strcmp(c, "{")!=0) return; // expecting start of group - storage = fld::Tool_Store::PROJECT; + storage = FLD_TOOL_STORE_PROJECT; for (;;) { c = in->read_word(1); if (strcmp(c, "}")==0) break; // end of command list @@ -696,7 +696,7 @@ void Fd_Shell_Command_List::read(Fl_Preferences &prefs, fld::Tool_Store storage) if (version == 0) { int save_fl, save_code, save_strings; Fd_Shell_Command *cmd = new Fd_Shell_Command(); - cmd->storage = fld::Tool_Store::USER; + cmd->storage = FLD_TOOL_STORE_USER; cmd->name = "Sample Shell Command"; cmd->label = "Sample Shell Command"; cmd->shortcut = FL_ALT+'g'; @@ -719,7 +719,7 @@ void Fd_Shell_Command_List::read(Fl_Preferences &prefs, fld::Tool_Store storage) for (int i=0; i<n; i++) { Fl_Preferences cmd_prefs(shell_commands, Fl_Preferences::Name(i)); Fd_Shell_Command *cmd = new Fd_Shell_Command(); - cmd->storage = fld::Tool_Store::USER; + cmd->storage = FLD_TOOL_STORE_USER; cmd->read(cmd_prefs); add(cmd); } @@ -733,7 +733,7 @@ void Fd_Shell_Command_List::write(Fl_Preferences &prefs, fld::Tool_Store storage shell_commands.delete_all_groups(); int index = 0; for (int i=0; i<list_size; i++) { - if (list[i]->storage == fld::Tool_Store::USER) { + if (list[i]->storage == FLD_TOOL_STORE_USER) { Fl_Preferences cmd(shell_commands, Fl_Preferences::Name(index++)); list[i]->write(cmd); } @@ -746,7 +746,7 @@ void Fd_Shell_Command_List::write(Fl_Preferences &prefs, fld::Tool_Store storage void Fd_Shell_Command_List::read(fld::io::Project_Reader *in) { const char *c = in->read_word(1); if (strcmp(c, "{")!=0) return; // expecting start of group - clear(fld::Tool_Store::PROJECT); + clear(FLD_TOOL_STORE_PROJECT); for (;;) { c = in->read_word(1); if (strcmp(c, "}")==0) break; // end of command list @@ -766,13 +766,13 @@ void Fd_Shell_Command_List::read(fld::io::Project_Reader *in) { void Fd_Shell_Command_List::write(fld::io::Project_Writer *out) { int n_in_project_file = 0; for (int i=0; i<list_size; i++) { - if (list[i]->storage == fld::Tool_Store::PROJECT) + if (list[i]->storage == FLD_TOOL_STORE_PROJECT) n_in_project_file++; } if (n_in_project_file > 0) { out->write_string("\nshell_commands {"); for (int i=0; i<list_size; i++) { - if (list[i]->storage == fld::Tool_Store::PROJECT) + if (list[i]->storage == FLD_TOOL_STORE_PROJECT) list[i]->write(out); } out->write_string("\n}"); @@ -960,7 +960,7 @@ void Fd_Shell_Command_List::import_from_file() { for (i = 0; i < n; i++) { Fl_Preferences cmd_prefs(shell_commands, Fl_Preferences::Name(i)); Fd_Shell_Command *cmd = new Fd_Shell_Command(); - cmd->storage = fld::Tool_Store::USER; + cmd->storage = FLD_TOOL_STORE_USER; cmd->read(cmd_prefs); g_shell_config->add(cmd); } |