wip

1 files changed, 30 insertions, 30 deletions

diff --git a/fluid/nodes/Widget_Node.cxx b/fluid/nodes/Widget_Node.cxx
index 757155335..51ccf8bb0 100644
--- a/fluid/nodes/Widget_Node.cxx
+++ b/fluid/nodes/Widget_Node.cxx
@@ -98,7 +98,7 @@ const char* subclassname(Node* l) {
 void Widget_Node::ideal_size(int &w, int &h) {
   w = 120;
   h = 100;
-  fld::app::Snap_Action::better_size(w, h);
+  Snap_Action::better_size(w, h);
 }
 
 /**
@@ -461,88 +461,88 @@ void label_cb(Fl_Input* i, void* v) {
 
 int widget_i = 0;
 
-static int vars_i_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_i_cb(const Formula_Input*, void* v) {
   return widget_i;
 }
 
-static int vars_x_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_x_cb(const Formula_Input*, void* v) {
   Node* t = (Node*)v;
   if (t->is_widget())
     return ((Widget_Node*)t)->o->x();
   return 0;
 }
 
-static int vars_y_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_y_cb(const Formula_Input*, void* v) {
   Node* t = (Node*)v;
   if (t->is_widget())
     return ((Widget_Node*)t)->o->y();
   return 0;
 }
 
-static int vars_w_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_w_cb(const Formula_Input*, void* v) {
   Node* t = (Node*)v;
   if (t->is_widget())
     return ((Widget_Node*)t)->o->w();
   return 0;
 }
 
-static int vars_h_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_h_cb(const Formula_Input*, void* v) {
   Node* t = (Node*)v;
   if (t->is_widget())
     return ((Widget_Node*)t)->o->h();
   return 0;
 }
 
-static int vars_px_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_px_cb(const Formula_Input*, void* v) {
   Node* t = ((Node*)v)->parent;
   if (t && t->is_widget())
     return ((Widget_Node*)t)->o->x();
   return 0;
 }
 
-static int vars_py_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_py_cb(const Formula_Input*, void* v) {
   Node* t = ((Node*)v)->parent;
   if (t && t->is_widget())
     return ((Widget_Node*)t)->o->y();
   return 0;
 }
 
-static int vars_pw_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_pw_cb(const Formula_Input*, void* v) {
   Node* t = ((Node*)v)->parent;
   if (t && t->is_widget())
     return ((Widget_Node*)t)->o->w();
   return 0;
 }
 
-static int vars_ph_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_ph_cb(const Formula_Input*, void* v) {
   Node* t = ((Node*)v)->parent;
   if (t && t->is_widget())
     return ((Widget_Node*)t)->o->h();
   return 0;
 }
 
-static int vars_sx_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_sx_cb(const Formula_Input*, void* v) {
   Node* t = ((Node*)v)->prev_sibling();
   if (t && t->is_widget())
     return ((Widget_Node*)t)->o->x();
   return 0;
 }
 
-static int vars_sy_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_sy_cb(const Formula_Input*, void* v) {
   Node* t = ((Node*)v)->prev_sibling();
   if (t && t->is_widget())
     return ((Widget_Node*)t)->o->y();
   return 0;
 }
 
-static int vars_sw_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_sw_cb(const Formula_Input*, void* v) {
   Node* t = ((Node*)v)->prev_sibling();
   if (t && t->is_widget())
     return ((Widget_Node*)t)->o->w();
   return 0;
 }
 
-static int vars_sh_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_sh_cb(const Formula_Input*, void* v) {
   Node* t = ((Node*)v)->prev_sibling();
   if (t && t->is_widget())
     return ((Widget_Node*)t)->o->h();
@@ -571,27 +571,27 @@ static void calculate_bbox(Node* p) {
   }
 }
 
-static int vars_cx_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_cx_cb(const Formula_Input*, void* v) {
   calculate_bbox((Node*)v);
   return bbox_x;
 }
 
-static int vars_cy_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_cy_cb(const Formula_Input*, void* v) {
   calculate_bbox((Node*)v);
   return bbox_y;
 }
 
-static int vars_cw_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_cw_cb(const Formula_Input*, void* v) {
   calculate_bbox((Node*)v);
   return bbox_r - bbox_x;
 }
 
-static int vars_ch_cb(const fld::widget::Formula_Input*, void* v) {
+static int vars_ch_cb(const Formula_Input*, void* v) {
   calculate_bbox((Node*)v);
   return bbox_b - bbox_y;
 }
 
-fld::widget::Formula_Input_Vars widget_vars[] = {
+Formula_Input_Vars widget_vars[] = {
   { "i", vars_i_cb },   // zero based counter of selected widgets
   { "x", vars_x_cb },   // position and size of current widget
   { "y", vars_y_cb },
@@ -1566,7 +1566,7 @@ int isdeclare(const char* c) {
   return 0;
 }
 
-void Widget_Node::write_static(fld::io::Code_Writer& f) {
+void Widget_Node::write_static(Code_Writer& f) {
   const char* t = subclassname(this);
   const char* sc = subclass();
   if (!sc || !sc[0] || (is_class() && strncmp(t, "Fl_", 3)==0)) {
@@ -1659,7 +1659,7 @@ void Widget_Node::write_static(fld::io::Code_Writer& f) {
   }
 }
 
-void Widget_Node::write_code1(fld::io::Code_Writer& f) {
+void Widget_Node::write_code1(Code_Writer& f) {
   const char* t = subclassname(this);
   const char* c = array_name(this);
   if (c) {
@@ -1787,7 +1787,7 @@ void Widget_Node::write_code1(fld::io::Code_Writer& f) {
   write_widget_code(f);
 }
 
-void Widget_Node::write_color(fld::io::Code_Writer& f, const char* field, Fl_Color color) {
+void Widget_Node::write_color(Code_Writer& f, const char* field, Fl_Color color) {
   const char* color_name = 0;
   switch (color) {
   case FL_FOREGROUND_COLOR:     color_name = "FL_FOREGROUND_COLOR";     break;
@@ -1825,8 +1825,8 @@ void Widget_Node::write_color(fld::io::Code_Writer& f, const char* field, Fl_Col
   }
 }
 
-// this is split from write_code1(fld::io::Code_Writer& f) for Window_Node:
-void Widget_Node::write_widget_code(fld::io::Code_Writer& f) {
+// this is split from write_code1(Code_Writer& f) for Window_Node:
+void Widget_Node::write_widget_code(Code_Writer& f) {
   Fl_Widget* tplate = ((Widget_Node*)factory)->o;
   const char* var = is_class() ? "this" : name() ? name() : "o";
 
@@ -2033,27 +2033,27 @@ void Widget_Node::write_widget_code(fld::io::Code_Writer& f) {
   }
 }
 
-void Widget_Node::write_extra_code(fld::io::Code_Writer& f) {
+void Widget_Node::write_extra_code(Code_Writer& f) {
   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));
 }
 
-void Widget_Node::write_block_close(fld::io::Code_Writer& f) {
+void Widget_Node::write_block_close(Code_Writer& f) {
   f.indentation--;
   f.write_c("%s} // %s* %s\n", f.indent(), subclassname(this),
           name() ? name() : "o");
 }
 
-void Widget_Node::write_code2(fld::io::Code_Writer& f) {
+void Widget_Node::write_code2(Code_Writer& f) {
   write_extra_code(f);
   write_block_close(f);
 }
 
 ////////////////////////////////////////////////////////////////
 
-void Widget_Node::write_properties(fld::io::Project_Writer &f) {
+void Widget_Node::write_properties(Project_Writer &f) {
   Node::write_properties(f);
   f.write_indent(level+1);
   switch (public_) {
@@ -2188,7 +2188,7 @@ void Widget_Node::write_properties(fld::io::Project_Writer &f) {
   }
 }
 
-void Widget_Node::read_property(fld::io::Project_Reader &f, const char* c) {
+void Widget_Node::read_property(Project_Reader &f, const char* c) {
   int x,y,w,h; Fl_Font ft; int s; Fl_Color cc;
   if (!strcmp(c,"private")) {
     public_ = 0;
@@ -2401,7 +2401,7 @@ int Widget_Node::read_fdesign(const char* propname, const char* value) {
   if (!strcmp(propname,"box")) {
     float x,y,w,h;
     if (sscanf(value,"%f %f %f %f",&x,&y,&w,&h) == 4) {
-      if (fld::io::fdesign_flip) {
+      if (fdesign_flip) {
         Node* p;
         for (p = parent; p && !p->is_a(FLD_NODE_TYPE_Window); p = p->parent) {/*empty*/}
         if (p && p->is_widget()) y = ((Widget_Node*)p)->o->h()-(y+h);