wip

1 files changed, 9 insertions, 9 deletions

diff --git a/fluid/app/shell_command.cxx b/fluid/app/shell_command.cxx
index 0a9a04121..fc5d0ffe9 100644
--- a/fluid/app/shell_command.cxx
+++ b/fluid/app/shell_command.cxx
@@ -441,7 +441,7 @@ Fd_Shell_Command::Fd_Shell_Command(const char *in_name)
 Fd_Shell_Command::Fd_Shell_Command(const char *in_name,
                  const char *in_label,
                  Fl_Shortcut in_shortcut,
-                 fld::Tool_Store in_storage,
+                 Tool_Store in_storage,
                  int in_condition,
                  const char *in_condition_data,
                  const char *in_command,
@@ -561,7 +561,7 @@ void Fd_Shell_Command::read(Fl_Preferences &prefs) {
   prefs.get("shortcut", tmp, 0);
   shortcut = (Fl_Shortcut)tmp;
   prefs.get("storage", tmp, -1);
-  if (tmp != -1) storage = (fld::Tool_Store)tmp;
+  if (tmp != -1) storage = (Tool_Store)tmp;
   prefs.get("condition", condition, ALWAYS);
 
   prefs.get("condition_data", str_ptr, "");
@@ -586,7 +586,7 @@ void Fd_Shell_Command::write(Fl_Preferences &prefs, int save_location) {
   if (flags != 0) prefs.set("flags", flags);
 }
 
-void Fd_Shell_Command::read(class fld::io::Project_Reader *in) {
+void Fd_Shell_Command::read(class Project_Reader *in) {
   const char *c = in->read_word(1);
   if (strcmp(c, "{")!=0) return; // expecting start of group
   storage = FLD_TOOL_STORE_PROJECT;
@@ -612,7 +612,7 @@ void Fd_Shell_Command::read(class fld::io::Project_Reader *in) {
   }
 }
 
-void Fd_Shell_Command::write(class fld::io::Project_Writer *out) {
+void Fd_Shell_Command::write(class Project_Writer *out) {
   out->write_string("\n  command {");
   out->write_string("\n    name "); out->write_word(name ? name : "");
   out->write_string("\n    label "); out->write_word(label ? label : "");
@@ -676,7 +676,7 @@ void Fd_Shell_Command_List::clear() {
 /**
  remove all shell commands of the given storage location from the list.
  */
-void Fd_Shell_Command_List::clear(fld::Tool_Store storage) {
+void Fd_Shell_Command_List::clear(Tool_Store storage) {
   int i;
   for (i=list_size-1; i>=0; i--) {
     if (list[i]->storage == storage) {
@@ -688,7 +688,7 @@ void Fd_Shell_Command_List::clear(fld::Tool_Store storage) {
 /**
  Read shell configuration from a preferences group.
  */
-void Fd_Shell_Command_List::read(Fl_Preferences &prefs, fld::Tool_Store storage) {
+void Fd_Shell_Command_List::read(Fl_Preferences &prefs, Tool_Store storage) {
   int i, n;
   // import the old shell commands from previous user settings
   if (&Fluid.preferences == &prefs) {
@@ -729,7 +729,7 @@ void Fd_Shell_Command_List::read(Fl_Preferences &prefs, fld::Tool_Store storage)
 /**
  Write shell configuration to a preferences group.
  */
-void Fd_Shell_Command_List::write(Fl_Preferences &prefs, fld::Tool_Store storage) {
+void Fd_Shell_Command_List::write(Fl_Preferences &prefs, Tool_Store storage) {
   int i, index;
   Fl_Preferences shell_commands(prefs, "shell_commands");
   shell_commands.delete_all_groups();
@@ -745,7 +745,7 @@ void Fd_Shell_Command_List::write(Fl_Preferences &prefs, fld::Tool_Store storage
 /**
  Read shell configuration from a project file.
  */
-void Fd_Shell_Command_List::read(fld::io::Project_Reader *in) {
+void Fd_Shell_Command_List::read(Project_Reader *in) {
   const char *c = in->read_word(1);
   if (strcmp(c, "{")!=0) return; // expecting start of group
   clear(FLD_TOOL_STORE_PROJECT);
@@ -765,7 +765,7 @@ void Fd_Shell_Command_List::read(fld::io::Project_Reader *in) {
 /**
  Write shell configuration to a project file.
  */
-void Fd_Shell_Command_List::write(fld::io::Project_Writer *out) {
+void Fd_Shell_Command_List::write(Project_Writer *out) {
   int i, n_in_project_file = 0;
   for (i=0; i<list_size; i++) {
     if (list[i]->storage == FLD_TOOL_STORE_PROJECT)