1 files changed, 15 insertions, 15 deletions

diff --git a/fluid/panels/codeview_panel.cxx b/fluid/panels/codeview_panel.cxx
index 728ee986c..37e8b873f 100644
--- a/fluid/panels/codeview_panel.cxx
+++ b/fluid/panels/codeview_panel.cxx
@@ -171,7 +171,7 @@ void update_codeview_cb(class Fl_Button*, 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);
@@ -181,7 +181,7 @@ void update_codeview_cb(class Fl_Button*, void*) {
       fl_strlcpy(fn, Fluid.get_tmpdir(), FL_PATH_MAX);
       fl_strlcat(fn, "strings", FL_PATH_MAX);
       fl_filename_setext(fn, FL_PATH_MAX, exts[(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);
@@ -194,7 +194,7 @@ void update_codeview_cb(class Fl_Button*, void*) {
       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))
       {
@@ -271,13 +271,13 @@ Fl_Tabs *cv_tab=(Fl_Tabs *)0;
 
 Fl_Group *cv_source_tab=(Fl_Group *)0;
 
-fld::widget::Code_Viewer *cv_source=(fld::widget::Code_Viewer *)0;
+Code_Viewer *cv_source=(Code_Viewer *)0;
 
-fld::widget::Code_Viewer *cv_header=(fld::widget::Code_Viewer *)0;
+Code_Viewer *cv_header=(Code_Viewer *)0;
 
-fld::widget::Text_Viewer *cv_strings=(fld::widget::Text_Viewer *)0;
+Text_Viewer *cv_strings=(Text_Viewer *)0;
 
-fld::widget::Text_Viewer *cv_project=(fld::widget::Text_Viewer *)0;
+Text_Viewer *cv_project=(Text_Viewer *)0;
 
 Fl_Group *cv_find_row=(Fl_Group *)0;
 
@@ -406,7 +406,7 @@ Fl_Double_Window* make_codeview() {
       cv_tab->callback((Fl_Callback*)update_codeview_position_cb);
       { cv_source_tab = new Fl_Group(10, 35, 500, 415, "Source");
         cv_source_tab->labelsize(13);
-        { fld::widget::Code_Viewer* o = cv_source = new fld::widget::Code_Viewer(10, 40, 500, 410);
+        { Code_Viewer* o = cv_source = new Code_Viewer(10, 40, 500, 410);
           cv_source->box(FL_DOWN_FRAME);
           cv_source->color(FL_BACKGROUND2_COLOR);
           cv_source->selection_color(FL_SELECTION_COLOR);
@@ -421,14 +421,14 @@ Fl_Double_Window* make_codeview() {
           Fl_Group::current()->resizable(cv_source);
           o->linenumber_width(60);
           o->linenumber_size(o->Fl_Text_Display::textsize());
-        } // fld::widget::Code_Viewer* cv_source
+        } // Code_Viewer* cv_source
         cv_source_tab->end();
         Fl_Group::current()->resizable(cv_source_tab);
       } // Fl_Group* cv_source_tab
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Header");
         o->labelsize(13);
         o->hide();
-        { fld::widget::Code_Viewer* o = cv_header = new fld::widget::Code_Viewer(10, 40, 500, 410);
+        { Code_Viewer* o = cv_header = new Code_Viewer(10, 40, 500, 410);
           cv_header->box(FL_DOWN_FRAME);
           cv_header->color(FL_BACKGROUND2_COLOR);
           cv_header->selection_color(FL_SELECTION_COLOR);
@@ -443,13 +443,13 @@ Fl_Double_Window* make_codeview() {
           Fl_Group::current()->resizable(cv_header);
           o->linenumber_width(60);
           o->linenumber_size(o->Fl_Text_Display::textsize());
-        } // fld::widget::Code_Viewer* cv_header
+        } // Code_Viewer* cv_header
         o->end();
       } // Fl_Group* o
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Strings");
         o->labelsize(13);
         o->hide();
-        { fld::widget::Text_Viewer* o = cv_strings = new fld::widget::Text_Viewer(10, 40, 500, 410);
+        { Text_Viewer* o = cv_strings = new Text_Viewer(10, 40, 500, 410);
           cv_strings->box(FL_DOWN_FRAME);
           cv_strings->color(FL_BACKGROUND2_COLOR);
           cv_strings->selection_color(FL_SELECTION_COLOR);
@@ -464,13 +464,13 @@ Fl_Double_Window* make_codeview() {
           Fl_Group::current()->resizable(cv_strings);
           o->linenumber_width(60);
           o->linenumber_size(o->Fl_Text_Display::textsize());
-        } // fld::widget::Text_Viewer* cv_strings
+        } // Text_Viewer* cv_strings
         o->end();
       } // Fl_Group* o
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Project");
         o->labelsize(13);
         o->hide();
-        { fld::widget::Text_Viewer* o = cv_project = new fld::widget::Text_Viewer(10, 40, 500, 410);
+        { Text_Viewer* o = cv_project = new Text_Viewer(10, 40, 500, 410);
           cv_project->box(FL_DOWN_FRAME);
           cv_project->color(FL_BACKGROUND2_COLOR);
           cv_project->selection_color(FL_SELECTION_COLOR);
@@ -485,7 +485,7 @@ Fl_Double_Window* make_codeview() {
           Fl_Group::current()->resizable(cv_project);
           o->linenumber_width(60);
           o->linenumber_size(o->Fl_Text_Display::textsize());
-        } // fld::widget::Text_Viewer* cv_project
+        } // Text_Viewer* cv_project
         o->end();
       } // Fl_Group* o
       cv_tab->end();