1 files changed, 22 insertions, 20 deletions

diff --git a/fluid/panels/codeview_panel.fl b/fluid/panels/codeview_panel.fl
index 1d5a0cad6..90128afd9 100644
--- a/fluid/panels/codeview_panel.fl
+++ b/fluid/panels/codeview_panel.fl
@@ -48,13 +48,13 @@ decl {\#include <FL/Fl_Button.H>} {private local
 decl {\#include "../src/flstring.h"} {private local
 }
 
-decl {char *cv_source_filename = nullptr;} {private local
+decl {char *cv_source_filename = 0;} {private local
 }
 
-decl {char *cv_header_filename = nullptr;} {private local
+decl {char *cv_header_filename = 0;} {private local
 }
 
-decl {char *cv_design_filename = nullptr;} {private local
+decl {char *cv_design_filename = 0;} {private local
 }
 
 decl {int cv_code_choice;} {public local
@@ -201,7 +201,7 @@ and load those into the Code Viewer widgets.} open return_type void
   }
 
   if (cv_project->visible_r()) {
-    fld::io::write_file(Fluid.proj, cv_design_filename, false, true);
+    write_file(Fluid.proj, cv_design_filename, false, true);
     int top = cv_project->top_line();
     cv_project->buffer()->loadfile(cv_design_filename);
     cv_project->scroll(top, 0);
@@ -211,18 +211,20 @@ and load those into the Code Viewer widgets.} open return_type void
     fl_strlcpy(fn, Fluid.get_tmpdir().c_str(), FL_PATH_MAX);
     fl_strlcat(fn, "strings", FL_PATH_MAX);
     fl_filename_setext(fn, FL_PATH_MAX, exts[static_cast<int>(Fluid.proj.i18n.type)]);
-    fld::io::write_strings(Fluid.proj, fn);
+    write_strings(Fluid.proj, fn);
     int top = cv_strings->top_line();
     cv_strings->buffer()->loadfile(fn);
     cv_strings->scroll(top, 0);
   } else if (cv_source->visible_r() || cv_header->visible_r()) {
-    std::string code_file_name_bak = Fluid.proj.code_file_name;
-    Fluid.proj.code_file_name = cv_source_filename;
-    std::string header_file_name_bak = Fluid.proj.header_file_name;
-    Fluid.proj.header_file_name = cv_header_filename;
+    char code_file_name_bak[FL_PATH_MAX];
+    fl_strlcpy(code_file_name_bak, Fluid.proj.code_file_name(), FL_PATH_MAX);
+    Fluid.proj.set_code_file_name(cv_source_filename);
+    char header_file_name_bak[FL_PATH_MAX];
+    fl_strlcpy(header_file_name_bak, Fluid.proj.header_file_name(), FL_PATH_MAX);
+    Fluid.proj.set_header_file_name(cv_header_filename);
 
     // generate the code and load the files
-    fld::io::Code_Writer f(Fluid.proj);
+    Code_Writer f(Fluid.proj);
     // generate files
     if (f.write_code(cv_source_filename, cv_header_filename, true))
     {
@@ -238,8 +240,8 @@ and load those into the Code Viewer widgets.} open return_type void
       update_codeview_position();
     }
 
-    Fluid.proj.code_file_name = code_file_name_bak;
-    Fluid.proj.header_file_name = header_file_name_bak;
+    Fluid.proj.set_code_file_name(code_file_name_bak);
+    Fluid.proj.set_header_file_name(header_file_name_bak);
   }} {selected
   }
 }
@@ -313,7 +315,7 @@ Function {make_codeview()} {open
           code0 {\#include "widgets/Code_Viewer.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
-          class {fld::widget::Code_Viewer}
+          class {Code_Viewer}
         }
       }
       Fl_Group {} {
@@ -325,7 +327,7 @@ Function {make_codeview()} {open
           code0 {\#include "widgets/Code_Viewer.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
-          class {fld::widget::Code_Viewer}
+          class {Code_Viewer}
         }
       }
       Fl_Group {} {
@@ -337,7 +339,7 @@ Function {make_codeview()} {open
           code0 {\#include "widgets/Text_Viewer.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
-          class {fld::widget::Text_Viewer}
+          class {Text_Viewer}
         }
       }
       Fl_Group {} {
@@ -349,7 +351,7 @@ Function {make_codeview()} {open
           code0 {\#include "widgets/Text_Viewer.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
-          class {fld::widget::Text_Viewer}
+          class {Text_Viewer}
         }
       }
     }
@@ -362,7 +364,7 @@ Function {make_codeview()} {open
       }
       Fl_Input cv_find_text {
         label {Find:}
-        callback {Fl_Text_Display *e = nullptr;
+        callback {Fl_Text_Display *e = 0;
 if (cv_source->visible_r()) {
   e = cv_source;
 } else if (cv_header->visible_r()) {
@@ -384,7 +386,7 @@ if (e) {
       }
       Fl_Button {} {
         label {<<}
-        callback {Fl_Text_Display *e = nullptr;
+        callback {Fl_Text_Display *e = 0;
 if (cv_source->visible_r()) {
   e = cv_source;
 } else if (cv_header->visible_r()) {
@@ -410,7 +412,7 @@ if (e) {
       }
       Fl_Button {} {
         label {>>}
-        callback {Fl_Text_Display *e = nullptr;
+        callback {Fl_Text_Display *e = 0;
 if (cv_source->visible_r()) {
   e = cv_source;
 } else if (cv_header->visible_r()) {
@@ -437,7 +439,7 @@ if (e) {
       Fl_Button {} {
         label Reveal
         callback {if (codeview_panel && codeview_panel->visible()) {
-  Node *node = nullptr;
+  Node *node = 0;
   if (cv_source->visible_r())
     node = Fluid.proj.tree.find_in_text(0, cv_source->insert_position());
   else if (cv_header->visible_r())