wip

1 files changed, 16 insertions, 16 deletions

diff --git a/fluid/nodes/Node.cxx b/fluid/nodes/Node.cxx
index 79bd04b3b..8bcad077d 100644
--- a/fluid/nodes/Node.cxx
+++ b/fluid/nodes/Node.cxx
@@ -895,7 +895,7 @@ void Node::move_before(Node* g) {
 
 
 // write a widget and all its children:
-void Node::write(fld::io::Project_Writer &f) {
+void Node::write(Project_Writer &f) {
   if (f.write_codeview()) proj1_start = (int)ftell(f.file()) + 1;
   if (f.write_codeview()) proj2_start = (int)ftell(f.file()) + 1;
   f.write_indent(level);
@@ -927,7 +927,7 @@ void Node::write(fld::io::Project_Writer &f) {
   if (f.write_codeview()) proj2_end = (int)ftell(f.file());
 }
 
-void Node::write_properties(fld::io::Project_Writer &f) {
+void Node::write_properties(Project_Writer &f) {
   // repeat this for each attribute:
   if (Fluid.proj.write_mergeback_data && uid_) {
     f.write_word("uid");
@@ -961,7 +961,7 @@ void Node::write_properties(fld::io::Project_Writer &f) {
   if (selected) f.write_word("selected");
 }
 
-void Node::read_property(fld::io::Project_Reader &f, const char *c) {
+void Node::read_property(Project_Reader &f, const char *c) {
   if (!strcmp(c,"uid")) {
     const char *hex = f.read_word();
     int x = 0;
@@ -1026,13 +1026,13 @@ void Node::read_property(fld::io::Project_Reader &f, const char *c) {
  Lastly, this method should call the super class to give it a chance to append
  its own properties.
 
- \see Grid_Node::write_parent_properties(fld::io::Project_Writer &f, Node *child, bool encapsulate)
+ \see Grid_Node::write_parent_properties(Project_Writer &f, Node *child, bool encapsulate)
 
  \param[in] f the project file writer
  \param[in] child write properties for this child, make sure it has the correct type
  \param[in] encapsulate write the `parent_properties {}` block if true before writing any properties
  */
-void Node::write_parent_properties(fld::io::Project_Writer &f, Node *child, bool encapsulate) {
+void Node::write_parent_properties(Project_Writer &f, Node *child, bool encapsulate) {
   (void)f; (void)child; (void)encapsulate;
   // nothing to do here
   // put the following code into your implementation of write_parent_properties
@@ -1059,14 +1059,14 @@ void Node::write_parent_properties(fld::io::Project_Writer &f, Node *child, bool
  method reads back those properties. This function is virtual, so if a Type
  does not support a property, it will propagate to its super class.
 
- \see Node::write_parent_properties(fld::io::Project_Writer &f, Node *child, bool encapsulate)
- \see Grid_Node::read_parent_property(fld::io::Project_Reader &f, Node *child, const char *property)
+ \see Node::write_parent_properties(Project_Writer &f, Node *child, bool encapsulate)
+ \see Grid_Node::read_parent_property(Project_Reader &f, Node *child, const char *property)
 
  \param[in] f the project file writer
  \param[in] child read properties for this child
  \param[in] property the name of a property, or "}" when we reach the end of the list
  */
-void Node::read_parent_property(fld::io::Project_Reader &f, Node *child, const char *property) {
+void Node::read_parent_property(Project_Reader &f, Node *child, const char *property) {
   (void)child;
   f.read_error("Unknown parent property \"%s\"", property);
 }
@@ -1078,7 +1078,7 @@ int Node::read_fdesign(const char*, const char*) {return 0;}
  Write a comment into the header file.
  \param[in] pre indent the comment by this string
 */
-void Node::write_comment_h(fld::io::Code_Writer& f, const char *pre)
+void Node::write_comment_h(Code_Writer& f, const char *pre)
 {
   if (comment() && *comment()) {
     f.write_h("%s/**\n", pre);
@@ -1101,7 +1101,7 @@ void Node::write_comment_h(fld::io::Code_Writer& f, const char *pre)
 /**
   Write a comment into the source file.
 */
-void Node::write_comment_c(fld::io::Code_Writer& f, const char *pre)
+void Node::write_comment_c(Code_Writer& f, const char *pre)
 {
   if (comment() && *comment()) {
     f.write_c("%s/**\n", pre);
@@ -1126,7 +1126,7 @@ void Node::write_comment_c(fld::io::Code_Writer& f, const char *pre)
 /**
   Write a comment into the source file.
 */
-void Node::write_comment_inline_c(fld::io::Code_Writer& f, const char *pre)
+void Node::write_comment_inline_c(Code_Writer& f, const char *pre)
 {
   if (comment() && *comment()) {
     const char *s = comment();
@@ -1207,7 +1207,7 @@ int Node::user_defined(const char* cbname) const {
   return 0;
 }
 
-const char *Node::callback_name(fld::io::Code_Writer& f) {
+const char *Node::callback_name(Code_Writer& f) {
   if (is_name(callback())) return callback();
   return f.unique_id(this, "cb", name(), label());
 }
@@ -1260,18 +1260,18 @@ bool Node::is_in_class() const {
   return false;
 }
 
-void Node::write_static(fld::io::Code_Writer&) {
+void Node::write_static(Code_Writer&) {
 }
 
-void Node::write_static_after(fld::io::Code_Writer&) {
+void Node::write_static_after(Code_Writer&) {
 }
 
-void Node::write_code1(fld::io::Code_Writer& f) {
+void Node::write_code1(Code_Writer& f) {
   f.write_h("// Header for %s\n", title());
   f.write_c("// Code for %s\n", title());
 }
 
-void Node::write_code2(fld::io::Code_Writer&) {
+void Node::write_code2(Code_Writer&) {
 }
 
 /** Set a uid that is unique within the project.