wip

1 files changed, 5 insertions, 5 deletions

diff --git a/fluid/nodes/Function_Node.cxx b/fluid/nodes/Function_Node.cxx
index 8404b931e..02f4d75ca 100644
--- a/fluid/nodes/Function_Node.cxx
+++ b/fluid/nodes/Function_Node.cxx
@@ -56,7 +56,7 @@ Class_Node *current_class = nullptr;
 int has_toplevel_function(const char *rtype, const char *sig) {
   Node *child;
   for (child = Fluid.proj.tree.first; child; child = child->next) {
-    if (!child->is_in_class() && child->is_a(Type::Function)) {
+    if (!child->is_in_class() && child->is_a(FLD_NODE_TYPE_Function)) {
       const Function_Node *fn = (const Function_Node*)child;
       if (fn->has_signature(rtype, sig))
         return 1;
@@ -451,7 +451,7 @@ void Function_Node::write_code2(fld::io::Code_Writer& f) {
   char havechildren = 0;
   for (child = next; child && child->level > level; child = child->next) {
     havechildren = 1;
-    if (child->is_a(Type::Window) && child->name()) var = child->name();
+    if (child->is_a(FLD_NODE_TYPE_Window) && child->name()) var = child->name();
   }
 
   if (ismain()) {
@@ -558,9 +558,9 @@ void Code_Node::write_code1(fld::io::Code_Writer& f) {
   if ( handle_editor_changes() == 1 ) {
     Fluid.main_window->redraw();    // tell fluid to redraw; edits may affect tree's contents
   }
-  f.tag(Mergeback::Tag::GENERIC, Mergeback::Tag::CODE, 0);
+  f.tag(FLD_MERGEBACK_TAG_GENERIC, FLD_MERGEBACK_TAG_CODE, 0);
   f.write_c_indented(name(), 0, '\n');
-  f.tag(Mergeback::Tag::CODE, Mergeback::Tag::GENERIC, get_uid());
+  f.tag(FLD_MERGEBACK_TAG_CODE, FLD_MERGEBACK_TAG_GENERIC, get_uid());
 }
 
 /**
@@ -1530,7 +1530,7 @@ void Class_Node::write_code2(fld::io::Code_Writer& f) {
 int Node::has_function(const char *rtype, const char *sig) const {
   Node *child;
   for (child = next; child && child->level > level; child = child->next) {
-    if (child->level == level+1 && child->is_a(Type::Function)) {
+    if (child->level == level+1 && child->is_a(FLD_NODE_TYPE_Function)) {
       const Function_Node *fn = (const Function_Node*)child;
       if (fn->has_signature(rtype, sig))
         return 1;