Fluid: last incremental chage, restructuring

7 files changed, 22 insertions, 10 deletions

diff --git a/fluid/panels/codeview_panel.cxx b/fluid/panels/codeview_panel.cxx
index 6a877896d..c1c6a1d65 100644
--- a/fluid/panels/codeview_panel.cxx
+++ b/fluid/panels/codeview_panel.cxx
@@ -18,7 +18,9 @@
 
 #include "codeview_panel.h"
 #include "app/fluid.h"
-#include "io/file.h"
+#include "app/project.h"
+#include "io/Project_Reader.h"
+#include "io/Project_Writer.h"
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Button.H>
 #include "../src/flstring.h"
@@ -167,7 +169,7 @@ void update_codeview_cb(class Fl_Button*, void*) {
     }
 
     if (cv_project->visible_r()) {
-      write_file(cv_design_filename, false, true);
+      fld::io::write_file(cv_design_filename, false, true);
       int top = cv_project->top_line();
       cv_project->buffer()->loadfile(cv_design_filename);
       cv_project->scroll(top, 0);
@@ -188,7 +190,7 @@ void update_codeview_cb(class Fl_Button*, void*) {
       g_project.header_file_name = cv_header_filename;
 
       // generate the code and load the files
-      Fd_Code_Writer f;
+      fld::io::Code_Writer f;
       // generate files
       if (f.write_code(cv_source_filename, cv_header_filename, true))
       {
diff --git a/fluid/panels/codeview_panel.fl b/fluid/panels/codeview_panel.fl
index e2ae3e888..ce40ffd8a 100644
--- a/fluid/panels/codeview_panel.fl
+++ b/fluid/panels/codeview_panel.fl
@@ -23,7 +23,13 @@ comment {//
 decl {\#include "app/fluid.h"} {private local
 }
 
-decl {\#include "io/file.h"} {private local
+decl {\#include "app/project.h"} {private local
+}
+
+decl {\#include "io/Project_Reader.h"} {private local
+}
+
+decl {\#include "io/Project_Writer.h"} {private local
 }
 
 decl {\#include <FL/Fl_Tabs.H>} {private local
@@ -188,7 +194,7 @@ and load those into the Code Viewer widgets.} open return_type void
   }
 
   if (cv_project->visible_r()) {
-    write_file(cv_design_filename, false, true);
+    fld::io::write_file(cv_design_filename, false, true);
     int top = cv_project->top_line();
     cv_project->buffer()->loadfile(cv_design_filename);
     cv_project->scroll(top, 0);
@@ -209,7 +215,7 @@ and load those into the Code Viewer widgets.} open return_type void
     g_project.header_file_name = cv_header_filename;
 
     // generate the code and load the files
-    Fd_Code_Writer f;
+    fld::io::Code_Writer f;
     // generate files
     if (f.write_code(cv_source_filename, cv_header_filename, true))
     {
diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index fb31a319d..358f90c8d 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -17,6 +17,7 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.0500
 
 #include "settings_panel.h"
+#include "app/project.h"
 #include "app/undo.h"
 #include <FL/Fl_Preferences.H>
 #include <FL/Fl_Tooltip.H>
diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl
index 7890e5b83..7460ae8af 100644
--- a/fluid/panels/settings_panel.fl
+++ b/fluid/panels/settings_panel.fl
@@ -52,6 +52,9 @@ comment {//
 decl {\#include "app/fluid.h"} {public global
 }
 
+decl {\#include "app/project.h"} {private local
+}
+
 decl {\#include "app/undo.h"} {private global
 }
 
@@ -61,7 +64,7 @@ decl {\#include "app/Fd_Snap_Action.h"} {public global
 decl {\#include "app/shell_command.h"} {public global
 }
 
-decl {\#include "tools/fluid_filename.h"} {public local
+decl {\#include "tools/filename.h"} {public local
 }
 
 decl {\#include "widgets/Node_Browser.h"} {public global
diff --git a/fluid/panels/settings_panel.h b/fluid/panels/settings_panel.h
index c26b165c5..8aea3a221 100644
--- a/fluid/panels/settings_panel.h
+++ b/fluid/panels/settings_panel.h
@@ -22,7 +22,7 @@
 #include "app/fluid.h"
 #include "app/Fd_Snap_Action.h"
 #include "app/shell_command.h"
-#include "tools/fluid_filename.h"
+#include "tools/filename.h"
 #include "widgets/Node_Browser.h"
 #include <FL/Fl_Text_Buffer.H>
 #include <FL/Fl_Text_Display.H>
diff --git a/fluid/panels/template_panel.cxx b/fluid/panels/template_panel.cxx
index c93500d72..11227a549 100644
--- a/fluid/panels/template_panel.cxx
+++ b/fluid/panels/template_panel.cxx
@@ -18,7 +18,7 @@
 
 #include "template_panel.h"
 #include "app/fluid.h"
-#include "tools/fluid_filename.h"
+#include "tools/filename.h"
 #include <FL/Fl_Shared_Image.H>
 #include <FL/fl_ask.H>
 #include <FL/fl_string_functions.h>
diff --git a/fluid/panels/template_panel.fl b/fluid/panels/template_panel.fl
index cbbb5c7ff..b0ba20968 100644
--- a/fluid/panels/template_panel.fl
+++ b/fluid/panels/template_panel.fl
@@ -23,7 +23,7 @@ comment {//
 decl {\#include "app/fluid.h"} {private local
 }
 
-decl {\#include "tools/fluid_filename.h"} {selected private local
+decl {\#include "tools/filename.h"} {selected private local
 }
 
 decl {\#include <FL/Fl_Shared_Image.H>} {private local