diff --git a/app/common/ocioutils.h b/app/common/ocioutils.h index 38df3f773..6fa294de7 100644 --- a/app/common/ocioutils.h +++ b/app/common/ocioutils.h @@ -24,8 +24,6 @@ #include namespace OCIO = OCIO_NAMESPACE; -#include - #include "render/videoparams.h" namespace olive { @@ -34,7 +32,6 @@ class OCIOUtils { public: static OCIO::BitDepth GetOCIOBitDepthFromPixelFormat(VideoParams::Format format); - }; } diff --git a/app/node/color/displaytransform/displaytransform.h b/app/node/color/displaytransform/displaytransform.h index 9c8dff5ba..ac6be6bef 100644 --- a/app/node/color/displaytransform/displaytransform.h +++ b/app/node/color/displaytransform/displaytransform.h @@ -32,8 +32,7 @@ class DisplayTransformNode : public OCIOBaseNode public: DisplayTransformNode(); - NODE_DEFAULT_DESTRUCTOR(DisplayTransformNode) - NODE_COPY_FUNCTION(DisplayTransformNode) + NODE_DEFAULT_FUNCTIONS(DisplayTransformNode) virtual QString Name() const override; virtual QString id() const override; diff --git a/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.h b/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.h index fac1a8f78..8e5d59cca 100644 --- a/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.h +++ b/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.h @@ -32,8 +32,7 @@ class OCIOGradingTransformLinearNode : public OCIOBaseNode public: OCIOGradingTransformLinearNode(); - NODE_DEFAULT_DESTRUCTOR(OCIOGradingTransformLinearNode) - NODE_COPY_FUNCTION(OCIOGradingTransformLinearNode) + NODE_DEFAULT_FUNCTIONS(OCIOGradingTransformLinearNode) virtual QString Name() const override; virtual QString id() const override; diff --git a/app/node/keying/chromakey/chromakey.h b/app/node/keying/chromakey/chromakey.h index 9feadb736..653d31c87 100644 --- a/app/node/keying/chromakey/chromakey.h +++ b/app/node/keying/chromakey/chromakey.h @@ -25,8 +25,7 @@ class ChromaKeyNode : public OCIOBaseNode { public: ChromaKeyNode(); - NODE_DEFAULT_DESTRUCTOR(ChromaKeyNode) - NODE_COPY_FUNCTION(ChromaKeyNode) + NODE_DEFAULT_FUNCTIONS(ChromaKeyNode) virtual QString Name() const override; virtual QString id() const override;