wip

1 files changed, 13 insertions, 22 deletions

diff --git a/fluid/app/Snap_Action.h b/fluid/app/Snap_Action.h
index 7c1e3fabc..f48b1490a 100644
--- a/fluid/app/Snap_Action.h
+++ b/fluid/app/Snap_Action.h
@@ -26,15 +26,8 @@ class Fl_Preferences;
 
 extern Fl_Menu_Item main_layout_submenu_[];
 
-namespace fld {
-namespace io {
-class Project_Reader; // fld::io::
-class Project_Writer; // fld::io::
-} // namespace io
-} // namespace fld
-
-namespace fld {
-namespace app {
+class Project_Reader;
+class Project_Writer;
 
 /**
  \brief Collection of layout settings.
@@ -77,8 +70,8 @@ public:
 
   void write(Fl_Preferences &prefs);
   void read(Fl_Preferences &prefs);
-  void write(fld::io::Project_Writer*);
-  void read(fld::io::Project_Reader*);
+  void write(Project_Writer*);
+  void read(Project_Reader*);
 
   int textsize_not_null();
 };
@@ -98,13 +91,13 @@ public:
   char *name_;                  ///< name of the suite
   char *menu_label;             ///< label text used in pulldown menu
   Layout_Preset *layout[3];  ///< presets for application, dialog, and toolbox windows
-  fld::Tool_Store storage_;       ///< storage location (see FLD_TOOL_STORE_INTERNAL, etc.)
+  Tool_Store storage_;       ///< storage location (see FLD_TOOL_STORE_INTERNAL, etc.)
   void write(Fl_Preferences &prefs);
   void read(Fl_Preferences &prefs);
-  void write(fld::io::Project_Writer*);
-  void read(fld::io::Project_Reader*);
+  void write(Project_Writer*);
+  void read(Project_Reader*);
   void update_label();
-  void storage(fld::Tool_Store s) { storage_ = s; update_label(); }
+  void storage(Tool_Store s) { storage_ = s; update_label(); }
   void name(const char *n);
   void init();
   ~Layout_Suite();
@@ -147,13 +140,13 @@ public:
 
   int load(const char *filename);
   int save(const char *filename);
-  void write(Fl_Preferences &prefs, fld::Tool_Store storage);
-  void read(Fl_Preferences &prefs, fld::Tool_Store storage);
-  void write(fld::io::Project_Writer*);
-  void read(fld::io::Project_Reader*);
+  void write(Fl_Preferences &prefs, Tool_Store storage);
+  void read(Fl_Preferences &prefs, Tool_Store storage);
+  void write(Project_Writer*);
+  void read(Project_Reader*);
   int add(Layout_Suite*);
   void remove(int index);
-  void remove_all(fld::Tool_Store storage);
+  void remove_all(Tool_Store storage);
   Layout_Preset *at(int);
   int size();
 };
@@ -198,8 +191,6 @@ public:
   static void better_size(int &w, int &h);
 };
 
-} // namespace app
-} // namespace fld
 
 
 #endif // _FLUID_FD_SNAP_ACTION_H