wip

1 files changed, 11 insertions, 11 deletions

diff --git a/fluid/nodes/Menu_Node.cxx b/fluid/nodes/Menu_Node.cxx
index 6f837a9ba..b45015bea 100644
--- a/fluid/nodes/Menu_Node.cxx
+++ b/fluid/nodes/Menu_Node.cxx
@@ -302,7 +302,7 @@ int isdeclare(const char *c);
 // Search backwards to find the parent menu button and return it's name.
 // Also put in i the index into the button's menu item array belonging
 // to this menu item.
-const char* Menu_Item_Node::menu_name(fld::io::Code_Writer& f, int& i) {
+const char* Menu_Item_Node::menu_name(Code_Writer& f, int& i) {
   i = 0;
   Node* t = prev;
   while (t && t->is_a(FLD_NODE_TYPE_Menu_Item)) {
@@ -317,7 +317,7 @@ const char* Menu_Item_Node::menu_name(fld::io::Code_Writer& f, int& i) {
   return f.unique_id(t, "menu", t->name(), t->label());
 }
 
-void Menu_Item_Node::write_static(fld::io::Code_Writer& f) {
+void Menu_Item_Node::write_static(Code_Writer& f) {
   if (image && label() && label()[0]) {
     f.write_h_once("#include <FL/Fl.H>");
     f.write_h_once("#include <FL/Fl_Multi_Label.H>");
@@ -451,7 +451,7 @@ void Menu_Item_Node::write_static(fld::io::Code_Writer& f) {
           f.write_c("Fl_Menu_Item* %s::%s = %s::%s + %d;\n", k, c, k, n, i);
         } else {
           // if the name is an array, only define the array.
-          // The actual assignment is in write_code1(fld::io::Code_Writer& f)
+          // The actual assignment is in write_code1(Code_Writer& f)
           f.write_c("Fl_Menu_Item* %s::%s;\n", k, c);
         }
       }
@@ -473,7 +473,7 @@ int Menu_Item_Node::flags() {
   return i;
 }
 
-void Menu_Item_Node::write_item(fld::io::Code_Writer& f) {
+void Menu_Item_Node::write_item(Code_Writer& f) {
   static const char * const labeltypes[] = {
     "FL_NORMAL_LABEL",
     "FL_NO_LABEL",
@@ -548,7 +548,7 @@ void Menu_Item_Node::write_item(fld::io::Code_Writer& f) {
   f.write_c("},\n");
 }
 
-void start_menu_initialiser(fld::io::Code_Writer& f, int &initialized, const char *name, int index) {
+void start_menu_initialiser(Code_Writer& f, int &initialized, const char *name, int index) {
   if (!initialized) {
     initialized = 1;
     f.write_c("%s{ Fl_Menu_Item* o = &%s[%d];\n", f.indent(), name, index);
@@ -556,7 +556,7 @@ void start_menu_initialiser(fld::io::Code_Writer& f, int &initialized, const cha
   }
 }
 
-void Menu_Item_Node::write_code1(fld::io::Code_Writer& f) {
+void Menu_Item_Node::write_code1(Code_Writer& f) {
   int i; const char* mname = menu_name(f, i);
 
   if (!prev->is_a(FLD_NODE_TYPE_Menu_Item)) {
@@ -652,7 +652,7 @@ void Menu_Item_Node::write_code1(fld::io::Code_Writer& f) {
   }
 }
 
-void Menu_Item_Node::write_code2(fld::io::Code_Writer&) {}
+void Menu_Item_Node::write_code2(Code_Writer&) {}
 
 ////////////////////////////////////////////////////////////////
 // This is the base class for widgets that contain a menu (ie
@@ -744,7 +744,7 @@ Node* Menu_Base_Node::click_test(int, int) {
   return this;
 }
 
-void Menu_Manager_Node::write_code2(fld::io::Code_Writer& f) {
+void Menu_Manager_Node::write_code2(Code_Writer& f) {
   if (next && next->is_a(FLD_NODE_TYPE_Menu_Item)) {
     f.write_c("%s%s->menu(%s);\n", f.indent(), name() ? name() : "o",
             f.unique_id(this, "menu", name(), label()));
@@ -860,7 +860,7 @@ const char *Menu_Bar_Node::sys_menubar_proxy_name() {
 }
 
 
-void Menu_Bar_Node::write_static(fld::io::Code_Writer& f) {
+void Menu_Bar_Node::write_static(Code_Writer& f) {
   super::write_static(f);
   if (is_sys_menu_bar()) {
     f.write_h_once("#include <FL/Fl_Sys_Menu_Bar.H>");
@@ -880,7 +880,7 @@ void Menu_Bar_Node::write_static(fld::io::Code_Writer& f) {
   }
 }
 
-void Menu_Bar_Node::write_code1(fld::io::Code_Writer& f) {
+void Menu_Bar_Node::write_code1(Code_Writer& f) {
   super::write_code1(f);
   if (is_sys_menu_bar() && is_in_class()) {
     f.write_c("%s((%s*)%s)->_parent_class = (void*)this;\n",
@@ -888,7 +888,7 @@ void Menu_Bar_Node::write_code1(fld::io::Code_Writer& f) {
   }
 }
 
-//void Menu_Bar_Node::write_code2(fld::io::Code_Writer& f) {
+//void Menu_Bar_Node::write_code2(Code_Writer& f) {
 //  super::write_code2(f);
 //}