1 files changed, 20 insertions, 18 deletions

diff --git a/fluid/panels/codeview_panel.cxx b/fluid/panels/codeview_panel.cxx
index 3c46715bd..728ee986c 100644
--- a/fluid/panels/codeview_panel.cxx
+++ b/fluid/panels/codeview_panel.cxx
@@ -26,9 +26,9 @@
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Button.H>
 #include "../src/flstring.h"
-static char *cv_source_filename = nullptr;
-static char *cv_header_filename = nullptr;
-static char *cv_design_filename = nullptr;
+static char *cv_source_filename = 0;
+static char *cv_header_filename = 0;
+static char *cv_design_filename = 0;
 int cv_code_choice;
 extern void select_only(Node *o);
 extern void reveal_in_browser(Node *t);
@@ -156,17 +156,17 @@ void update_codeview_cb(class Fl_Button*, void*) {
 
     if (!cv_source_filename) {
       cv_source_filename = (char*)malloc(FL_PATH_MAX);
-      fl_strlcpy(cv_source_filename, Fluid.get_tmpdir().c_str(), FL_PATH_MAX);
+      fl_strlcpy(cv_source_filename, Fluid.get_tmpdir(), FL_PATH_MAX);
       fl_strlcat(cv_source_filename, "codeview_tmp.cxx", FL_PATH_MAX);
     }
     if (!cv_header_filename) {
       cv_header_filename = (char*)malloc(FL_PATH_MAX);
-      fl_strlcpy(cv_header_filename, Fluid.get_tmpdir().c_str(), FL_PATH_MAX);
+      fl_strlcpy(cv_header_filename, Fluid.get_tmpdir(), FL_PATH_MAX);
       fl_strlcat(cv_header_filename, "codeview_tmp.h", FL_PATH_MAX);
     }
     if (!cv_design_filename) {
       cv_design_filename = (char*)malloc(FL_PATH_MAX);
-      fl_strlcpy(cv_design_filename, Fluid.get_tmpdir().c_str(), FL_PATH_MAX);
+      fl_strlcpy(cv_design_filename, Fluid.get_tmpdir(), FL_PATH_MAX);
       fl_strlcat(cv_design_filename, "codeview_tmp.fl", FL_PATH_MAX);
     }
 
@@ -178,18 +178,20 @@ void update_codeview_cb(class Fl_Button*, void*) {
     } else if (cv_strings->visible_r()) {
       static const char *exts[] = { ".txt", ".po", ".msg" };
       char fn[FL_PATH_MAX+1];
-      fl_strlcpy(fn, Fluid.get_tmpdir().c_str(), FL_PATH_MAX);
+      fl_strlcpy(fn, Fluid.get_tmpdir(), 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)]);
+      fl_filename_setext(fn, FL_PATH_MAX, exts[(int)(Fluid.proj.i18n.type)]);
       fld::io::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);
@@ -208,8 +210,8 @@ void update_codeview_cb(class Fl_Button*, 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);
     }
 }
 
@@ -284,7 +286,7 @@ Fl_Button *cv_find_text_case=(Fl_Button *)0;
 Fl_Input *cv_find_text=(Fl_Input *)0;
 
 static void cb_cv_find_text(Fl_Input* o, void*) {
-  Fl_Text_Display *e = nullptr;
+  Fl_Text_Display *e = 0;
   if (cv_source->visible_r()) {
     e = cv_source;
   } else if (cv_header->visible_r()) {
@@ -305,7 +307,7 @@ static void cb_cv_find_text(Fl_Input* o, void*) {
 }
 
 static void cb_(Fl_Button*, void*) {
-  Fl_Text_Display *e = nullptr;
+  Fl_Text_Display *e = 0;
   if (cv_source->visible_r()) {
     e = cv_source;
   } else if (cv_header->visible_r()) {
@@ -330,7 +332,7 @@ static void cb_(Fl_Button*, void*) {
 }
 
 static void cb_1(Fl_Button*, void*) {
-  Fl_Text_Display *e = nullptr;
+  Fl_Text_Display *e = 0;
   if (cv_source->visible_r()) {
     e = cv_source;
   } else if (cv_header->visible_r()) {
@@ -356,7 +358,7 @@ static void cb_1(Fl_Button*, void*) {
 
 static void cb_Reveal(Fl_Button*, void*) {
   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())