wip

9 files changed, 187 insertions, 118 deletions

diff --git a/fluid/nodes/Function_Node.cxx b/fluid/nodes/Function_Node.cxx
index de3706eb3..daf5822c0 100644
--- a/fluid/nodes/Function_Node.cxx
+++ b/fluid/nodes/Function_Node.cxx
@@ -37,9 +37,6 @@
 
 extern void open_panel();
 
-using namespace fld;
-using namespace fld::io;
-using namespace fld::proj;
 
 /// Set a current class, so that the code of the children is generated correctly.
 Class_Node *current_class = 0;
diff --git a/fluid/nodes/Grid_Node.cxx b/fluid/nodes/Grid_Node.cxx
index d38bbd1ca..6759c33f2 100644
--- a/fluid/nodes/Grid_Node.cxx
+++ b/fluid/nodes/Grid_Node.cxx
@@ -225,7 +225,8 @@ void Fl_Grid_Proxy::transient_make_room_(int n) {
  \param[in] w remove the transient cell for this widget
  */
 void Fl_Grid_Proxy::transient_remove_(Fl_Widget *w) {
-  for (int i=0; i<num_transient_; i++) {
+  int i;
+  for (i =0; i<num_transient_; i++) {
     if (transient_[i].widget==w) {
       if (transient_[i].cell) {
         ::free(transient_[i].cell);
@@ -254,7 +255,8 @@ Fl_Grid_Proxy::Cell *Fl_Grid_Proxy::any_cell(Fl_Widget *widget) const {
  \return the transient cell, or 0 if it was not found.
  */
 Fl_Grid_Proxy::Cell *Fl_Grid_Proxy::transient_cell(Fl_Widget *widget) const {
-  for (int i=0; i<num_transient_; i++) {
+  int i;
+  for (i =0; i<num_transient_; i++) {
     if (transient_[i].widget == widget)
       return transient_[i].cell;
   }
@@ -316,13 +318,15 @@ void Grid_Node::copy_properties()
   s->gap(&rg, &cg);
   d->gap(rg, cg);
   // copy col widths, heights, and gaps
-  for (int c=0; c<s->cols(); c++) {
+  int c;
+  for (c =0; c<s->cols(); c++) {
     d->col_width(c, s->col_width(c));
     d->col_gap(c, s->col_gap(c));
     d->col_weight(c, s->col_weight(c));
   }
   // copy row widths, heights, and gaps
-  for (int r=0; r<s->rows(); r++) {
+  int r;
+  for (r =0; r<s->rows(); r++) {
     d->row_height(r, s->row_height(r));
     d->row_gap(r, s->row_gap(r));
     d->row_weight(r, s->row_weight(r));
@@ -331,7 +335,8 @@ void Grid_Node::copy_properties()
 
 void Grid_Node::copy_properties_for_children() {
   Fl_Grid *d = (Fl_Grid*)live_widget, *s =(Fl_Grid*)o;
-  for (int i=0; i<s->children(); i++) {
+  int i;
+  for (i =0; i<s->children(); i++) {
     Fl_Grid::Cell *cell = s->cell(s->child(i));
     if (cell && i<d->children()) {
       d->widget(d->child(i),
@@ -411,6 +416,7 @@ void Grid_Node::write_properties(fld::io::Project_Writer &f)
 void Grid_Node::read_property(fld::io::Project_Reader &f, const char *c)
 {
   Fl_Grid* grid = (Fl_Grid*)o;
+  int i;
   if (!strcmp(c,"dimensions")) {
     int rows = 3, cols = 3;
     if (sscanf(f.read_word(),"%d %d", &rows, &cols) == 2)
@@ -426,32 +432,32 @@ void Grid_Node::read_property(fld::io::Project_Reader &f, const char *c)
   } else if (!strcmp(c,"rowheights")) {
     int rows = grid->rows();
     f.read_word(1); // "{"
-    for (int i=0; i<rows; i++) grid->row_height(i, f.read_int());
+    for (i =0; i<rows; i++) grid->row_height(i, f.read_int());
     f.read_word(1); // "}"
   } else if (!strcmp(c,"rowweights")) {
     int rows = grid->rows();
     f.read_word(1); // "{"
-    for (int i=0; i<rows; i++) grid->row_weight(i, f.read_int());
+    for (i =0; i<rows; i++) grid->row_weight(i, f.read_int());
     f.read_word(1); // "}"
   } else if (!strcmp(c,"rowgaps")) {
     int rows = grid->rows();
     f.read_word(1); // "{"
-    for (int i=0; i<rows; i++) grid->row_gap(i, f.read_int());
+    for (i =0; i<rows; i++) grid->row_gap(i, f.read_int());
     f.read_word(1); // "}"
   } else if (!strcmp(c,"colwidths")) {
     int cols = grid->cols();
     f.read_word(1); // "{"
-    for (int i=0; i<cols; i++) grid->col_width(i, f.read_int());
+    for (i =0; i<cols; i++) grid->col_width(i, f.read_int());
     f.read_word(1); // "}"
   } else if (!strcmp(c,"colweights")) {
     int cols = grid->cols();
     f.read_word(1); // "{"
-    for (int i=0; i<cols; i++) grid->col_weight(i, f.read_int());
+    for (i =0; i<cols; i++) grid->col_weight(i, f.read_int());
     f.read_word(1); // "}"
   } else if (!strcmp(c,"colgaps")) {
     int cols = grid->cols();
     f.read_word(1); // "{"
-    for (int i=0; i<cols; i++) grid->col_gap(i, f.read_int());
+    for (i =0; i<cols; i++) grid->col_gap(i, f.read_int());
     f.read_word(1); // "}"
   } else {
     super::read_property(f, c);
@@ -612,7 +618,8 @@ void Grid_Node::write_code2(fld::io::Code_Writer& f) {
   const char *var = name() ? name() : "o";
   Fl_Grid* grid = (Fl_Grid*)o;
   bool first_cell = true;
-  for (int i=0; i<grid->children(); i++) {
+  int i;
+  for (i =0; i<grid->children(); i++) {
     Fl_Widget *c = grid->child(i);
     Fl_Grid::Cell *cell = grid->cell(c);
     if (cell) {
@@ -694,14 +701,16 @@ void Grid_Node::insert_child_at(Fl_Widget *child, int x, int y) {
   int x0 = grid->x() + Fl::box_dx(grid->box()) + ml;
   int y0 = grid->y() + Fl::box_dy(grid->box()) + mt;
 
-  for (int r = 0; r < grid->rows(); r++) {
+  int r;
+  for (r = 0; r < grid->rows(); r++) {
     if (y>y0) row = r;
     int gap = grid->row_gap(r)>=0 ? grid->row_gap(r) : grg;
     y0 += grid->computed_row_height(r);
     y0 += gap;
   }
 
-  for (int c = 0; c < grid->cols(); c++) {
+  int c;
+  for (c = 0; c < grid->cols(); c++) {
     if (x>x0) col = c;
     int gap = grid->col_gap(c)>=0 ? grid->col_gap(c) : gcg;
     x0 += grid->computed_col_width(c);
@@ -732,8 +741,10 @@ void Grid_Node::insert_child_at_next_free_cell(Fl_Widget *child) {
 //      c = current_cell->col();
 //    }
 //  }
-  for (int r = 0; r < grid->rows(); r++) {
-    for (int c = 0; c < grid->cols(); c++) {
+  int r;
+  for (r = 0; r < grid->rows(); r++) {
+    int c;
+    for (c = 0; c < grid->cols(); c++) {
       if (!grid->cell(r, c)) {
         grid->move_cell(child, r, c);
         return;
diff --git a/fluid/nodes/Group_Node.cxx b/fluid/nodes/Group_Node.cxx
index 8ff3b9cdf..d4dc93780 100644
--- a/fluid/nodes/Group_Node.cxx
+++ b/fluid/nodes/Group_Node.cxx
@@ -79,7 +79,8 @@ void fix_group_size(Node *tt) {
   int Y = t->o->y();
   int R = X+t->o->w();
   int B = Y+t->o->h();
-  for (Node *nn = t->next; nn && nn->level > t->level; nn = nn->next) {
+  Node *nn;
+  for (nn = t->next; nn && nn->level > t->level; nn = nn->next) {
     if (nn->is_true_widget()) {
       Widget_Node* n = (Widget_Node*)nn;
       int x = n->o->x();  if (x < X) X = x;
@@ -122,7 +123,8 @@ void group_cb(Fl_Widget *, void *) {
   Group_Node *n = (Group_Node*)(Group_Node::prototype.make(Strategy::AS_LAST_CHILD));
   n->move_before(q);
   n->o->resize(q->o->x(),q->o->y(),q->o->w(),q->o->h());
-  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;
@@ -166,7 +168,8 @@ void ungroup_cb(Fl_Widget *, void *) {
   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;
@@ -319,7 +322,8 @@ Fl_Widget *Flex_Node::enter_live_mode(int) {
   Fl_Flex *d = grp, *s =(Fl_Flex*)o;
   int nc = s->children(), nd = d->children();
   if (nc>nd) nc = nd;
-  for (int i=0; i<nc; i++) {
+  int i;
+  for (i =0; i<nc; i++) {
     if (s->fixed(s->child(i))) {
       Fl_Widget *dc = d->child(i);
       d->fixed(d->child(i), s->horizontal() ? dc->w() : dc->h());
@@ -340,7 +344,8 @@ void Flex_Node::copy_properties()
 
 void Flex_Node::copy_properties_for_children() {
   Fl_Flex *d = (Fl_Flex*)live_widget, *s =(Fl_Flex*)o;
-  for (int i=0; i<s->children(); i++) {
+  int i;
+  for (i =0; i<s->children(); i++) {
     if (s->fixed(s->child(i)) && i<d->children()) {
       if (s->horizontal()) {
         d->fixed(d->child(i), d->child(i)->w());
@@ -363,12 +368,13 @@ void Flex_Node::write_properties(fld::io::Project_Writer &f)
   if (flex->gap())
     f.write_string("gap %d", flex->gap());
   int nSet = 0;
-  for (int i=0; i<flex->children(); i++)
+  int i;
+  for (i =0; i<flex->children(); i++)
     if (flex->fixed(flex->child(i)))
       nSet++;
   if (nSet) {
     f.write_string("fixed_size_tuples {%d", nSet);
-    for (int i=0; i<flex->children(); i++) {
+    for (i =0; i<flex->children(); i++) {
       Fl_Widget *ci = flex->child(i);
       if (flex->fixed(ci))
         f.write_string(" %d %d", i, flex->horizontal() ? ci->w() : ci->h());
@@ -394,7 +400,8 @@ void Flex_Node::read_property(fld::io::Project_Reader &f, const char *c)
     const char *nStr = f.read_word(1); // number of indices in table
     fixedSizeTupleSize = atoi(nStr);
     fixedSizeTuple = new int[fixedSizeTupleSize*2];
-    for (int i=0; i<fixedSizeTupleSize; i++) {
+    int i;
+    for (i =0; i<fixedSizeTupleSize; i++) {
       const char *ix = f.read_word(1); // child at that index is fixed in size
       fixedSizeTuple[i*2] = atoi(ix);
       const char *size = f.read_word(1); // fixed size of that child
@@ -410,7 +417,8 @@ void Flex_Node::postprocess_read()
 {
   Fl_Flex* flex = (Fl_Flex*)o;
   if (fixedSizeTupleSize>0) {
-    for (int i=0; i<fixedSizeTupleSize; i++) {
+    int i;
+    for (i =0; i<fixedSizeTupleSize; i++) {
       int ix = fixedSizeTuple[2*i];
       int size = fixedSizeTuple[2*i+1];
       if (ix>=0 && ix<flex->children()) {
@@ -434,7 +442,8 @@ void Flex_Node::write_code2(fld::io::Code_Writer& f) {
     f.write_c("%s%s->margin(%d, %d, %d, %d);\n", f.indent(), var, lm, tm, rm, bm);
   if (flex->gap())
     f.write_c("%s%s->gap(%d);\n", f.indent(), var, flex->gap());
-  for (int i=0; i<flex->children(); ++i) {
+  int i;
+  for (i =0; i<flex->children(); ++i) {
     Fl_Widget *ci = flex->child(i);
     if (flex->fixed(ci))
       f.write_c("%s%s->fixed(%s->child(%d), %d);\n", f.indent(), var, var, i,
@@ -489,15 +498,16 @@ void Flex_Node::change_subtype_to(int n) {
     int fh = f->h()-dh-tm-bm-(nc*gap);
     if (fh<=nc) fh = nc; // avoid division by zero
 
+    int i;
     if (f->type()==Fl_Flex::HORIZONTAL && n==Fl_Flex::VERTICAL) {
       float scl = (float)fh/(float)fw;
-      for (int i=0; i<nc; i++) {
+      for (i =0; i<nc; i++) {
         Fl_Widget* c = f->child(i);
         c->size(f->w(), (int)(c->w()*scl));
       }
     } else if (f->type()==Fl_Flex::VERTICAL && n==Fl_Flex::HORIZONTAL) {
       float scl = (float)fw/(float)fh;
-      for (int i=0; i<nc; i++) {
+      for (i =0; i<nc; i++) {
         Fl_Widget* c = f->child(i);
         c->size((int)(c->h()*scl), f->h());
       }
@@ -658,8 +668,9 @@ public:
   Fl_Table_Proxy(int x, int y, int w, int h, const char *l=0)
   : Fl_Table(x, y, w, h, l) {
     end();
-    for ( int r=0; r<MAX_ROWS; r++ )
-      for ( int c=0; c<MAX_COLS; c++ )
+    int r, c;
+    for (r =0; r<MAX_ROWS; r++ )
+      for (c =0; c<MAX_COLS; c++ )
         data[r][c] = 1000+(r*1000)+c;
     // Rows
     rows(MAX_ROWS);             // how many rows
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));
diff --git a/fluid/nodes/Node.cxx b/fluid/nodes/Node.cxx
index 8e0041f3c..79bd04b3b 100644
--- a/fluid/nodes/Node.cxx
+++ b/fluid/nodes/Node.cxx
@@ -133,8 +133,10 @@ Node *in_this_only; // set if menu popped-up in window
  */
 void print_project_tree() {
   fprintf(stderr, "---- %s --->\n", Fluid.proj.projectfile_name().c_str());
-  for (Node *t = Fluid.proj.tree.first; t; t = t->next) {
-    for (int i = t->level; i > 0; i--)
+  Node *t;
+  for (t = Fluid.proj.tree.first; t; t = t->next) {
+    int i;
+    for (i = t->level; i > 0; i--)
       fprintf(stderr, ". ");
     fprintf(stderr, "%s\n", subclassname(t).c_str());
   }
@@ -180,7 +182,8 @@ bool validate_project_tree() {
 bool validate_independent_branch(class Node *root) {
   // Make sure that `first` and `last` do not point at any node in this branch
   if (Fluid.proj.tree.first) {
-    for (Node *t = root; t; t = t->next) {
+    Node *t;
+    for (t = root; t; t = t->next) {
       if (Fluid.proj.tree.first == t) {
         fprintf(stderr, "ERROR: Branch is not independent, `first` is pointing to branch member!\n");
         return false;
@@ -188,7 +191,7 @@ bool validate_independent_branch(class Node *root) {
     }
   }
   if (Fluid.proj.tree.last) {
-    for (Node *t = root; t; t = t->next) {
+    for (t = root; t; t = t->next) {
       if (Fluid.proj.tree.last == t) {
         fprintf(stderr, "ERROR: Branch is not independent, `last` is pointing to branch member!\n");
         return false;
@@ -216,7 +219,8 @@ bool validate_branch(class Node *root) {
     return false;
   }
   // Check relation between this and next node
-  for (Node *t = root; t; t = t->next) {
+  Node *t;
+  for (t = root; t; t = t->next) {
     if (t->level < root->level) {
       fprintf(stderr, "ERROR: Node in tree is above root level!\n");
       return false;
@@ -241,7 +245,8 @@ bool validate_branch(class Node *root) {
       }
     }
     // Validate the `parent` entry
-    for (Node *p = t->prev; ; p = p->prev) {
+    Node *p;
+    for (p = t->prev; ; p = p->prev) {
       if (p == 0) {
         if (t->parent != 0) {
           fprintf(stderr, "ERROR: `parent` pointer should be 0!\n");
@@ -270,16 +275,17 @@ void select_all_cb(Fl_Widget *,void *) {
     for (; t && t != in_this_only; t = t->parent) {/*empty*/}
     if (t != in_this_only) p = in_this_only;
   }
+  Node *t;
   for (;;) {
     if (p) {
       int foundany = 0;
-      for (Node *t = p->next; t && t->level>p->level; t = t->next) {
+      for (t = p->next; t && t->level>p->level; t = t->next) {
         if (!t->new_selected) {widget_browser->select(t,1,0); foundany = 1;}
       }
       if (foundany) break;
       p = p->parent;
     } else {
-      for (Node *t = Fluid.proj.tree.first; t; t = t->next)
+      for (t = Fluid.proj.tree.first; t; t = t->next)
         widget_browser->select(t,1,0);
       break;
     }
@@ -294,16 +300,17 @@ void select_none_cb(Fl_Widget *,void *) {
     for (; t && t != in_this_only; t = t->parent) {/*empty*/}
     if (t != in_this_only) p = in_this_only;
   }
+  Node *t;
   for (;;) {
     if (p) {
       int foundany = 0;
-      for (Node *t = p->next; t && t->level>p->level; t = t->next) {
+      for (t = p->next; t && t->level>p->level; t = t->next) {
         if (t->new_selected) {widget_browser->select(t,0,0); foundany = 1;}
       }
       if (foundany) break;
       p = p->parent;
     } else {
-      for (Node *t = Fluid.proj.tree.first; t; t = t->next)
+      for (t = Fluid.proj.tree.first; t; t = t->next)
         widget_browser->select(t,0,0);
       break;
     }
@@ -388,7 +395,8 @@ void delete_all(int selected_only) {
       widget_browser->save_scroll_position();
     widget_browser->new_list();
   }
-  for (Node *f = Fluid.proj.tree.first; f;) {
+  Node *f;
+  for (f = Fluid.proj.tree.first; f;) {
     if (f->selected || !selected_only) {
       delete_children(f);
       Node *g = f->next;
@@ -590,7 +598,8 @@ const char* Node::title() {
 Window_Node *Node::window() {
   if (!is_widget())
     return 0;
-  for (Node *t = this; t; t=t->parent)
+  Node *t;
+  for (t = this; t; t=t->parent)
     if (t->is_a(FLD_NODE_TYPE_Window))
       return (Window_Node*)t;
   return 0;
@@ -603,7 +612,8 @@ Window_Node *Node::window() {
 Group_Node *Node::group() {
   if (!is_widget())
     return 0;
-  for (Node *t = this; t; t=t->parent)
+  Node *t;
+  for (t = this; t; t=t->parent)
     if (t->is_a(FLD_NODE_TYPE_Group))
       return (Group_Node*)t;
   return 0;
@@ -677,7 +687,8 @@ void Node::add(Node *anchor, Strategy strategy) {
 
   // Walk the tree to update parent pointers and levels
   int source_level = level;
-  for (Node *t = this; t; t = t->next) {
+  Node *t;
+  for (t = this; t; t = t->next) {
     t->level += (target_level-source_level);
     if (t->level == target_level)
       t->parent = target_parent;
@@ -708,7 +719,7 @@ void Node::add(Node *anchor, Strategy strategy) {
   }
 
   // Give the widgets in our tree a chance to update themselves
-  for (Node *t = this; t && t!=end->next; t = t->next) {
+  for (t = this; t && t!=end->next; t = t->next) {
     if (target_parent && (t->level == target_level))
       target_parent->add_child(t, 0);
     update_visibility_flag(t);
@@ -744,7 +755,8 @@ void Node::insert(Node *g) {
   // run the list again to set the future node levels
   int newlevel = g->level;
   visible = g->visible;
-  for (Node *t = this->next; t; t = t->next) t->level += newlevel-level;
+  Node *t;
+  for (t = this->next; t; t = t->next) t->level += newlevel-level;
   level = newlevel;
   // insert this in the list before g
   prev = g->prev;
@@ -1186,7 +1198,8 @@ void Node::copy_properties() {
   the parameter types match.
  */
 int Node::user_defined(const char* cbname) const {
-  for (Node* p = Fluid.proj.tree.first; p ; p = p->next)
+  Node *p;
+  for (p = Fluid.proj.tree.first; p ; p = p->next)
     if (p->is_a(FLD_NODE_TYPE_Function) && p->name() != 0)
       if (strncmp(p->name(), cbname, strlen(cbname)) == 0)
         if (p->name()[strlen(cbname)] == '(')
diff --git a/fluid/nodes/Tree.cxx b/fluid/nodes/Tree.cxx
index d437b5bd3..e11c399e2 100644
--- a/fluid/nodes/Tree.cxx
+++ b/fluid/nodes/Tree.cxx
@@ -19,11 +19,7 @@
 
 #include "Project.h"
 
-using namespace fld;
-using namespace fld::node;
-
-
-Tree::Iterator::Iterator(Node *t, bool only_selected)
+fld::node::Tree::Iterator::Iterator(Node *t, bool only_selected)
 : type_(t)
 , only_selected_(only_selected)
 {
@@ -36,7 +32,7 @@ Tree::Iterator::Iterator(Node *t, bool only_selected)
   }
 }
 
-Tree::Iterator &Tree::Iterator::operator++() {
+fld::node::Tree::Iterator &fld::node::Tree::Iterator::operator++() {
   if (only_selected_) {
     do {
       type_ = type_->next;
@@ -47,7 +43,7 @@ Tree::Iterator &Tree::Iterator::operator++() {
   return *this;
 }
 
-Tree::WIterator::WIterator(Node *t, bool only_selected)
+fld::node::Tree::WIterator::WIterator(Node *t, bool only_selected)
 : type_(t)
 , only_selected_(only_selected)
 {
@@ -64,7 +60,7 @@ Tree::WIterator::WIterator(Node *t, bool only_selected)
   }
 }
 
-Tree::WIterator& Tree::WIterator::operator++() {
+fld::node::Tree::WIterator& fld::node::Tree::WIterator::operator++() {
   if (only_selected_) {
     do {
       type_ = type_->next;
@@ -78,7 +74,7 @@ Tree::WIterator& Tree::WIterator::operator++() {
 }
 
 
-Tree::Tree(Project &proj)
+fld::node::Tree::Tree(Project &proj)
 : proj_(proj)
 { (void)proj_; }
 
@@ -91,7 +87,7 @@ Tree::Tree(Project &proj)
  \param[in] uid any number between 0 and 65535
  \return the node with this uid, or 0 if not found
  */
-Node *Tree::find_by_uid(unsigned short uid) {
+Node *fld::node::Tree::find_by_uid(unsigned short uid) {
   for (Node *tp: all_nodes()) {
     if (tp->get_uid() == uid) return tp;
   }
@@ -105,7 +101,7 @@ Node *Tree::find_by_uid(unsigned short uid) {
  \param[in] crsr cursor position in text
  \return the node we found or 0
  */
-Node *Tree::find_in_text(int text_type, int crsr) {
+Node *fld::node::Tree::find_in_text(int text_type, int crsr) {
   for (Node *node: all_nodes()) {
     switch (text_type) {
       case 0:
diff --git a/fluid/nodes/Widget_Node.cxx b/fluid/nodes/Widget_Node.cxx
index d5d256dbe..757155335 100644
--- a/fluid/nodes/Widget_Node.cxx
+++ b/fluid/nodes/Widget_Node.cxx
@@ -51,8 +51,6 @@
 #define MAX(a,b) ((a)>=(b) ? (a) : (b))
 #endif
 
-using namespace fld;
-using namespace fld::proj;
 
 extern void redraw_browser();
 
@@ -386,7 +384,8 @@ void name_public_cb(Fl_Choice* i, void* v) {
       i->show();
   } else {
     int mod = 0;
-    for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+    Node *o;
+    for (o = Fluid.proj.tree.first; o; o = o->next) {
       if (o->selected && o->is_widget()) {
         ((Widget_Node*)o)->public_ = i->value();
         mod = 1;
@@ -433,7 +432,8 @@ void label_cb(Fl_Input* i, void* v) {
     if (i->changed()) {
       Fluid.proj.undo.suspend();
       int mod = 0;
-      for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+      Node *o;
+      for (o = Fluid.proj.tree.first; o; o = o->next) {
         if (o->selected && o->is_widget()) {
           if (!mod) {
             if (first_change) {
@@ -724,7 +724,8 @@ Fl_Menu_Item boxmenu[] = {
 
 const char* boxname(int i) {
   if (!i) i = ZERO_ENTRY;
-  for (int j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
+  int j;
+  for (j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
     if (boxmenu[j].argument() == i)
       return boxmenu[j].label();
   return 0;
@@ -733,7 +734,8 @@ const char* boxname(int i) {
 int boxnumber(const char* i) {
   if (i[0]=='F' && i[1]=='L' && i[2]=='_')
     i += 3;
-  for (int j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
+  int j;
+  for (j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
     if (boxmenu[j].label() && !strcmp(boxmenu[j].label(), i)) {
       return int(boxmenu[j].argument());
     }
@@ -896,7 +898,8 @@ void labeltype_cb(Fl_Choice* i, void* v) {
   if (v == LOAD) {
     int n = current_widget->o->labeltype();
     i->when(FL_WHEN_RELEASE);
-    for (int j = 0; j < int(sizeof(labeltypemenu)/sizeof(*labeltypemenu)); j++) {
+    int j;
+    for (j = 0; j < int(sizeof(labeltypemenu)/sizeof(*labeltypemenu)); j++) {
       if (labeltypemenu[j].argument() == n) {
         i->value(j);
         break;
@@ -908,7 +911,8 @@ void labeltype_cb(Fl_Choice* i, void* v) {
     int n = int(labeltypemenu[m].argument());
     if (n<0)
       return; // should not happen
-    for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+    Node *o;
+    for (o = Fluid.proj.tree.first; o; o = o->next) {
       if (o->selected && o->is_widget()) {
         Widget_Node* p = (Widget_Node*)o;
         p->o->labeltype((Fl_Labeltype)n);
@@ -943,7 +947,8 @@ Fl_Menu_Item colormenu[] = {
 
 void color_common(Fl_Color c) {
   int mod = 0;
-  for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+  Node *o;
+  for (o = Fluid.proj.tree.first; o; o = o->next) {
     if (o->selected && o->is_widget()) {
       Widget_Node* q = (Widget_Node*)o;
       q->o->color(c); q->o->redraw();
@@ -963,7 +968,8 @@ void color_common(Fl_Color c) {
 
 void color2_common(Fl_Color c) {
   int mod = 0;
-  for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+  Node *o;
+  for (o = Fluid.proj.tree.first; o; o = o->next) {
     if (o->selected && o->is_widget()) {
       Widget_Node* q = (Widget_Node*)o;
       q->o->selection_color(c); q->o->redraw();
@@ -978,7 +984,8 @@ void color2_common(Fl_Color c) {
 
 void labelcolor_common(Fl_Color c) {
   int mod = 0;
-  for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+  Node *o;
+  for (o = Fluid.proj.tree.first; o; o = o->next) {
     if (o->selected && o->is_widget()) {
       Widget_Node* q = (Widget_Node*)o;
       q->o->labelcolor(c); q->redraw();
@@ -1029,7 +1036,8 @@ void align_cb(Fl_Button* i, void* v) {
   } else {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
-    for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+    Node *o;
+    for (o = Fluid.proj.tree.first; o; o = o->next) {
       if (o->selected && o->is_widget()) {
         Widget_Node* q = (Widget_Node*)o;
         Fl_Align x = q->o->align();
@@ -1079,7 +1087,8 @@ void align_position_cb(Fl_Choice* i, void* v) {
     Fl_Align b = Fl_Align(fl_uintptr_t(mi->user_data()));
     int mod = 0;
     Fluid.proj.undo.checkpoint();
-    for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+    Node *o;
+    for (o = Fluid.proj.tree.first; o; o = o->next) {
       if (o->selected && o->is_widget()) {
         Widget_Node* q = (Widget_Node*)o;
         Fl_Align x = q->o->align();
@@ -1114,7 +1123,8 @@ void align_text_image_cb(Fl_Choice* i, void* v) {
     Fl_Align b = Fl_Align(fl_uintptr_t(mi->user_data()));
     int mod = 0;
     Fluid.proj.undo.checkpoint();
-    for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+    Node *o;
+    for (o = Fluid.proj.tree.first; o; o = o->next) {
       if (o->selected && o->is_widget()) {
         Widget_Node* q = (Widget_Node*)o;
         Fl_Align x = q->o->align();
@@ -1156,7 +1166,8 @@ int Widget_Node::textstuff(int, Fl_Font&, int&, Fl_Color&) {
 void textcolor_common(Fl_Color c) {
   Fl_Font n; int s;
   int mod = 0;
-  for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+  Node *o;
+  for (o = Fluid.proj.tree.first; o; o = o->next) {
     if (o->selected && o->is_widget()) {
       Widget_Node* q = (Widget_Node*)o;
       q->textstuff(3,n,s,c); q->o->redraw();
@@ -1245,7 +1256,8 @@ Fl_Menu_Item* Widget_Node::subtypes() { return 0; }
 void propagate_load(Fl_Group* g, void* v) {
   if (v == LOAD) {
     Fl_Widget*const* a = g->array();
-    for (int i=g->children(); i--;) {
+    int i;
+    for (i =g->children(); i--;) {
       Fl_Widget* o = *a++;
       o->do_callback(o, LOAD, FL_REASON_USER);
     }
@@ -1255,7 +1267,8 @@ void propagate_load(Fl_Group* g, void* v) {
 void set_cb(Fl_Button*, void*) {
   haderror = 0;
   Fl_Widget*const* a = the_panel->array();
-  for (int i=the_panel->children(); i--;) {
+  int i;
+  for (i =the_panel->children(); i--;) {
     Fl_Widget* o = *a++;
     if (o->changed()) {
       o->do_callback();
@@ -1391,7 +1404,8 @@ void load_panel() {
       current_node = 0;
       if (Fluid.proj.tree.current->is_widget())
         current_widget=(Widget_Node*)Fluid.proj.tree.current;
-      for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+      Node *o;
+      for (o = Fluid.proj.tree.first; o; o = o->next) {
         if (o->is_widget() && o->selected) {
           numselected++;
           if (!current_widget) current_widget = (Widget_Node*)o;
@@ -1468,12 +1482,13 @@ extern void update_codeview_position();
 // old panel in that case, as the object may no longer exist)
 void selection_changed(Node* p) {
   // store all changes to the current selected objects:
+  Node *o;
   if (p && the_panel && the_panel->visible()) {
     set_cb(0,0);
     // if there was an error, we try to leave the selected set unchanged:
     if (haderror) {
       Node* q = 0;
-      for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+      for (o = Fluid.proj.tree.first; o; o = o->next) {
         o->new_selected = o->selected;
         if (!q && o->selected) q = o;
       }
@@ -1485,7 +1500,7 @@ void selection_changed(Node* p) {
   }
   // update the selected flags to new set:
   Node* q = 0;
-  for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+  for (o = Fluid.proj.tree.first; o; o = o->next) {
     o->selected = o->new_selected;
     if (!q && o->selected) q = o;
   }
@@ -1626,7 +1641,8 @@ void Widget_Node::write_static(fld::io::Code_Writer& f) {
       f.write_c("void %s::%s(%s* o, %s v) {\n", k, cn, t, ut);
       f.write_c("%s((%s*)(o", f.indent(1), k);
       Node* q = 0;
-      for (Node* p = parent; p && p->is_widget(); q = p, p = p->parent)
+      Node *p;
+      for (p = parent; p && p->is_widget(); q = p, p = p->parent)
         f.write_c("->parent()");
       if (!q || !q->is_a(FLD_NODE_TYPE_Widget_Class))
         f.write_c("->user_data()");
@@ -2018,7 +2034,8 @@ void Widget_Node::write_widget_code(fld::io::Code_Writer& f) {
 }
 
 void Widget_Node::write_extra_code(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)))
       f.write_c("%s%s\n", f.indent(), extra_code(n));
 }
@@ -2158,7 +2175,8 @@ void Widget_Node::write_properties(fld::io::Project_Writer &f) {
   if (resizable()) f.write_string("resizable");
   if (hotspot()) f.write_string(is_a(FLD_NODE_TYPE_Menu_Item) ? "divider" : "hotspot");
   if (menu_headline()) f.write_string("headline");
-  for (int n=0; n < NUM_EXTRA_CODE; n++) if (extra_code(n) && extra_code(n)[0]) {
+  int n;
+  for (n =0; n < NUM_EXTRA_CODE; n++) if (extra_code(n) && extra_code(n)[0]) {
     f.write_indent(level+1);
     f.write_string("code%d",n);
     f.write_word(extra_code(n));
diff --git a/fluid/nodes/Window_Node.cxx b/fluid/nodes/Window_Node.cxx
index 9a53d2ecb..5cdda615d 100644
--- a/fluid/nodes/Window_Node.cxx
+++ b/fluid/nodes/Window_Node.cxx
@@ -163,8 +163,9 @@ void Overlay_Window::draw() {
   if ((damage()&FL_DAMAGE_ALL) &&
       (!box() || (box()>=4&&!(box()&2)) || box()>=FL_ROUNDED_BOX)) {
     // if so, draw checkerboard so user can see what areas are clear:
-    for (int Y = 0; Y < h(); Y += CHECKSIZE)
-      for (int X = 0; X < w(); X += CHECKSIZE) {
+    int Y, X;
+    for (Y = 0; Y < h(); Y += CHECKSIZE)
+      for (X = 0; X < w(); X += CHECKSIZE) {
         fl_color(((Y/(2*CHECKSIZE))&1) != ((X/(2*CHECKSIZE))&1) ?
                  FL_WHITE : FL_BLACK);
         fl_rectf(X,Y,CHECKSIZE,CHECKSIZE);
@@ -402,7 +403,8 @@ void Window_Node::newdx() {
 
   if (Fluid.show_guides && (drag & (FD_DRAG|FD_TOP|FD_LEFT|FD_BOTTOM|FD_RIGHT))) {
     Node *selection = 0; // special power for the first selected widget
-    for (Node *q=next; q && q->level>level; q = q->next) {
+    Node *q;
+    for (q =next; q && q->level>level; q = q->next) {
       if (q->selected && q->is_true_widget()) {
         selection = q;
         break;
@@ -492,7 +494,8 @@ void fd_hatch(int x, int y, int w, int h, int size=6, int offset=0, int pad=3) {
  \param[in] x, y, w, h bounding box of this group
  */
 void Window_Node::draw_out_of_bounds(Widget_Node *group, int x, int y, int w, int h) {
-  for (Node *p = group->next; p && p->level>group->level; p = p->next) {
+  Node *p;
+  for (p = group->next; p && p->level>group->level; p = p->next) {
     if (p->level == group->level+1 && p->is_true_widget()) {
       Fl_Widget *o = ((Widget_Node*)p)->o;
       if (o->x() < x) fd_hatch(o->x(), o->y(), x-o->x(), o->h());
@@ -510,7 +513,8 @@ void Window_Node::draw_out_of_bounds() {
   // get every group in the hierarchy, then draw any overlap of a direct child with that group
   fl_color(FL_DARK_RED);
   draw_out_of_bounds(this, 0, 0, o->w(), o->h());
-  for (Node *q=next; q && q->level>level; q = q->next) {
+  Node *q;
+  for (q =next; q && q->level>level; q = q->next) {
     // don't do this for Fl_Scroll (which we currently can't handle in FLUID anyway)
     if (q->is_a(FLD_NODE_TYPE_Group) && !q->is_a(FLD_NODE_TYPE_Scroll)) {
       Widget_Node *w = (Widget_Node*)q;
@@ -526,7 +530,8 @@ void Window_Node::draw_out_of_bounds() {
 void Window_Node::draw_overlaps() {
   fl_color(FL_DARK_YELLOW);
   // loop through all widgets in this window
-  for (Node *q=next; q && q->level>level; q = q->next) {
+  Node *q;
+  for (q =next; q && q->level>level; q = q->next) {
     // is it a valid widget
     if (q->is_true_widget()) {
       Widget_Node *w = (Widget_Node*)q;
@@ -534,7 +539,8 @@ void Window_Node::draw_overlaps() {
       if (w->o->visible()) {
         int x = w->o->x(), y = w->o->y();
         int r = x + w->o->w(), b = y + w->o->h();
-        for (Node *p=q->next; p && p->level>=q->level; p = p->next) {
+        Node *p;
+        for (p =q->next; p && p->level>=q->level; p = p->next) {
           if (p->level==q->level && p->is_true_widget()) {
             Widget_Node *wp = (Widget_Node*)p;
             if (wp->o->visible()) {
@@ -557,10 +563,11 @@ void Window_Node::draw_overlaps() {
 }
 
 void Window_Node::draw_overlay() {
+  Node *q;
   if (recalc) {
     bx = o->w(); by = o->h(); br = 0; bt = 0;
     numselected = 0;
-    for (Node *q=next; q && q->level>level; q=q->next)
+    for (q =next; q && q->level>level; q=q->next)
       if (q->selected && q->is_true_widget()) {
         numselected++;
         Widget_Node* myo = (Widget_Node*)q;
@@ -592,7 +599,7 @@ void Window_Node::draw_overlay() {
   int mysx,mysy,mysr,myst;
   mybx = mysx = o->w(); myby = mysy = o->h(); mybr = mysr = 0; mybt = myst = 0;
   Node *selection = 0; // special power for the first selected widget
-  for (Node *q=next; q && q->level>level; q = q->next)
+  for (q =next; q && q->level>level; q = q->next)
     if (q->selected && q->is_true_widget()) {
       if (!selection) selection = q;
       Widget_Node* myo = (Widget_Node*)q;
@@ -674,7 +681,8 @@ void Window_Node::fix_overlay() {
 void check_redraw_corresponding_parent(Node *s) {
   Widget_Node * prev_parent = 0;
   if( !s || !s->selected || !s->is_widget()) return;
-  for (Node *i=s; i && i->parent; i=i->parent) {
+  Node *i;
+  for (i =s; i && i->parent; i=i->parent) {
     if (i->is_a(FLD_NODE_TYPE_Group) && prev_parent) {
       if (i->is_a(FLD_NODE_TYPE_Tabs)) {
         ((Fl_Tabs*)((Widget_Node*)i)->o)->value(prev_parent->o);
@@ -692,7 +700,8 @@ void check_redraw_corresponding_parent(Node *s) {
 
 // do that for every window (when selected set changes):
 void redraw_overlays() {
-  for (Node *o=Fluid.proj.tree.first; o; o=o->next)
+  Node *o;
+  for (o =Fluid.proj.tree.first; o; o=o->next)
     if (o->is_a(FLD_NODE_TYPE_Window)) ((Window_Node*)o)->fix_overlay();
 }
 
@@ -707,7 +716,8 @@ void toggle_overlays(Fl_Widget *,void *) {
     if (overlay_button) overlay_button->label("Hide &Overlays");
   }
 
-  for (Node *o=Fluid.proj.tree.first; o; o=o->next)
+  Node *o;
+  for (o =Fluid.proj.tree.first; o; o=o->next)
     if (o->is_a(FLD_NODE_TYPE_Window)) {
       Widget_Node* w = (Widget_Node*)o;
       ((Overlay_Window*)(w->o))->redraw_overlay();
@@ -730,7 +740,8 @@ void toggle_guides(Fl_Widget *,void *) {
   if (guides_button)
     guides_button->value(Fluid.show_guides);
 
-  for (Node *o=Fluid.proj.tree.first; o; o=o->next) {
+  Node *o;
+  for (o =Fluid.proj.tree.first; o; o=o->next) {
     if (o->is_a(FLD_NODE_TYPE_Window)) {
       Widget_Node* w = (Widget_Node*)o;
       ((Overlay_Window*)(w->o))->redraw_overlay();
@@ -762,7 +773,8 @@ void toggle_restricted(Fl_Widget *,void *) {
   if (restricted_button)
     restricted_button->value(Fluid.show_restricted);
 
-  for (Node *o=Fluid.proj.tree.first; o; o=o->next) {
+  Node *o;
+  for (o =Fluid.proj.tree.first; o; o=o->next) {
     if (o->is_a(FLD_NODE_TYPE_Window)) {
       Widget_Node* w = (Widget_Node*)o;
       ((Overlay_Window*)(w->o))->redraw_overlay();
@@ -776,7 +788,8 @@ void toggle_restricted(Fl_Widget *,void *) {
 void toggle_ghosted_outline_cb(Fl_Check_Button *,void *) {
   Fluid.show_ghosted_outline = !Fluid.show_ghosted_outline;
   Fluid.preferences.set("Fluid.show_ghosted_outline", Fluid.show_ghosted_outline);
-  for (Node *o=Fluid.proj.tree.first; o; o=o->next) {
+  Node *o;
+  for (o =Fluid.proj.tree.first; o; o=o->next) {
     if (o->is_a(FLD_NODE_TYPE_Window)) {
       Widget_Node* w = (Widget_Node*)o;
       ((Overlay_Window*)(w->o))->redraw();
@@ -914,6 +927,8 @@ int Window_Node::popupy = 0x7FFFFFFF;
 
 int Window_Node::handle(int event) {
   static Node* selection = 0;
+  Node *i;
+  Fl_Widget *o1;
   switch (event) {
   case FL_DND_ENTER:
     // printf("DND enter\n");
@@ -922,7 +937,7 @@ int Window_Node::handle(int event) {
     {
       // find the innermost item clicked on:
       selection = this;
-      for (Node* i=next; i && i->level>level; i=i->next)
+      for (i =next; i && i->level>level; i=i->next)
         if (i->is_a(FLD_NODE_TYPE_Group)) {
           Widget_Node* myo = (Widget_Node*)i;
           if (Fl::event_inside(myo->o) && myo->o->visible_r()) {
@@ -974,7 +989,7 @@ int Window_Node::handle(int event) {
         // ok, so it is an image - now add it as image() or deimage() to the widget
         // printf("DND check for target %s\n", fn);
         Widget_Node *tgt = 0;
-        for (Node* i=next; i && i->level>level; i=i->next) {
+        for (i =next; i && i->level>level; i=i->next) {
           if (i->is_widget()) {
             Widget_Node* myo = (Widget_Node*)i;
             if (Fl::event_inside(myo->o) && myo->o->visible_r())
@@ -1044,10 +1059,10 @@ int Window_Node::handle(int event) {
     }
     // find the innermost item clicked on:
     selection = this;
-    {for (Node* i=next; i && i->level>level; i=i->next)
+    {for (i =next; i && i->level>level; i=i->next)
       if (i->is_true_widget()) {
       Widget_Node* myo = (Widget_Node*)i;
-      for (Fl_Widget *o1 = myo->o; o1; o1 = o1->parent())
+      for (o1 = myo->o; o1; o1 = o1->parent())
         if (!o1->visible()) goto CONTINUE2;
       if (Fl::event_inside(myo->o)) {
         selection = myo;
@@ -1107,10 +1122,10 @@ int Window_Node::handle(int event) {
       // clear selection on everything:
       if (!toggle) deselect(); else Fl::event_is_click(0);
       // select everything in box:
-      for (Node*i=next; i&&i->level>level; i=i->next)
+      for (i =next; i&&i->level>level; i=i->next)
         if (i->is_true_widget()) {
         Widget_Node* myo = (Widget_Node*)i;
-        for (Fl_Widget *o1 = myo->o; o1; o1 = o1->parent())
+        for (o1 = myo->o; o1; o1 = o1->parent())
           if (!o1->visible()) goto CONTINUE;
         if (Fl::event_inside(myo->o)) selection = myo;
         if (myo && myo->o && myo->o->x()>=x1 && myo->o->y()>y1 &&
diff --git a/fluid/nodes/factory.cxx b/fluid/nodes/factory.cxx
index 7e6726a41..c901c9945 100644
--- a/fluid/nodes/factory.cxx
+++ b/fluid/nodes/factory.cxx
@@ -158,7 +158,8 @@ public:
     // Avoid this when compiling so it works w/o a display:
     if (!Fluid.batch_mode) {
       char buffer[20];
-      for (int i = 1; i <= 20; i++) {
+      int i;
+      for (i = 1; i <= 20; i++) {
         sprintf(buffer,"Browser Line %d",i);
         b->add(buffer);
       }
@@ -193,7 +194,8 @@ public:
     // Avoid this when compiling so it works w/o a display:
     if (!Fluid.batch_mode) {
       char buffer[20];
-      for (int i = 1; i <= 20; i++) {
+      int i;
+      for (i = 1; i <= 20; i++) {
         sprintf(buffer,"Browser Line %d",i);
         b->add(buffer);
       }
@@ -1560,7 +1562,8 @@ static void make_iconlabel(Fl_Menu_Item *mi, Fl_Image *ic, const char *txt)
  Names and icons are taken from the referenced prototypes.
  */
 void fill_in_New_Menu() {
-  for (unsigned i = 0; i < sizeof(New_Menu)/sizeof(*New_Menu); i++) {
+  unsigned i;
+  for (i = 0; i < sizeof(New_Menu)/sizeof(*New_Menu); i++) {
     Fl_Menu_Item *m = New_Menu+i;
     if (m->user_data()) {
       Node *t = (Node*)m->user_data();
@@ -1586,7 +1589,8 @@ Node *typename_to_prototype(const char *inName)
 {
   if (inName==0 || *inName==0)
     return 0;
-  for (unsigned i = 0; i < sizeof(known_types)/sizeof(*known_types); i++) {
+  unsigned i;
+  for (i = 0; i < sizeof(known_types)/sizeof(*known_types); i++) {
     Node *prototype = known_types[i];
     if (fl_ascii_strcasecmp(inName, prototype->type_name())==0)
       return prototype;
@@ -1774,7 +1778,8 @@ static symbol table[] = {
 int lookup_symbol(const char *name, int &v, int numberok) {
   if ((name[0]=='F') && (name[1]=='L') && (name[2]=='_'))
     name += 3;
-  for (int i=0; i < int(sizeof(table)/sizeof(*table)); i++) {
+  int i;
+  for (i =0; i < int(sizeof(table)/sizeof(*table)); i++) {
     if (!fl_ascii_strcasecmp(name,table[i].name)) {
       v = table[i].value;
       return 1;