moved several files around

Mostly moved classes that became node derivatives into the node/ folder.

app/CMakeLists.txt

@@ -47,7 +47,6 @@ add_subdirectory(dialog)
 add_subdirectory(node)
 add_subdirectory(packaging)
 add_subdirectory(panel)
-add_subdirectory(project)
 add_subdirectory(render)
 add_subdirectory(shaders)
 add_subdirectory(task)

app/codec/decoder.cpp

@@ -30,11 +30,11 @@
 #include "common/ffmpegutils.h"
 #include "common/filefunctions.h"
 #include "common/timecodefunctions.h"
+#include "node/project/project.h"
 #ifdef USE_OTIO
 #include "task/project/loadotio/loadotio.h"
 #endif
 #include "task/taskmanager.h"
-#include "project/project.h"
 
 namespace olive {
 

app/codec/decoder.h

@@ -35,8 +35,8 @@ extern "C" {
 #include "codec/samplebuffer.h"
 #include "codec/waveoutput.h"
 #include "common/rational.h"
-#include "project/item/footage/footage.h"
-#include "project/item/footage/footagedescription.h"
+#include "node/project/footage/footage.h"
+#include "node/project/footage/footagedescription.h"
 
 namespace olive {
 

app/core.cpp

@@ -45,11 +45,11 @@
 #include "dialog/sequence/sequence.h"
 #include "dialog/task/task.h"
 #include "dialog/preferences/preferences.h"
+#include "node/color/colormanager/colormanager.h"
 #include "node/factory.h"
 #include "panel/panelmanager.h"
 #include "panel/project/project.h"
 #include "panel/viewer/viewer.h"
-#include "render/colormanager.h"
 #include "render/diskmanager.h"
 #include "render/rendermanager.h"
 #ifdef USE_OTIO

app/core.h

@@ -28,10 +28,10 @@
 
 #include "common/rational.h"
 #include "common/timecodefunctions.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
-#include "project/project.h"
-#include "project/projectviewmodel.h"
+#include "node/project/footage/footage.h"
+#include "node/project/project.h"
+#include "node/project/projectviewmodel.h"
+#include "node/project/sequence/sequence.h"
 #include "task/task.h"
 #include "tool/tool.h"
 #include "undo/undostack.h"

app/dialog/color/colordialog.h

@@ -23,8 +23,8 @@
 
 #include <QDialog>
 
+#include "node/color/colormanager/colormanager.h"
 #include "render/color.h"
-#include "render/colormanager.h"
 #include "render/managedcolor.h"
 #include "widget/colorwheel/colorgradientwidget.h"
 #include "widget/colorwheel/colorspacechooser.h"

app/dialog/export/export.cpp

@@ -33,8 +33,8 @@
 #include "common/qtutils.h"
 #include "core.h"
 #include "dialog/task/task.h"
-#include "project/item/sequence/sequence.h"
-#include "project/project.h"
+#include "node/project/project.h"
+#include "node/project/sequence/sequence.h"
 #include "ui/icons/icons.h"
 
 namespace olive {

app/dialog/export/exportvideotab.cpp

@@ -28,7 +28,7 @@
 
 #include "core.h"
 #include "exportadvancedvideodialog.h"
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "task/export/exportparams.h"
 
 namespace olive {

app/dialog/export/exportvideotab.h

@@ -28,7 +28,7 @@
 #include "common/rational.h"
 #include "dialog/export/codec/h264section.h"
 #include "dialog/export/codec/imagesection.h"
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "widget/colorwheel/colorspacechooser.h"
 #include "widget/slider/integerslider.h"
 #include "widget/standardcombos/standardcombos.h"

app/dialog/footagerelink/footagerelinkdialog.h

@@ -24,7 +24,7 @@
 #include <QDialog>
 #include <QTreeWidget>
 
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 
 namespace olive {
 

app/dialog/preferences/tabs/preferencesgeneraltab.cpp

@@ -28,7 +28,7 @@
 #include "common/autoscroll.h"
 #include "core.h"
 #include "dialog/sequence/sequence.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 

app/dialog/preferences/tabs/preferencesgeneraltab.h

@@ -26,7 +26,7 @@
 #include <QSpinBox>
 
 #include "dialog/configbase/configdialogbase.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "widget/slider/floatslider.h"
 #include "widget/slider/integerslider.h"
 

app/dialog/sequence/sequence.h

@@ -25,7 +25,7 @@
 #include <QDialog>
 #include <QSpinBox>
 
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "sequencedialogparametertab.h"
 #include "sequencedialogpresettab.h"
 #include "undo/undocommand.h"

app/dialog/sequence/sequencedialogparametertab.h

@@ -5,7 +5,7 @@
 #include <QList>
 #include <QSpinBox>
 
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "sequencepreset.h"
 #include "widget/slider/integerslider.h"
 #include "widget/standardcombos/standardcombos.h"

app/node/CMakeLists.txt

@@ -16,6 +16,7 @@
 
 add_subdirectory(audio)
 add_subdirectory(block)
+add_subdirectory(color)
 add_subdirectory(distort)
 add_subdirectory(filter)
 add_subdirectory(generator)

app/node/audio/pan/pan.h

@@ -31,6 +31,8 @@ class PanNode : public Node
 public:
   PanNode();
 
+  NODE_DEFAULT_DESTRUCTOR(PanNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/audio/volume/volume.h

@@ -31,6 +31,8 @@ class VolumeNode : public MathNodeBase
 public:
   VolumeNode();
 
+  NODE_DEFAULT_DESTRUCTOR(VolumeNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/block/block.h

@@ -37,6 +37,8 @@ class Block : public Node
 public:
   Block();
 
+  NODE_DEFAULT_DESTRUCTOR(Block)
+
   enum Type {
     kClip,
     kGap,

app/node/block/clip/clip.h

@@ -34,6 +34,8 @@ class ClipBlock : public Block
 public:
   ClipBlock();
 
+  NODE_DEFAULT_DESTRUCTOR(ClipBlock)
+
   virtual Node* copy() const override;
 
   virtual Type type() const override;

app/node/block/gap/gap.h

@@ -34,6 +34,8 @@ class GapBlock : public Block
 public:
   GapBlock();
 
+  NODE_DEFAULT_DESTRUCTOR(GapBlock)
+
   virtual Node * copy() const override;
 
   virtual Type type() const override;

app/node/block/transition/crossdissolve/crossdissolvetransition.h

@@ -31,6 +31,8 @@ class CrossDissolveTransition : public TransitionBlock
 public:
   CrossDissolveTransition();
 
+  NODE_DEFAULT_DESTRUCTOR(CrossDissolveTransition)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/block/transition/diptocolor/diptocolortransition.h

@@ -31,6 +31,8 @@ class DipToColorTransition : public TransitionBlock
 public:
   DipToColorTransition();
 
+  NODE_DEFAULT_DESTRUCTOR(DipToColorTransition)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/block/transition/transition.h

@@ -31,6 +31,8 @@ class TransitionBlock : public Block
 public:
   TransitionBlock();
 
+  NODE_DEFAULT_DESTRUCTOR(TransitionBlock)
+
   virtual Type type() const override;
 
   virtual void Retranslate() override;

app/node/color/CMakeLists.txt

@@ -14,10 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+add_subdirectory(colormanager)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  project/item/folder/folder.h
-  project/item/folder/folder.cpp
   PARENT_SCOPE
 )

app/node/color/colormanager/CMakeLists.txt

@@ -14,13 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-add_subdirectory(item)
-
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  project/project.h
-  project/project.cpp
-  project/projectviewmodel.h
-  project/projectviewmodel.cpp
+  node/color/colormanager/colormanager.cpp
+  node/color/colormanager/colormanager.h
   PARENT_SCOPE
 )

app/node/color/colormanager/colormanager.h

@@ -25,8 +25,8 @@
 #include <QMutex>
 
 #include "codec/frame.h"
-#include "colorprocessor.h"
 #include "node/node.h"
+#include "render/colorprocessor.h"
 
 #define OCIO_SET_C_LOCALE_FOR_SCOPE ColorManager::SetLocale d("C")
 

app/node/distort/crop/cropdistortnode.h

@@ -33,6 +33,8 @@ class CropDistortNode : public Node
 public:
   CropDistortNode();
 
+  NODE_DEFAULT_DESTRUCTOR(CropDistortNode)
+
   virtual Node* copy() const override
   {
     return new CropDistortNode();

app/node/distort/transform/transformdistortnode.h

@@ -31,6 +31,8 @@ class TransformDistortNode : public MatrixGenerator
 public:
   TransformDistortNode();
 
+  NODE_DEFAULT_DESTRUCTOR(TransformDistortNode)
+
   virtual Node* copy() const override
   {
     return new TransformDistortNode();

app/node/factory.cpp

@@ -43,9 +43,9 @@
 #include "math/trigonometry/trigonometry.h"
 #include "output/track/track.h"
 #include "output/viewer/viewer.h"
-#include "project/item/folder/folder.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
+#include "project/folder/folder.h"
+#include "project/footage/footage.h"
+#include "project/sequence/sequence.h"
 
 namespace olive {
 QList<Node*> NodeFactory::library_;

app/node/filter/blur/blur.h

@@ -31,6 +31,8 @@ class BlurFilterNode : public Node
 public:
   BlurFilterNode();
 
+  NODE_DEFAULT_DESTRUCTOR(BlurFilterNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/filter/mosaic/mosaicfilternode.h

@@ -31,6 +31,8 @@ class MosaicFilterNode : public Node
 public:
   MosaicFilterNode();
 
+  NODE_DEFAULT_DESTRUCTOR(MosaicFilterNode)
+
   virtual Node* copy() const override
   {
     return new MosaicFilterNode();

app/node/filter/stroke/stroke.h

@@ -31,6 +31,8 @@ class StrokeFilterNode : public Node
 public:
   StrokeFilterNode();
 
+  NODE_DEFAULT_DESTRUCTOR(StrokeFilterNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/generator/matrix/matrix.h

@@ -34,6 +34,8 @@ class MatrixGenerator : public Node
 public:
   MatrixGenerator();
 
+  NODE_DEFAULT_DESTRUCTOR(MatrixGenerator)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/generator/polygon/polygon.h

@@ -32,6 +32,8 @@ class PolygonGenerator : public Node
 public:
   PolygonGenerator();
 
+  NODE_DEFAULT_DESTRUCTOR(PolygonGenerator)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/generator/solid/solid.h

@@ -31,6 +31,8 @@ class SolidGenerator : public Node
 public:
   SolidGenerator();
 
+  NODE_DEFAULT_DESTRUCTOR(SolidGenerator)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/generator/text/text.h

@@ -31,6 +31,8 @@ class TextGenerator : public Node
 public:
   TextGenerator();
 
+  NODE_DEFAULT_DESTRUCTOR(TextGenerator)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/input/time/timeinput.h

@@ -31,6 +31,8 @@ class TimeInput : public Node
 public:
   TimeInput();
 
+  NODE_DEFAULT_DESTRUCTOR(TimeInput)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/math/math/math.h

@@ -31,6 +31,8 @@ class MathNode : public MathNodeBase
 public:
   MathNode();
 
+  NODE_DEFAULT_DESTRUCTOR(MathNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/math/math/mathbase.h

@@ -30,6 +30,8 @@ class MathNodeBase : public Node
 public:
   MathNodeBase() = default;
 
+  NODE_DEFAULT_DESTRUCTOR(MathNodeBase)
+
   enum Operation {
     kOpAdd,
     kOpSubtract,

app/node/math/merge/merge.h

@@ -31,6 +31,8 @@ class MergeNode : public Node
 public:
   MergeNode();
 
+  NODE_DEFAULT_DESTRUCTOR(MergeNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/math/trigonometry/trigonometry.h

@@ -31,6 +31,8 @@ class TrigonometryNode : public Node
 public:
   TrigonometryNode();
 
+  NODE_DEFAULT_DESTRUCTOR(TrigonometryNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;

app/node/node.cpp

@@ -31,8 +31,8 @@
 #include "common/xmlutils.h"
 #include "core.h"
 #include "config/config.h"
+#include "node/project/footage/footage.h"
 #include "project/project.h"
-#include "project/item/footage/footage.h"
 #include "ui/colorcoding.h"
 #include "ui/icons/icons.h"
 #include "widget/nodeview/nodeviewundo.h"

app/node/node.h

@@ -45,6 +45,8 @@
 
 namespace olive {
 
+#define NODE_DEFAULT_DESTRUCTOR(x) virtual ~x() override {DisconnectAll();}
+
 class NodeGraph;
 class Folder;
 

app/node/nodecopypaste.h

@@ -25,7 +25,7 @@
 #include <QUndoCommand>
 
 #include "node/node.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 

app/node/output/track/track.cpp

@@ -55,11 +55,6 @@ Track::Track() :
   track_height_ = kTrackHeightDefault;
 }
 
-Track::~Track()
-{
-  DisconnectAll();
-}
-
 void Track::set_type(const Type &track_type)
 {
   track_type_ = track_type;

app/node/output/track/track.h

@@ -44,7 +44,7 @@ public:
 
   Track();
 
-  virtual ~Track() override;
+  NODE_DEFAULT_DESTRUCTOR(Track)
 
   const Track::Type& type() const;
   void set_type(const Track::Type& track_type);

app/node/output/track/tracklist.cpp

@@ -24,7 +24,7 @@
 #include "node/math/math/math.h"
 #include "node/math/merge/merge.h"
 #include "node/output/viewer/viewer.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 

app/node/output/viewer/viewer.cpp

@@ -57,14 +57,6 @@ ViewerOutput::ViewerOutput(bool create_default_streams) :
   }
 }
 
-ViewerOutput::~ViewerOutput()
-{
-  // Should prevent traversing graph unnecessarily
-  BeginOperation();
-  DisconnectAll();
-  EndOperation();
-}
-
 Node *ViewerOutput::copy() const
 {
   return new ViewerOutput();

app/node/output/viewer/viewer.h

@@ -45,7 +45,8 @@ class ViewerOutput : public Node
   Q_OBJECT
 public:
   ViewerOutput(bool create_default_streams = true);
-  virtual ~ViewerOutput() override;
+
+  NODE_DEFAULT_DESTRUCTOR(ViewerOutput)
 
   virtual Node* copy() const override;
 

app/node/project/CMakeLists.txt

@@ -14,9 +14,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+add_subdirectory(folder)
+add_subdirectory(footage)
 add_subdirectory(projectsettings)
+add_subdirectory(sequence)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
+  node/project/project.h
+  node/project/project.cpp
+  node/project/projectviewmodel.h
+  node/project/projectviewmodel.cpp
   PARENT_SCOPE
 )

app/node/project/folder/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  project/item/sequence/sequence.h
-  project/item/sequence/sequence.cpp
+  node/project/folder/folder.h
+  node/project/folder/folder.cpp
   PARENT_SCOPE
 )

app/node/project/folder/folder.cpp

@@ -21,8 +21,8 @@
 #include "folder.h"
 
 #include "common/xmlutils.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/footage/footage.h"
+#include "node/project/sequence/sequence.h"
 #include "ui/icons/icons.h"
 
 namespace olive {

app/node/project/folder/folder.h

@@ -37,6 +37,8 @@ class Folder : public Node
 public:
   Folder();
 
+  NODE_DEFAULT_DESTRUCTOR(Folder)
+
   virtual Node* copy() const override
   {
     return new Folder();

app/node/project/footage/CMakeLists.txt

@@ -17,9 +17,9 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  project/item/footage/footage.cpp
-  project/item/footage/footage.h
-  project/item/footage/footagedescription.cpp
-  project/item/footage/footagedescription.h
+  node/project/footage/footage.cpp
+  node/project/footage/footage.h
+  node/project/footage/footagedescription.cpp
+  node/project/footage/footagedescription.h
   PARENT_SCOPE
 )

app/node/project/footage/footage.h

@@ -49,6 +49,8 @@ public:
    */
   Footage(const QString& filename = QString());
 
+  NODE_DEFAULT_DESTRUCTOR(Footage)
+
   virtual Node* copy() const override
   {
     return new Footage();

app/node/project/project.h

@@ -25,10 +25,10 @@
 #include <QObject>
 #include <QUuid>
 
-#include "node/project/projectsettings/projectsettings.h"
+#include "node/color/colormanager/colormanager.h"
 #include "node/output/viewer/viewer.h"
-#include "render/colormanager.h"
-#include "project/item/folder/folder.h"
+#include "node/project/footage/footage.h"
+#include "node/project/projectsettings/projectsettings.h"
 #include "window/mainwindow/mainwindowlayoutinfo.h"
 
 namespace olive {

app/node/project/projectsettings/projectsettings.h

@@ -31,6 +31,8 @@ class ProjectSettingsNode : public Node
 public:
   ProjectSettingsNode();
 
+  NODE_DEFAULT_DESTRUCTOR(ProjectSettingsNode)
+
   virtual QString Name() const override
   {
     return tr("Project Settings");

app/node/project/sequence/CMakeLists.txt

@@ -14,11 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-add_subdirectory(folder)
-add_subdirectory(footage)
-add_subdirectory(sequence)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
+  node/project/sequence/sequence.h
+  node/project/sequence/sequence.cpp
   PARENT_SCOPE
 )

app/node/project/sequence/sequence.cpp

@@ -53,14 +53,6 @@ Sequence::Sequence()
   }
 }
 
-Sequence::~Sequence()
-{
-  // Should prevent traversing graph unnecessarily
-  BeginOperation();
-  DisconnectAll();
-  EndOperation();
-}
-
 void Sequence::add_default_nodes(MultiUndoCommand* command)
 {
   // Create tracks and connect them to the viewer

app/node/project/sequence/sequence.h

@@ -36,7 +36,7 @@ class Sequence : public ViewerOutput
 public:
   Sequence();
 
-  virtual ~Sequence() override;
+  NODE_DEFAULT_DESTRUCTOR(Sequence)
 
   virtual Node* copy() const override
   {

app/panel/project/footagemanagementpanel.h

@@ -23,7 +23,7 @@
 
 #include <QList>
 
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 
 namespace olive {
 

app/panel/project/project.cpp

@@ -24,10 +24,10 @@
 #include <QVBoxLayout>
 
 #include "core.h"
+#include "node/project/sequence/sequence.h"
 #include "panel/footageviewer/footageviewer.h"
 #include "panel/timeline/timeline.h"
 #include "panel/panelmanager.h"
-#include "project/item/sequence/sequence.h"
 #include "widget/menu/menushared.h"
 #include "widget/projecttoolbar/projecttoolbar.h"
 #include "window/mainwindow/mainwindow.h"

app/panel/project/project.h

@@ -22,7 +22,7 @@
 #define PROJECT_PANEL_H
 
 #include "footagemanagementpanel.h"
-#include "project/project.h"
+#include "node/project/project.h"
 #include "widget/panel/panel.h"
 #include "widget/projectexplorer/projectexplorer.h"
 

app/render/CMakeLists.txt

@@ -26,8 +26,6 @@ set(OLIVE_SOURCES
   render/audioplaybackcache.h
   render/color.cpp
   render/color.h
-  render/colormanager.cpp
-  render/colormanager.h
   render/colorprocessor.cpp
   render/colorprocessor.h
   render/colorprocessorcache.h

app/render/colorprocessor.cpp

@@ -22,7 +22,7 @@
 
 #include "common/define.h"
 #include "common/ocioutils.h"
-#include "colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 
 namespace olive {
 

app/render/diskmanager.h

@@ -27,7 +27,7 @@
 #include <QTimer>
 
 #include "common/define.h"
-#include "project/project.h"
+#include "node/project/project.h"
 
 namespace olive {
 

app/render/job/footagejob.h

@@ -21,7 +21,7 @@
 #ifndef FOOTAGEJOB_H
 #define FOOTAGEJOB_H
 
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 
 namespace olive {
 

app/render/playbackcache.cpp

@@ -21,8 +21,8 @@
 #include "playbackcache.h"
 
 #include "node/output/viewer/viewer.h"
-#include "project/item/sequence/sequence.h"
-#include "project/project.h"
+#include "node/project/project.h"
+#include "node/project/sequence/sequence.h"
 #include "render/diskmanager.h"
 
 namespace olive {

app/render/previewautocacher.cpp

@@ -3,7 +3,7 @@
 #include <QApplication>
 #include <QtConcurrent/QtConcurrent>
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "render/rendermanager.h"
 #include "render/renderprocessor.h"
 

app/render/previewautocacher.h

@@ -5,10 +5,10 @@
 
 #include "config/config.h"
 #include "node/graph.h"
+#include "node/color/colormanager/colormanager.h"
 #include "node/node.h"
 #include "node/output/viewer/viewer.h"
-#include "project/project.h"
-#include "render/colormanager.h"
+#include "node/project/project.h"
 #include "threading/threadticketwatcher.h"
 
 namespace olive {

app/render/renderprocessor.cpp

@@ -25,7 +25,7 @@
 #include <QVector3D>
 #include <QVector4D>
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "rendermanager.h"
 
 namespace olive {

app/render/stillimagecache.h

@@ -6,7 +6,7 @@
 
 #include "codec/decoder.h"
 #include "common/rational.h"
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 #include "render/texture.h"
 
 namespace olive {

app/task/conform/conform.h

@@ -21,7 +21,7 @@
 #ifndef CONFORMTASK_H
 #define CONFORMTASK_H
 
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 #include "render/audioparams.h"
 #include "task/task.h"
 

app/task/export/export.cpp

@@ -21,7 +21,7 @@
 #include "export.h"
 
 #include "common/timecodefunctions.h"
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 
 namespace olive {
 

app/task/precache/precachetask.cpp

@@ -20,7 +20,7 @@
 
 #include "precachetask.h"
 
-#include "project/project.h"
+#include "node/project/project.h"
 
 namespace olive {
 

app/task/precache/precachetask.h

@@ -21,8 +21,8 @@
 #ifndef PRECACHETASK_H
 #define PRECACHETASK_H
 
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/footage/footage.h"
+#include "node/project/sequence/sequence.h"
 #include "task/render/render.h"
 
 namespace olive {

app/task/project/import/import.cpp

@@ -25,7 +25,7 @@
 
 #include "config/config.h"
 #include "core.h"
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 #include "widget/nodeview/nodeviewundo.h"
 
 namespace olive {

app/task/project/import/import.h

@@ -25,7 +25,7 @@
 #include <QUndoCommand>
 
 #include "codec/decoder.h"
-#include "project/projectviewmodel.h"
+#include "node/project/projectviewmodel.h"
 #include "task/task.h"
 
 namespace olive {

app/task/project/load/loadbasetask.h

@@ -21,7 +21,7 @@
 #ifndef PROJECTLOADBASETASK_H
 #define PROJECTLOADBASETASK_H
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "task/task.h"
 
 namespace olive {

app/task/project/loadotio/loadotio.cpp

@@ -31,9 +31,9 @@
 
 #include "node/block/clip/clip.h"
 #include "node/block/gap/gap.h"
-#include "project/item/folder/folder.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/folder/folder.h"
+#include "node/project/footage/footage.h"
+#include "node/project/sequence/sequence.h"
 #include "widget/timelinewidget/timelineundo.h"
 
 #define OTIO opentimelineio::v1_0

app/task/project/loadotio/loadotio.h

@@ -23,7 +23,7 @@
 
 #ifdef USE_OTIO
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "task/project/load/loadbasetask.h"
 
 namespace olive {

app/task/project/save/save.h

@@ -21,7 +21,7 @@
 #ifndef PROJECTSAVEMANAGER_H
 #define PROJECTSAVEMANAGER_H
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "task/task.h"
 
 namespace olive {

app/task/project/saveotio/saveotio.cpp

@@ -29,7 +29,7 @@
 #include <opentimelineio/transition.h>
 
 #include "node/block/transition/transition.h"
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 
 namespace olive {
 

app/task/project/saveotio/saveotio.h

@@ -26,7 +26,7 @@
 #include <opentimelineio/timeline.h>
 #include <opentimelineio/track.h>
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "task/task.h"
 
 namespace olive {

app/task/render/render.h

@@ -23,8 +23,8 @@
 
 #include <QtConcurrent/QtConcurrent>
 
+#include "node/color/colormanager/colormanager.h"
 #include "node/output/viewer/viewer.h"
-#include "render/colormanager.h"
 #include "task/task.h"
 #include "threading/threadticket.h"
 #include "threading/threadticketwatcher.h"

app/widget/colorbutton/colorbutton.h

@@ -23,7 +23,7 @@
 
 #include <QPushButton>
 
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "render/managedcolor.h"
 
 namespace olive {

app/widget/colorwheel/colorspacechooser.h

@@ -24,7 +24,7 @@
 #include <QComboBox>
 #include <QGroupBox>
 
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 
 namespace olive {
 

app/widget/colorwheel/colorvalueswidget.h

@@ -24,8 +24,8 @@
 #include <QWidget>
 
 #include "colorpreviewbox.h"
+#include "node/color/colormanager/colormanager.h"
 #include "render/color.h"
-#include "render/colormanager.h"
 #include "widget/slider/floatslider.h"
 
 namespace olive {

app/widget/keyframeview/keyframeviewundo.cpp

@@ -21,7 +21,7 @@
 #include "keyframeviewundo.h"
 
 #include "node/node.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 

app/widget/manageddisplay/manageddisplay.h

@@ -25,7 +25,7 @@
 #include <QOpenGLContext>
 #include <QOpenGLWidget>
 
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "render/renderer.h"
 #include "widget/menu/menu.h"
 

app/widget/nodeparamview/nodeparamviewitem.cpp

@@ -27,8 +27,8 @@
 
 #include "common/qtutils.h"
 #include "core.h"
+#include "node/project/sequence/sequence.h"
 #include "nodeparamviewundo.h"
-#include "project/item/sequence/sequence.h"
 
 namespace olive {
 

app/widget/nodeparamview/nodeparamviewundo.cpp

@@ -21,7 +21,7 @@
 #include "nodeparamviewundo.h"
 
 #include "node/node.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 

app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp

@@ -28,10 +28,10 @@
 
 #include "core.h"
 #include "node/node.h"
+#include "node/project/sequence/sequence.h"
 #include "nodeparamviewarraywidget.h"
 #include "nodeparamviewrichtext.h"
 #include "nodeparamviewundo.h"
-#include "project/item/sequence/sequence.h"
 #include "undo/undostack.h"
 #include "widget/colorbutton/colorbutton.h"
 #include "widget/filefield/filefield.h"