wip

1 files changed, 9 insertions, 15 deletions

diff --git a/fluid/app/shell_command.h b/fluid/app/shell_command.h
index 716a87349..234477151 100644
--- a/fluid/app/shell_command.h
+++ b/fluid/app/shell_command.h
@@ -34,15 +34,9 @@
 #  include <unistd.h>
 #endif
 
-namespace fld {
-namespace io {
-
 class Project_Reader;
 class Project_Writer;
 
-} // namespace io
-} // namespace fld
-
 struct Fl_Menu_Item;
 class Fl_Widget;
 class Fl_Preferences;
@@ -93,7 +87,7 @@ public:
   char *name;
   char *label;
   Fl_Shortcut shortcut;
-  fld::Tool_Store storage;
+  Tool_Store storage;
   int condition;
   char *condition_data;
   char *command;
@@ -106,7 +100,7 @@ public:
   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,
@@ -121,8 +115,8 @@ public:
   void run();
   void read(Fl_Preferences &prefs);
   void write(Fl_Preferences &prefs, int save_location);
-  void read(class fld::io::Project_Reader*);
-  void write(class fld::io::Project_Writer*);
+  void read(class Project_Reader*);
+  void write(class Project_Writer*);
   void update_shell_menu();
   int is_active();
 };
@@ -142,11 +136,11 @@ public:
   void insert(int index, Fd_Shell_Command *cmd);
   void remove(int index);
   void clear();
-  void clear(fld::Tool_Store store);
-  void read(Fl_Preferences &prefs, fld::Tool_Store storage);
-  void write(Fl_Preferences &prefs, fld::Tool_Store storage);
-  void read(class fld::io::Project_Reader*);
-  void write(class fld::io::Project_Writer*);
+  void clear(Tool_Store store);
+  void read(Fl_Preferences &prefs, Tool_Store storage);
+  void write(Fl_Preferences &prefs, Tool_Store storage);
+  void read(class Project_Reader*);
+  void write(class Project_Writer*);
   void rebuild_shell_menu();
   void update_settings_dialog();