wip

1 files changed, 33 insertions, 33 deletions

diff --git a/fluid/nodes/Function_Node.h b/fluid/nodes/Function_Node.h
index cc1444a26..528e3a5a0 100644
--- a/fluid/nodes/Function_Node.h
+++ b/fluid/nodes/Function_Node.h
@@ -60,8 +60,8 @@ public:
   ~Function_Node();
 
   Node *make(Strategy strategy);
-  void write_code1(fld::io::Code_Writer& f);
-  void write_code2(fld::io::Code_Writer& f);
+  void write_code1(Code_Writer& f);
+  void write_code2(Code_Writer& f);
   void open();
   int ismain() {return name_ == 0;}
   const char *type_name() {return "Function";}
@@ -71,8 +71,8 @@ public:
   int is_public() const;
   Type type() const { return FLD_NODE_TYPE_Function; }
   bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Function) ? true : super::is_a(inType); }
-  void write_properties(fld::io::Project_Writer &f);
-  void read_property(fld::io::Project_Reader &f, const char *);
+  void write_properties(Project_Writer &f);
+  void read_property(Project_Reader &f, const char *);
   int has_signature(const char *, const char*) const;
   const char *return_type() const { return return_type_ ? return_type_ : ""; }
   void return_type(const char *t) { storestring(t, return_type_); }
@@ -101,9 +101,9 @@ public:
   ~Code_Node() = default;
 
   Node *make(Strategy strategy);
-  void write(fld::io::Project_Writer &f);
-  void write_code1(fld::io::Code_Writer& f);
-  void write_code2(fld::io::Code_Writer& f) { }
+  void write(Project_Writer &f);
+  void write_code1(Code_Writer& f);
+  void write_code2(Code_Writer& f) { }
   void open();
   const char *type_name() {return "code";}
   int is_code_block() const {return 0;}
@@ -137,8 +137,8 @@ public:
   ~CodeBlock_Node();
 
   Node *make(Strategy strategy);
-  void write_code1(fld::io::Code_Writer& f);
-  void write_code2(fld::io::Code_Writer& f);
+  void write_code1(Code_Writer& f);
+  void write_code2(Code_Writer& f);
   void open();
   const char *type_name() {return "codeblock";}
   int is_code_block() const {return 1;}
@@ -146,8 +146,8 @@ public:
   int is_public() const { return -1; }
   Type type() const { return FLD_NODE_TYPE_CodeBlock; }
   bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_CodeBlock) ? true : super::is_a(inType); }
-  void write_properties(fld::io::Project_Writer &f);
-  void read_property(fld::io::Project_Reader &f, const char *);
+  void write_properties(Project_Writer &f);
+  void read_property(Project_Reader &f, const char *);
   const char *end_code() const { return end_code_ ? end_code_ : ""; }
   void end_code(const char *c) { storestring(c, end_code_); }
 };
@@ -169,12 +169,12 @@ public:
   ~Decl_Node() = default;
 
   Node *make(Strategy strategy);
-  void write_code1(fld::io::Code_Writer& f);
-  void write_code2(fld::io::Code_Writer& f) { }
+  void write_code1(Code_Writer& f);
+  void write_code2(Code_Writer& f) { }
   void open();
   const char *type_name() {return "decl";}
-  void write_properties(fld::io::Project_Writer &f);
-  void read_property(fld::io::Project_Reader &f, const char *);
+  void write_properties(Project_Writer &f);
+  void read_property(Project_Reader &f, const char *);
   int is_public() const;
   Type type() const { return FLD_NODE_TYPE_Decl; }
   bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Decl) ? true : super::is_a(inType); }
@@ -201,12 +201,12 @@ public:
   ~Data_Node();
 
   Node *make(Strategy strategy);
-  void write_code1(fld::io::Code_Writer& f);
-  void write_code2(fld::io::Code_Writer& f) {}
+  void write_code1(Code_Writer& f);
+  void write_code2(Code_Writer& f) {}
   void open();
   const char *type_name() {return "data";}
-  void write_properties(fld::io::Project_Writer &f);
-  void read_property(fld::io::Project_Reader &f, const char *);
+  void write_properties(Project_Writer &f);
+  void read_property(Project_Reader &f, const char *);
   Type type() const { return FLD_NODE_TYPE_Data; }
   bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Data) ? true : super::is_a(inType); }
   void filename(const char *fn) { storestring(fn, filename_); }
@@ -238,14 +238,14 @@ public:
   ~DeclBlock_Node();
 
   Node *make(Strategy strategy);
-  void write_static(fld::io::Code_Writer& f);
-  void write_static_after(fld::io::Code_Writer& f);
-  void write_code1(fld::io::Code_Writer& f);
-  void write_code2(fld::io::Code_Writer& f);
+  void write_static(Code_Writer& f);
+  void write_static_after(Code_Writer& f);
+  void write_code1(Code_Writer& f);
+  void write_code2(Code_Writer& f);
   void open();
   const char *type_name() {return "declblock";}
-  void write_properties(fld::io::Project_Writer &f);
-  void read_property(fld::io::Project_Reader &f, const char *);
+  void write_properties(Project_Writer &f);
+  void read_property(Project_Reader &f, const char *);
   int can_have_children() const {return 1;}
   int is_decl_block() const {return 1;}
   int is_public() const;
@@ -275,12 +275,12 @@ public:
   ~Comment_Node() = default;
 
   Node *make(Strategy strategy);
-  void write_code1(fld::io::Code_Writer& f);
-  void write_code2(fld::io::Code_Writer& f) { }
+  void write_code1(Code_Writer& f);
+  void write_code2(Code_Writer& f) { }
   void open();
   const char *type_name() {return "comment";}
-  void write_properties(fld::io::Project_Writer &f);
-  void read_property(fld::io::Project_Reader &f, const char *);
+  void write_properties(Project_Writer &f);
+  void read_property(Project_Reader &f, const char *);
   int is_public() const { return 1; }
   Type type() const { return FLD_NODE_TYPE_Comment; }
   bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Comment) ? true : super::is_a(inType); }
@@ -312,8 +312,8 @@ public:
   Class_Node* parent_class; // save class if nested
 
   Node *make(Strategy strategy);
-  void write_code1(fld::io::Code_Writer& f);
-  void write_code2(fld::io::Code_Writer& f);
+  void write_code1(Code_Writer& f);
+  void write_code2(Code_Writer& f);
   void open();
   const char *type_name() {return "class";}
   int can_have_children() const {return 1;}
@@ -322,8 +322,8 @@ public:
   int is_public() const;
   Type type() const { return FLD_NODE_TYPE_Class; }
   bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Class) ? true : super::is_a(inType); }
-  void write_properties(fld::io::Project_Writer &f);
-  void read_property(fld::io::Project_Reader &f, const char *);
+  void write_properties(Project_Writer &f);
+  void read_property(Project_Reader &f, const char *);
 
   /** Get base class access and name. */
   const char *base_class() const { return base_class_ ? base_class_ : ""; }