wip

1 files changed, 30 insertions, 30 deletions

diff --git a/fluid/nodes/factory.cxx b/fluid/nodes/factory.cxx
index c901c9945..06c8eee90 100644
--- a/fluid/nodes/factory.cxx
+++ b/fluid/nodes/factory.cxx
@@ -122,7 +122,7 @@ public:
   void ideal_size(int &w, int &h) {
     w = 120;
     h = 160;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Browser_"; }
   const char *alt_type_name() { return "fltk::Browser_"; }
@@ -257,7 +257,7 @@ public:
   void ideal_size(int &w, int &h) {
     w = 120;
     h = 160;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Tree"; }
   const char *alt_type_name() { return "fltk::TreeBrowser"; }
@@ -312,7 +312,7 @@ public:
   void ideal_size(int &w, int &h) {
     w = 160;
     h = 120;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Help_View"; }
   const char *alt_type_name() { return "fltk::HelpView"; }
@@ -392,10 +392,10 @@ private:
   }
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->textsize_not_null() + 8;
     w = layout->textsize_not_null() * 4 + 4 * h; // make room for the arrows
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Counter"; }
   const char *alt_type_name() { return "fltk::Counter"; }
@@ -422,10 +422,10 @@ public:
   static Adjuster_Node prototype;
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->labelsize + 8;
     w = 3 * h;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Adjuster"; }
   const char *alt_type_name() { return "fltk::Adjuster"; }
@@ -462,7 +462,7 @@ private:
 public:
   void ideal_size(int &w, int &h) {
     w = 60; h = 60;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Dial"; }
   const char *alt_type_name() { return "fltk::Dial"; }
@@ -497,10 +497,10 @@ private:
   Fl_Menu_Item *subtypes() { return roller_type_menu; }
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     w = layout->labelsize + 8;
     h = 4 * w;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Roller"; }
   const char *alt_type_name() { return "fltk::Roller"; }
@@ -541,10 +541,10 @@ private:
   Fl_Menu_Item *subtypes() { return slider_type_menu; }
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     w = layout->labelsize + 8;
     h = 4 * w;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Slider"; }
   const char *alt_type_name() { return "fltk::Slider"; }
@@ -651,10 +651,10 @@ private:
   }
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->textsize_not_null() + 8;
     w = layout->textsize_not_null() * 4 + 8;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Value_Input"; }
   const char *alt_type_name() { return "fltk::ValueInput"; }
@@ -694,10 +694,10 @@ private:
   }
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->textsize_not_null() + 8;
     w = layout->textsize_not_null() * 4 + 8;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Value_Output"; }
   const char *alt_type_name() { return "fltk::ValueOutput"; }
@@ -753,10 +753,10 @@ private:
   }
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->textsize_not_null() + 8;
     w = layout->textsize_not_null() * 6 + 8;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Input"; }
   const char *alt_type_name() { return "fltk::Input"; }
@@ -795,10 +795,10 @@ private:
   Fl_Menu_Item *subtypes() { return 0; } // Don't inherit.
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->textsize_not_null() + 8 + 10; // Directoy bar is additional 10 pixels high
     w = layout->textsize_not_null() * 10 + 8;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_File_Input"; }
   const char *alt_type_name() { return "fltk::FileInput"; }
@@ -879,10 +879,10 @@ private:
   }
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->textsize_not_null() * 4 + 8;
     w = layout->textsize_not_null() * 10 + 8;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Text_Display"; }
   const char *alt_type_name() { return "fltk::TextDisplay"; }
@@ -1045,7 +1045,7 @@ public:
 public:
   void ideal_size(int &w, int &h) {
     w = 100; h = 100;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Box"; }
   const char *alt_type_name() { return "fltk::Widget"; }
@@ -1074,7 +1074,7 @@ public:
 public:
   void ideal_size(int &w, int &h) {
     w = 80; h = 80;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Clock"; }
   const char *alt_type_name() { return "fltk::Clock"; }
@@ -1103,10 +1103,10 @@ public:
   static Progress_Node prototype;
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->labelsize + 8;
     w = layout->labelsize * 12;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Progress"; }
   const char *alt_type_name() { return "fltk::ProgressBar"; }
@@ -1155,10 +1155,10 @@ private:
   }
 public:
   void ideal_size(int &w, int &h) {
-    fld::app::Layout_Preset *layout = Fluid.proj.layout;
+    Layout_Preset *layout = Fluid.proj.layout;
     h = layout->textsize_not_null() + 8;
     w = layout->textsize_not_null() * 4 + 8;
-    fld::app::Snap_Action::better_size(w, h);
+    Snap_Action::better_size(w, h);
   }
   const char *type_name() { return "Fl_Spinner"; }
   const char *alt_type_name() { return "fltk::Spinner"; }
@@ -1284,11 +1284,11 @@ static Node *known_types[] = {
 Node *add_new_widget_from_user(Node *inPrototype, Strategy strategy, bool and_open) {
   Fluid.proj.undo.checkpoint();
   Fluid.proj.undo.suspend();
-  fld::app::Layout_Preset *layout = Fluid.proj.layout;
+  Layout_Preset *layout = Fluid.proj.layout;
   Node *t = ((Node*)inPrototype)->make(strategy);
   if (t) {
     if (t->is_widget() && !t->is_a(FLD_NODE_TYPE_Window)) {
-      fld::app::Layout_Preset *layout = Fluid.proj.layout;
+      Layout_Preset *layout = Fluid.proj.layout;
       Widget_Node *wt = (Widget_Node *)t;
       bool changed = false;