merged effects into node structure

effects/fields/boolfield.cpp

@@ -22,7 +22,8 @@
 
 #include <QCheckBox>
 
-#include "effects/effect.h"
+#include "nodes/node.h"
+#include "undo/undo.h"
 
 BoolField::BoolField(EffectRow *parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_BOOL)

effects/fields/colorfield.cpp

@@ -23,7 +23,8 @@
 #include <QColor>
 
 #include "ui/colorbutton.h"
-#include "effects/effect.h"
+#include "nodes/node.h"
+#include "undo/undo.h"
 
 ColorField::ColorField(EffectRow* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_COLOR)

effects/fields/combofield.cpp

@@ -22,8 +22,9 @@
 
 #include <QDebug>
 
-#include "effects/effect.h"
+#include "nodes/node.h"
 #include "ui/comboboxex.h"
+#include "undo/undo.h"
 
 ComboField::ComboField(EffectRow* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_COMBO)

effects/fields/doublefield.cpp

@@ -20,7 +20,8 @@
 
 #include "doublefield.h"
 
-#include "effects/effect.h"
+#include "nodes/node.h"
+#include "undo/undo.h"
 
 DoubleField::DoubleField(EffectRow* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_DOUBLE),

effects/fields/doublefield.h

@@ -24,6 +24,8 @@
 #include "../effectfield.h"
 #include "ui/labelslider.h"
 
+class KeyframeDataChange;
+
 /**
  * @brief The DoubleField class
  *

effects/fields/filefield.cpp

@@ -23,7 +23,8 @@
 #include <QDebug>
 
 #include "ui/embeddedfilechooser.h"
-#include "effects/effect.h"
+#include "nodes/node.h"
+#include "undo/undo.h"
 
 FileField::FileField(EffectRow* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_FILE)

effects/fields/fontfield.cpp

@@ -24,7 +24,8 @@
 #include <QDebug>
 
 #include "ui/comboboxex.h"
-#include "effects/effect.h"
+#include "nodes/node.h"
+#include "undo/undo.h"
 
 // NOTE/TODO: This shares a lot of similarity with ComboInput, and could probably be a derived class of it
 

effects/fields/stringfield.cpp

@@ -23,9 +23,10 @@
 #include <QtMath>
 #include <QDebug>
 
-#include "effects/effect.h"
+#include "nodes/node.h"
 #include "ui/texteditex.h"
 #include "global/config.h"
+#include "undo/undo.h"
 
 StringField::StringField(EffectRow* parent, bool rich_text) :
   EffectField(parent, EffectField::EFFECT_FIELD_STRING),