wip

1 files changed, 16 insertions, 16 deletions

diff --git a/fluid/nodes/Function_Node.h b/fluid/nodes/Function_Node.h
index be16e5414..e92f36f80 100644
--- a/fluid/nodes/Function_Node.h
+++ b/fluid/nodes/Function_Node.h
@@ -71,8 +71,8 @@ public:
   int can_have_children() const override {return 1;}
   int is_code_block() const override {return 1;}
   int is_public() const override;
-  Type type() const override { return Type::Function; }
-  bool is_a(Type inType) const override { return (inType==Type::Function) ? true : super::is_a(inType); }
+  Type type() const override { return FLD_NODE_TYPE_Function; }
+  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Function) ? true : super::is_a(inType); }
   void write_properties(fld::io::Project_Writer &f) override;
   void read_property(fld::io::Project_Reader &f, const char *) override;
   int has_signature(const char *, const char*) const;
@@ -109,8 +109,8 @@ public:
   void open() override;
   const char *type_name() override {return "code";}
   int is_code_block() const override {return 0;}
-  Type type() const override { return Type::Code; }
-  bool is_a(Type inType) const override { return (inType==Type::Code) ? true : super::is_a(inType); }
+  Type type() const override { return FLD_NODE_TYPE_Code; }
+  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Code) ? true : super::is_a(inType); }
   int is_public() const override { return -1; }
   int is_editing();
   int reap_editor();
@@ -146,8 +146,8 @@ public:
   int is_code_block() const override {return 1;}
   int can_have_children() const override {return 1;}
   int is_public() const override { return -1; }
-  Type type() const override { return Type::CodeBlock; }
-  bool is_a(Type inType) const override { return (inType==Type::CodeBlock) ? true : super::is_a(inType); }
+  Type type() const override { return FLD_NODE_TYPE_CodeBlock; }
+  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_CodeBlock) ? true : super::is_a(inType); }
   void write_properties(fld::io::Project_Writer &f) override;
   void read_property(fld::io::Project_Reader &f, const char *) override;
   std::string end_code() const { return end_code_; }
@@ -178,8 +178,8 @@ public:
   void write_properties(fld::io::Project_Writer &f) override;
   void read_property(fld::io::Project_Reader &f, const char *) override;
   int is_public() const override;
-  Type type() const override { return Type::Decl; }
-  bool is_a(Type inType) const override { return (inType==Type::Decl) ? true : super::is_a(inType); }
+  Type type() const override { return FLD_NODE_TYPE_Decl; }
+  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Decl) ? true : super::is_a(inType); }
   char visibility() { return public_; }
   void visibility(char v) { public_ = v; }
   char output_file() { return (public_&1)|((static_&1)<<1); }
@@ -209,8 +209,8 @@ public:
   const char *type_name() override {return "data";}
   void write_properties(fld::io::Project_Writer &f) override;
   void read_property(fld::io::Project_Reader &f, const char *) override;
-  Type type() const override { return Type::Data; }
-  bool is_a(Type inType) const override { return (inType==Type::Data) ? true : super::is_a(inType); }
+  Type type() const override { return FLD_NODE_TYPE_Data; }
+  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Data) ? true : super::is_a(inType); }
   void filename(const std::string& fn) { storestring(fn, filename_); }
   std::string filename() const { return filename_; }
   int output_format() { return output_format_; }
@@ -251,8 +251,8 @@ public:
   int can_have_children() const override {return 1;}
   int is_decl_block() const override {return 1;}
   int is_public() const override;
-  Type type() const override { return Type::DeclBlock; }
-  bool is_a(Type inType) const override { return (inType==Type::DeclBlock) ? true : super::is_a(inType); }
+  Type type() const override { return FLD_NODE_TYPE_DeclBlock; }
+  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_DeclBlock) ? true : super::is_a(inType); }
   std::string end_code() const { return end_code_; }
   void end_code(const std::string& p) { storestring(p, end_code_); }
   int write_map() { return write_map_; }
@@ -284,8 +284,8 @@ public:
   void write_properties(fld::io::Project_Writer &f) override;
   void read_property(fld::io::Project_Reader &f, const char *) override;
   int is_public() const override { return 1; }
-  Type type() const override { return Type::Comment; }
-  bool is_a(Type inType) const override { return (inType==Type::Comment) ? true : super::is_a(inType); }
+  Type type() const override { return FLD_NODE_TYPE_Comment; }
+  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Comment) ? true : super::is_a(inType); }
   bool in_h() { return in_h_; }
   void in_h(bool v) { in_h_ = v; }
   bool in_c() { return in_c_; }
@@ -322,8 +322,8 @@ public:
   int is_decl_block() const override {return 1;}
   int is_class() const override {return 1;}
   int is_public() const override;
-  Type type() const override { return Type::Class; }
-  bool is_a(Type inType) const override { return (inType==Type::Class) ? true : super::is_a(inType); }
+  Type type() const override { return FLD_NODE_TYPE_Class; }
+  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Class) ? true : super::is_a(inType); }
   void write_properties(fld::io::Project_Writer &f) override;
   void read_property(fld::io::Project_Reader &f, const char *) override;