wip

1 files changed, 18 insertions, 18 deletions

diff --git a/fluid/nodes/Window_Node.cxx b/fluid/nodes/Window_Node.cxx
index 5cdda615d..a4fef0976 100644
--- a/fluid/nodes/Window_Node.cxx
+++ b/fluid/nodes/Window_Node.cxx
@@ -81,7 +81,7 @@ void i18n_type_cb(Fl_Choice *c, void *v) {
     c->value(static_cast<int>(Fluid.proj.i18n.type));
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n.type = static_cast<fld::I18n_Type>(c->value());
+    Fluid.proj.i18n.type = static_cast<I18n_Type>(c->value());
     Fluid.proj.set_modflag(1);
   }
   switch (Fluid.proj.i18n.type) {
@@ -344,7 +344,7 @@ void Window_Node::ideal_size(int &w, int &h) {
     Fl::screen_work_area(sx, sy, sw, sh, screen);
     w = MIN(w, sw*3/4); h = MIN(h, sh*3/4);
   }
-  fld::app::Snap_Action::better_size(w, h);
+  Snap_Action::better_size(w, h);
 }
 
 
@@ -364,7 +364,7 @@ void Overlay_Window::resize(int X,int Y,int W,int H) {
   if (X!=x() || Y!=y() || W!=w() || H!=h()) {
     // Set a checkpoint on the first resize event, ignore further resizes until
     // a different type of checkpoint is triggered.
-    if (Fluid.proj.undo.checkpoint(fld::proj::FLD_UNDO_ONCETYPE_WINDOW_RESIZE))
+    if (Fluid.proj.undo.checkpoint(FLD_UNDO_ONCETYPE_WINDOW_RESIZE))
       Fluid.proj.set_modflag(1);
   }
 
@@ -410,8 +410,8 @@ void Window_Node::newdx() {
         break;
       }
     }
-    fld::app::Snap_Data data = { mydx, mydy, bx, by, br, bt, drag, 4, 4, mydx, mydy, (Widget_Node*)selection, this };
-    fld::app::Snap_Action::check_all(data);
+    Snap_Data data = { mydx, mydy, bx, by, br, bt, drag, 4, 4, mydx, mydy, (Widget_Node*)selection, this };
+    Snap_Action::check_all(data);
     if (data.x_dist < 4) mydx = data.dx_out;
     if (data.y_dist < 4) mydy = data.dy_out;
   }
@@ -663,8 +663,8 @@ void Window_Node::draw_overlay() {
   fl_rectf(mysx,myst-5,5,5);
 
   if (Fluid.show_guides && (drag & (FD_DRAG|FD_TOP|FD_LEFT|FD_BOTTOM|FD_RIGHT))) {
-    fld::app::Snap_Data data = { dx, dy, sx, sy, sr, st, drag, 4, 4, dx, dy, (Widget_Node*)selection, this};
-    fld::app::Snap_Action::draw_all(data);
+    Snap_Data data = { dx, dy, sx, sy, sr, st, drag, 4, 4, dx, dy, (Widget_Node*)selection, this};
+    Snap_Action::draw_all(data);
   }
 }
 
@@ -1182,9 +1182,9 @@ int Window_Node::handle(int event) {
       if (Fl::event_state(FL_COMMAND)) {
         int x_step, y_step;
         if (drag & (FD_RIGHT|FD_BOTTOM))
-          fld::app::Snap_Action::get_resize_stepsize(x_step, y_step);
+          Snap_Action::get_resize_stepsize(x_step, y_step);
         else
-          fld::app::Snap_Action::get_move_stepsize(x_step, y_step);
+          Snap_Action::get_move_stepsize(x_step, y_step);
         dx *= x_step;
         dy *= y_step;
       }
@@ -1219,7 +1219,7 @@ int Window_Node::handle(int event) {
  Write the C++ code that comes before the children of the window are written.
  \param f the source code output stream
  */
-void Window_Node::write_code1(fld::io::Code_Writer& f) {
+void Window_Node::write_code1(Code_Writer& f) {
   Widget_Node::write_code1(f);
 }
 
@@ -1228,7 +1228,7 @@ void Window_Node::write_code1(fld::io::Code_Writer& f) {
  Write the C++ code that comes after the children of the window are written.
  \param f the source code output stream
  */
-void Window_Node::write_code2(fld::io::Code_Writer& f) {
+void Window_Node::write_code2(Code_Writer& f) {
   const char *var = is_class() ? "this" : name() ? name() : "o";
   // make the window modal or non-modal
   if (modal) {
@@ -1263,7 +1263,7 @@ void Window_Node::write_code2(fld::io::Code_Writer& f) {
   write_block_close(f);
 }
 
-void Window_Node::write_properties(fld::io::Project_Writer &f) {
+void Window_Node::write_properties(Project_Writer &f) {
   Widget_Node::write_properties(f);
   if (modal) f.write_string("modal");
   else if (non_modal) f.write_string("non_modal");
@@ -1274,7 +1274,7 @@ void Window_Node::write_properties(fld::io::Project_Writer &f) {
   if (o->visible() || override_visible_) f.write_string("visible");
 }
 
-void Window_Node::read_property(fld::io::Project_Reader &f, const char *c) {
+void Window_Node::read_property(Project_Reader &f, const char *c) {
   if (!strcmp(c,"modal")) {
     modal = 1;
   } else if (!strcmp(c,"non_modal")) {
@@ -1362,7 +1362,7 @@ Node *Widget_Class_Node::make(Strategy strategy) {
   return myo;
 }
 
-void Widget_Class_Node::write_properties(fld::io::Project_Writer &f) {
+void Widget_Class_Node::write_properties(Project_Writer &f) {
   Window_Node::write_properties(f);
   if (wc_relative==1)
     f.write_string("position_relative");
@@ -1370,7 +1370,7 @@ void Widget_Class_Node::write_properties(fld::io::Project_Writer &f) {
     f.write_string("position_relative_rescale");
 }
 
-void Widget_Class_Node::read_property(fld::io::Project_Reader &f, const char *c) {
+void Widget_Class_Node::read_property(Project_Reader &f, const char *c) {
   if (!strcmp(c,"position_relative")) {
     wc_relative = 1;
   } else if (!strcmp(c,"position_relative_rescale")) {
@@ -1393,9 +1393,9 @@ static const char *trimclassname(const char *n) {
 }
 
 
-void Widget_Class_Node::write_code1(fld::io::Code_Writer& f) {
+void Widget_Class_Node::write_code1(Code_Writer& f) {
 #if 0
-  Widget_Node::write_code1(fld::io::Code_Writer& f);
+  Widget_Node::write_code1(Code_Writer& f);
 #endif // 0
 
   current_widget_class = this;
@@ -1463,7 +1463,7 @@ void Widget_Class_Node::write_code1(fld::io::Code_Writer& f) {
  Write the C++ code that comes after the children of the window are written.
  \param f the source code output stream
  */
-void Widget_Class_Node::write_code2(fld::io::Code_Writer& f) {
+void Widget_Class_Node::write_code2(Code_Writer& f) {
   // make the window modal or non-modal
   if (modal) {
     f.write_c("%sset_modal();\n", f.indent());