wip

1 files changed, 12 insertions, 12 deletions

diff --git a/fluid/nodes/Button_Node.cxx b/fluid/nodes/Button_Node.cxx
index 877c5588d..1b4cbe2e5 100644
--- a/fluid/nodes/Button_Node.cxx
+++ b/fluid/nodes/Button_Node.cxx
@@ -57,17 +57,17 @@ Fl_Menu_Item *Button_Node::subtypes() {
 }
 
 void Button_Node::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 * 4 + 8;
-  fld::app::Snap_Action::better_size(w, h);
+  Snap_Action::better_size(w, h);
 }
 
 Fl_Widget *Button_Node::widget(int x, int y, int w, int h) {
   return new Fl_Button(x, y, w, h, "Button");
 }
 
-void Button_Node::write_properties(fld::io::Project_Writer &f) {
+void Button_Node::write_properties(Project_Writer &f) {
   Widget_Node::write_properties(f);
   Fl_Button *btn = (Fl_Button*)o;
   if (btn->compact()) {
@@ -76,7 +76,7 @@ void Button_Node::write_properties(fld::io::Project_Writer &f) {
   }
 }
 
-void Button_Node::read_property(fld::io::Project_Reader &f, const char *c) {
+void Button_Node::read_property(Project_Reader &f, const char *c) {
   Fl_Button *btn = (Fl_Button*)o;
   if (!strcmp(c, "compact")) {
     btn->compact((uchar)atol(f.read_word()));
@@ -95,10 +95,10 @@ void Button_Node::copy_properties() {
 // ---- Return Button ----
 
 void Return_Button_Node::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 * 4 + 8 + h; // make room for the symbol
-  fld::app::Snap_Action::better_size(w, h);
+  Snap_Action::better_size(w, h);
 }
 
 Fl_Widget *Return_Button_Node::widget(int x, int y, int w, int h) {
@@ -120,10 +120,10 @@ Repeat_Button_Node Repeat_Button_Node::prototype;
 // ---- Light Button ----
 
 void Light_Button_Node::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 * 4 + 8 + layout->labelsize; // make room for the light
-  fld::app::Snap_Action::better_size(w, h);
+  Snap_Action::better_size(w, h);
 }
 
 Fl_Widget *Light_Button_Node::widget(int x, int y, int w, int h) {
@@ -136,10 +136,10 @@ Light_Button_Node Light_Button_Node::prototype;
 // ---- Check Button ----
 
 void Check_Button_Node::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 * 4 + 8 + layout->labelsize; // make room for the symbol
-  fld::app::Snap_Action::better_size(w, h);
+  Snap_Action::better_size(w, h);
 }
 
 Fl_Widget *Check_Button_Node::widget(int x, int y, int w, int h) {
@@ -152,10 +152,10 @@ Check_Button_Node Check_Button_Node::prototype;
 // ---- Round Button ----
 
 void Round_Button_Node::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 * 4 + 8 + layout->labelsize; // make room for the symbol
-  fld::app::Snap_Action::better_size(w, h);
+  Snap_Action::better_size(w, h);
 }
 
 Fl_Widget *Round_Button_Node::widget(int x, int y, int w, int h) {