1 files changed, 11 insertions, 8 deletions

diff --git a/fluid/nodes/Menu_Node.cxx b/fluid/nodes/Menu_Node.cxx
index 8075c9c60..6f837a9ba 100644
--- a/fluid/nodes/Menu_Node.cxx
+++ b/fluid/nodes/Menu_Node.cxx
@@ -44,8 +44,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-using namespace fld;
-using namespace fld::proj;
 
 Fl_Menu_Item menu_item_type_menu[] = {
   {"Normal",0,0,(void*)0},
@@ -210,7 +208,8 @@ void group_selected_menuitems() {
   Fluid.proj.undo.checkpoint();
   Fluid.proj.undo.suspend();
   Widget_Node *n = (Widget_Node*)(q->make(FL_SUBMENU, Strategy::AFTER_CURRENT));
-  for (Node *t = qq->next; t && (t->level > qq->level);) {
+  Node *t;
+  for (t = qq->next; t && (t->level > qq->level);) {
     if (t->level != n->level || t == n || !t->selected) {
       t = t->next;
       continue;
@@ -236,7 +235,8 @@ void ungroup_selected_menuitems() {
   Fluid.proj.undo.checkpoint();
   Fluid.proj.undo.suspend();
   Fluid.proj.tree.current = qq;
-  for (Node *t = qq->next; t && (t->level > qq->level);) {
+  Node *t;
+  for (t = qq->next; t && (t->level > qq->level);) {
     if (t->level != q_level || !t->selected) {
       t = t->next;
       continue;
@@ -325,7 +325,8 @@ void Menu_Item_Node::write_static(fld::io::Code_Writer& f) {
   if (callback() && is_name(callback()) && !user_defined(callback()))
     f.write_h_once("extern void %s(Fl_Menu_*, %s);", callback(),
                   user_data_type() ? user_data_type() : "void*");
-  for (int n=0; n < NUM_EXTRA_CODE; n++) {
+  int n;
+  for (n =0; n < NUM_EXTRA_CODE; n++) {
     if (extra_code(n) && extra_code(n)[0] && isdeclare(extra_code(n)))
       f.write_h_once("%s", extra_code(n));
   }
@@ -426,7 +427,8 @@ void Menu_Item_Node::write_static(fld::io::Code_Writer& f) {
     f.write_c("\nFl_Menu_Item %s[] = {\n", menu_name(f, i));
   }
   Node* t = prev; while (t && t->is_a(FLD_NODE_TYPE_Menu_Item)) t = t->prev;
-  for (Node* q = t->next; q && q->is_a(FLD_NODE_TYPE_Menu_Item); q = q->next) {
+  Node *q;
+  for (q = t->next; q && q->is_a(FLD_NODE_TYPE_Menu_Item); q = q->next) {
     ((Menu_Item_Node*)q)->write_item(f);
     int thislevel = q->level; if (q->can_have_children()) thislevel++;
     int nextlevel =
@@ -438,7 +440,7 @@ void Menu_Item_Node::write_static(fld::io::Code_Writer& f) {
   if (k) {
     // Write menu item variables...
     t = prev; while (t && t->is_a(FLD_NODE_TYPE_Menu_Item)) t = t->prev;
-    for (Node* q = t->next; q && q->is_a(FLD_NODE_TYPE_Menu_Item); q = q->next) {
+    for (q = t->next; q && q->is_a(FLD_NODE_TYPE_Menu_Item); q = q->next) {
       Menu_Item_Node *m = (Menu_Item_Node*)q;
       const char *c = array_name(m);
       if (c) {
@@ -637,7 +639,8 @@ void Menu_Item_Node::write_code1(fld::io::Code_Writer& f) {
       }
     }
   }
-  for (int n=0; n < NUM_EXTRA_CODE; n++) {
+  int n;
+  for (n =0; n < NUM_EXTRA_CODE; n++) {
     if (extra_code(n) && extra_code(n)[0] && !isdeclare(extra_code(n))) {
       start_menu_initialiser(f, menuItemInitialized, mname, i);
       f.write_c("%s%s\n", f.indent(), extra_code(n));