oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code: use macros for default node functions

Browse Source 
Easier to maintain
This commit is contained in:
itsmattkc
2022-05-04 11:01:17 -07:00
parent 91b761693b
commit d55d9c820f
69 changed files with 49 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/audio/pan/pan.cpp
-5
View File
@@ -42,11 +42,6 @@ PanNode::PanNode()
SetEffectInput(kSamplesInput);
}
Node *PanNode::copy() const
{
return new PanNode();
}
QString PanNode::Name() const
{
return tr("Pan");
app/node/audio/pan/pan.h
+1 -3
View File
@@ -31,9 +31,7 @@ class PanNode : public Node
public:
PanNode();
NODE_DEFAULT_DESTRUCTOR(PanNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(PanNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/audio/volume/volume.cpp
-5
View File
@@ -41,11 +41,6 @@ VolumeNode::VolumeNode()
SetEffectInput(kSamplesInput);
}
Node *VolumeNode::copy() const
{
return new VolumeNode();
}
QString VolumeNode::Name() const
{
return tr("Volume");
app/node/audio/volume/volume.h
+1 -3
View File
@@ -31,9 +31,7 @@ class VolumeNode : public MathNodeBase
public:
VolumeNode();
NODE_DEFAULT_DESTRUCTOR(VolumeNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(VolumeNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/block/block.h
-2
View File
@@ -37,8 +37,6 @@ class Block : public Node
public:
Block();
NODE_DEFAULT_DESTRUCTOR(Block)
virtual QVector<CategoryID> Category() const override;
const rational& in() const
app/node/block/clip/clip.cpp
-5
View File
@@ -61,11 +61,6 @@ ClipBlock::ClipBlock() :
SetEffectInput(kBufferIn);
}
Node *ClipBlock::copy() const
{
return new ClipBlock();
}
QString ClipBlock::Name() const
{
if (track()) {
app/node/block/clip/clip.h
+1 -3
View File
@@ -37,9 +37,7 @@ class ClipBlock : public Block
public:
ClipBlock();
NODE_DEFAULT_DESTRUCTOR(ClipBlock)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(ClipBlock)
virtual QString Name() const override;
virtual QString id() const override;
app/node/block/gap/gap.cpp
-5
View File
@@ -26,11 +26,6 @@ GapBlock::GapBlock()
{
}
Node *GapBlock::copy() const
{
return new GapBlock();
}
QString GapBlock::Name() const
{
return tr("Gap");
app/node/block/gap/gap.h
+1 -3
View File
@@ -34,9 +34,7 @@ class GapBlock : public Block
public:
GapBlock();
NODE_DEFAULT_DESTRUCTOR(GapBlock)
virtual Node * copy() const override;
NODE_DEFAULT_FUNCTIONS(GapBlock)
virtual QString Name() const override;
virtual QString id() const override;
app/node/block/subtitle/subtitle.cpp
-5
View File
@@ -31,11 +31,6 @@ SubtitleBlock::SubtitleBlock()
AddInput(kTextIn, NodeValue::kText, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
}
Node *SubtitleBlock::copy() const
{
return new SubtitleBlock();
}
QString SubtitleBlock::Name() const
{
return tr("Subtitle");
app/node/block/subtitle/subtitle.h
+1 -3
View File
@@ -31,9 +31,7 @@ class SubtitleBlock : public ClipBlock
public:
SubtitleBlock();
NODE_DEFAULT_DESTRUCTOR(SubtitleBlock)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(SubtitleBlock)
virtual QString Name() const override;
virtual QString id() const override;
app/node/block/transition/crossdissolve/crossdissolvetransition.cpp
-6
View File
@@ -24,12 +24,6 @@ namespace olive {
CrossDissolveTransition::CrossDissolveTransition()
{
}
Node *CrossDissolveTransition::copy() const
{
return new CrossDissolveTransition();
}
QString CrossDissolveTransition::Name() const
app/node/block/transition/crossdissolve/crossdissolvetransition.h
+1 -3
View File
@@ -31,9 +31,7 @@ class CrossDissolveTransition : public TransitionBlock
public:
CrossDissolveTransition();
NODE_DEFAULT_DESTRUCTOR(CrossDissolveTransition)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(CrossDissolveTransition)
virtual QString Name() const override;
virtual QString id() const override;
app/node/block/transition/diptocolor/diptocolortransition.cpp
-5
View File
@@ -29,11 +29,6 @@ DipToColorTransition::DipToColorTransition()
AddInput(kColorInput, NodeValue::kColor, QVariant::fromValue(Color(0, 0, 0)));
}
Node *DipToColorTransition::copy() const
{
return new DipToColorTransition();
}
QString DipToColorTransition::Name() const
{
return tr("Dip To Color");
app/node/block/transition/diptocolor/diptocolortransition.h
+1 -3
View File
@@ -31,9 +31,7 @@ class DipToColorTransition : public TransitionBlock
public:
DipToColorTransition();
NODE_DEFAULT_DESTRUCTOR(DipToColorTransition)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(DipToColorTransition)
virtual QString Name() const override;
virtual QString id() const override;
app/node/block/transition/transition.h
-2
View File
@@ -33,8 +33,6 @@ class TransitionBlock : public Block
public:
TransitionBlock();
NODE_DEFAULT_DESTRUCTOR(TransitionBlock)
virtual void Retranslate() override;
rational in_offset() const;
app/node/color/colormanager/colormanager.h
+2 -5
View File
@@ -38,6 +38,8 @@ class ColorManager : public Node
public:
ColorManager();
NODE_DEFAULT_FUNCTIONS(ColorManager)
virtual QString Name() const override
{
return tr("Color Manager");
@@ -58,11 +60,6 @@ public:
return tr("Color management configuration for project.");
}
virtual Node* copy() const override
{
return new ColorManager();
}
OCIO::ConstConfigRcPtr GetConfig() const;
static OCIO::ConstConfigRcPtr CreateConfigFromFile(const QString& filename);
app/node/distort/cornerpin/cornerpindistortnode.h
+1 -6
View File
@@ -35,12 +35,7 @@ class CornerPinDistortNode : public Node
public:
CornerPinDistortNode();
NODE_DEFAULT_DESTRUCTOR(CornerPinDistortNode)
virtual Node* copy() const override
{
return new CornerPinDistortNode();
}
NODE_DEFAULT_FUNCTIONS(CornerPinDistortNode)
virtual QString Name() const override
{
app/node/distort/crop/cropdistortnode.h
+1 -6
View File
@@ -36,12 +36,7 @@ class CropDistortNode : public Node
public:
CropDistortNode();
NODE_DEFAULT_DESTRUCTOR(CropDistortNode)
virtual Node* copy() const override
{
return new CropDistortNode();
}
NODE_DEFAULT_FUNCTIONS(CropDistortNode)
virtual QString Name() const override
{
app/node/distort/flip/flipdistortnode.cpp
-5
View File
@@ -40,11 +40,6 @@ FlipDistortNode::FlipDistortNode()
SetEffectInput(kTextureInput);
}
Node* FlipDistortNode::copy() const
{
return new FlipDistortNode();
}
QString FlipDistortNode::Name() const
{
return tr("Flip");
app/node/distort/flip/flipdistortnode.h
+1 -3
View File
@@ -31,9 +31,7 @@ class FlipDistortNode : public Node
public:
FlipDistortNode();
NODE_DEFAULT_DESTRUCTOR(FlipDistortNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(FlipDistortNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/distort/transform/transformdistortnode.h
+1 -6
View File
@@ -34,12 +34,7 @@ class TransformDistortNode : public MatrixGenerator
public:
TransformDistortNode();
NODE_DEFAULT_DESTRUCTOR(TransformDistortNode)
virtual Node* copy() const override
{
return new TransformDistortNode();
}
NODE_DEFAULT_FUNCTIONS(TransformDistortNode)
virtual QString Name() const override
{
app/node/effect/opacity/opacityeffect.h
+1 -3
View File
@@ -10,9 +10,7 @@ class OpacityEffect : public Node
public:
OpacityEffect();
NODE_DEFAULT_DESTRUCTOR(OpacityEffect)
NODE_COPY_FUNCTION(OpacityEffect)
NODE_DEFAULT_FUNCTIONS(OpacityEffect)
virtual QString Name() const override
{
app/node/filter/blur/blur.cpp
-5
View File
@@ -50,11 +50,6 @@ BlurFilterNode::BlurFilterNode()
SetEffectInput(kTextureInput);
}
Node *BlurFilterNode::copy() const
{
return new BlurFilterNode();
}
QString BlurFilterNode::Name() const
{
return tr("Blur");
app/node/filter/blur/blur.h
+1 -3
View File
@@ -31,9 +31,7 @@ class BlurFilterNode : public Node
public:
BlurFilterNode();
NODE_DEFAULT_DESTRUCTOR(BlurFilterNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(BlurFilterNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/filter/mosaic/mosaicfilternode.h
+1 -6
View File
@@ -31,12 +31,7 @@ class MosaicFilterNode : public Node
public:
MosaicFilterNode();
NODE_DEFAULT_DESTRUCTOR(MosaicFilterNode)
virtual Node* copy() const override
{
return new MosaicFilterNode();
}
NODE_DEFAULT_FUNCTIONS(MosaicFilterNode)
virtual QString Name() const override
{
app/node/filter/stroke/stroke.cpp
-5
View File
@@ -53,11 +53,6 @@ StrokeFilterNode::StrokeFilterNode()
SetEffectInput(kTextureInput);
}
Node *StrokeFilterNode::copy() const
{
return new StrokeFilterNode();
}
QString StrokeFilterNode::Name() const
{
return tr("Stroke");
app/node/filter/stroke/stroke.h
+1 -3
View File
@@ -31,9 +31,7 @@ class StrokeFilterNode : public Node
public:
StrokeFilterNode();
NODE_DEFAULT_DESTRUCTOR(StrokeFilterNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(StrokeFilterNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/matrix/matrix.cpp
-5
View File
@@ -51,11 +51,6 @@ MatrixGenerator::MatrixGenerator()
AddInput(kAnchorInput, NodeValue::kVec2, QVector2D(0.0, 0.0));
}
Node *MatrixGenerator::copy() const
{
return new MatrixGenerator();
}
QString MatrixGenerator::Name() const
{
return tr("Orthographic Matrix");
app/node/generator/matrix/matrix.h
+1 -3
View File
@@ -34,9 +34,7 @@ class MatrixGenerator : public Node
public:
MatrixGenerator();
NODE_DEFAULT_DESTRUCTOR(MatrixGenerator)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(MatrixGenerator)
virtual QString Name() const override;
virtual QString ShortName() const override;
app/node/generator/noise/noise.cpp
-5
View File
@@ -44,11 +44,6 @@ NoiseGeneratorNode::NoiseGeneratorNode()
SetFlags(kVideoEffect);
}
Node* NoiseGeneratorNode::copy() const
{
return new NoiseGeneratorNode();
}
QString NoiseGeneratorNode::Name() const
{
return tr("Noise");
app/node/generator/noise/noise.h
+1 -3
View File
@@ -30,9 +30,7 @@ class NoiseGeneratorNode : public Node {
public:
NoiseGeneratorNode();
NODE_DEFAULT_DESTRUCTOR(NoiseGeneratorNode)
virtual Node *copy() const override;
NODE_DEFAULT_FUNCTIONS(NoiseGeneratorNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/polygon/polygon.cpp
-5
View File
@@ -61,11 +61,6 @@ PolygonGenerator::PolygonGenerator()
poly_gizmo_ = new PathGizmo(this);
}
Node *PolygonGenerator::copy() const
{
return new PolygonGenerator();
}
QString PolygonGenerator::Name() const
{
return tr("Polygon");
app/node/generator/polygon/polygon.h
+1 -3
View File
@@ -39,9 +39,7 @@ class PolygonGenerator : public GeneratorWithMerge
public:
PolygonGenerator();
NODE_DEFAULT_DESTRUCTOR(PolygonGenerator)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(PolygonGenerator)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/shape/generatorwithmerge.h
-2
View File
@@ -31,8 +31,6 @@ class GeneratorWithMerge : public Node
public:
GeneratorWithMerge();
NODE_DEFAULT_DESTRUCTOR(GeneratorWithMerge)
virtual void Retranslate() override;
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
app/node/generator/shape/shapenode.h
+1 -2
View File
@@ -36,8 +36,7 @@ public:
kEllipse
};
NODE_DEFAULT_DESTRUCTOR(ShapeNode)
NODE_COPY_FUNCTION(ShapeNode)
NODE_DEFAULT_FUNCTIONS(ShapeNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/shape/shapenodebase.h
-2
View File
@@ -35,8 +35,6 @@ class ShapeNodeBase : public GeneratorWithMerge
public:
ShapeNodeBase(bool create_color_input = true);
NODE_DEFAULT_DESTRUCTOR(ShapeNodeBase)
virtual void Retranslate() override;
virtual void UpdateGizmoPositions(const NodeValueRow &row, const NodeGlobals &globals) override;
app/node/generator/solid/solid.cpp
-5
View File
@@ -34,11 +34,6 @@ SolidGenerator::SolidGenerator()
AddInput(kColorInput, NodeValue::kColor, QVariant::fromValue(Color(1.0f, 0.0f, 0.0f, 1.0f)));
}
Node *SolidGenerator::copy() const
{
return new SolidGenerator();
}
QString SolidGenerator::Name() const
{
return tr("Solid");
app/node/generator/solid/solid.h
+1 -3
View File
@@ -31,9 +31,7 @@ class SolidGenerator : public Node
public:
SolidGenerator();
NODE_DEFAULT_DESTRUCTOR(SolidGenerator)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(SolidGenerator)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/text/textv1.h
+1 -2
View File
@@ -31,8 +31,7 @@ class TextGeneratorV1 : public Node
public:
TextGeneratorV1();
NODE_DEFAULT_DESTRUCTOR(TextGeneratorV1)
NODE_COPY_FUNCTION(TextGeneratorV1)
NODE_DEFAULT_FUNCTIONS(TextGeneratorV1)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/text/textv2.h
+1 -2
View File
@@ -31,8 +31,7 @@ class TextGeneratorV2 : public ShapeNodeBase
public:
TextGeneratorV2();
NODE_DEFAULT_DESTRUCTOR(TextGeneratorV2)
NODE_COPY_FUNCTION(TextGeneratorV2)
NODE_DEFAULT_FUNCTIONS(TextGeneratorV2)
virtual QString Name() const override;
virtual QString id() const override;
app/node/generator/text/textv3.h
+1 -2
View File
@@ -32,8 +32,7 @@ class TextGeneratorV3 : public ShapeNodeBase
public:
TextGeneratorV3();
NODE_DEFAULT_DESTRUCTOR(TextGeneratorV3)
NODE_COPY_FUNCTION(TextGeneratorV3)
NODE_DEFAULT_FUNCTIONS(TextGeneratorV3)
virtual QString Name() const override;
virtual QString id() const override;
app/node/group/group.h
+1 -2
View File
@@ -31,8 +31,7 @@ class NodeGroup : public Node
public:
NodeGroup();
NODE_DEFAULT_DESTRUCTOR(NodeGroup)
NODE_COPY_FUNCTION(NodeGroup)
NODE_DEFAULT_FUNCTIONS(NodeGroup)
virtual QString Name() const override;
virtual QString id() const override;
app/node/input/time/timeinput.cpp
-5
View File
@@ -28,11 +28,6 @@ TimeInput::TimeInput()
{
}
Node *TimeInput::copy() const
{
return new TimeInput();
}
QString TimeInput::Name() const
{
return tr("Time");
app/node/input/time/timeinput.h
+2 -4
View File
@@ -27,13 +27,11 @@ namespace olive {
class TimeInput : public Node
{
Q_OBJECT
Q_OBJECT
public:
TimeInput();
NODE_DEFAULT_DESTRUCTOR(TimeInput)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(TimeInput)
virtual QString Name() const override;
virtual QString id() const override;
app/node/input/value/valuenode.h
+1 -6
View File
@@ -31,12 +31,7 @@ class ValueNode : public Node
public:
ValueNode();
NODE_DEFAULT_DESTRUCTOR(ValueNode)
virtual Node* copy() const override
{
return new ValueNode();
}
NODE_DEFAULT_FUNCTIONS(ValueNode)
virtual QString Name() const override
{
app/node/keying/colordifferencekey/colordifferencekey.cpp
-5
View File
@@ -49,11 +49,6 @@ ColorDifferenceKeyNode::ColorDifferenceKeyNode()
SetEffectInput(kTextureInput);
}
Node *ColorDifferenceKeyNode::copy() const
{
return new ColorDifferenceKeyNode();
}
QString ColorDifferenceKeyNode::Name() const
{
return tr("Color Difference Key");
app/node/keying/colordifferencekey/colordifferencekey.h
+1 -1
View File
@@ -24,7 +24,7 @@ class ColorDifferenceKeyNode : public Node {
public:
ColorDifferenceKeyNode();
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(ColorDifferenceKeyNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/keying/despill/despill.cpp
-5
View File
@@ -40,11 +40,6 @@ DespillNode::DespillNode()
SetEffectInput(kTextureInput);
}
Node* DespillNode::copy() const
{
return new DespillNode();
}
QString DespillNode::Name() const
{
return tr("Despill");
app/node/keying/despill/despill.h
+4 -4
View File
@@ -25,7 +25,7 @@ class DespillNode : public Node {
public:
DespillNode();
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(DespillNode)
virtual QString Name() const override;
virtual QString id() const override;
@@ -36,13 +36,13 @@ class DespillNode : public Node {
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
virtual void Value(const NodeValueRow& value, const NodeGlobals& globals, NodeValueTable* table) const override;
static const QString kTextureInput;
static const QString kColorInput;
static const QString kMethodInput;
static const QString kPreserveLuminanceInput;
};
} // namespace olive
app/node/math/math/math.cpp
-5
View File
@@ -42,11 +42,6 @@ MathNode::MathNode()
SetInputProperty(kParamBIn, QStringLiteral("autotrim"), true);
}
Node *MathNode::copy() const
{
return new MathNode();
}
QString MathNode::Name() const
{
return tr("Math");
app/node/math/math/math.h
+1 -3
View File
@@ -31,9 +31,7 @@ class MathNode : public MathNodeBase
public:
MathNode();
NODE_DEFAULT_DESTRUCTOR(MathNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(MathNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/math/math/mathbase.h
-2
View File
@@ -30,8 +30,6 @@ class MathNodeBase : public Node
public:
MathNodeBase() = default;
NODE_DEFAULT_DESTRUCTOR(MathNodeBase)
enum Operation {
kOpAdd,
kOpSubtract,
app/node/math/merge/merge.cpp
-5
View File
@@ -38,11 +38,6 @@ MergeNode::MergeNode()
SetFlags(kDontShowInParamView);
}
Node *MergeNode::copy() const
{
return new MergeNode();
}
QString MergeNode::Name() const
{
return tr("Merge");
app/node/math/merge/merge.h
+1 -3
View File
@@ -31,9 +31,7 @@ class MergeNode : public Node
public:
MergeNode();
NODE_DEFAULT_DESTRUCTOR(MergeNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(MergeNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/math/trigonometry/trigonometry.cpp
-5
View File
@@ -34,11 +34,6 @@ TrigonometryNode::TrigonometryNode()
AddInput(kXIn, NodeValue::kFloat, 0.0);
}
olive::Node *olive::TrigonometryNode::copy() const
{
return new TrigonometryNode();
}
QString TrigonometryNode::Name() const
{
return tr("Trigonometry");
app/node/math/trigonometry/trigonometry.h
+1 -3
View File
@@ -31,9 +31,7 @@ class TrigonometryNode : public Node
public:
TrigonometryNode();
NODE_DEFAULT_DESTRUCTOR(TrigonometryNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(TrigonometryNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/node.h
+4
View File
@@ -48,6 +48,10 @@
namespace olive {
#define NODE_DEFAULT_FUNCTIONS(x) \
NODE_DEFAULT_DESTRUCTOR(x) \
NODE_COPY_FUNCTION(x)
#define NODE_DEFAULT_DESTRUCTOR(x) \
virtual ~x() override {DisconnectAll();}
app/node/output/track/track.cpp
-5
View File
@@ -66,11 +66,6 @@ const Track::Type& Track::type() const
return track_type_;
}
Node *Track::copy() const
{
return new Track();
}
QString Track::Name() const
{
if (track_type_ == Track::kVideo) {
app/node/output/track/track.h
+1 -3
View File
@@ -45,13 +45,11 @@ public:
Track();
NODE_DEFAULT_DESTRUCTOR(Track)
NODE_DEFAULT_FUNCTIONS(Track)
const Track::Type& type() const;
void set_type(const Track::Type& track_type);
virtual Node* copy() const override;
virtual QString Name() const override;
virtual QString id() const override;
virtual QVector<CategoryID> Category() const override;
app/node/output/viewer/viewer.cpp
-5
View File
@@ -72,11 +72,6 @@ ViewerOutput::ViewerOutput(bool create_buffer_inputs, bool create_default_stream
timeline_points_ = new TimelinePoints(this);
}
Node *ViewerOutput::copy() const
{
return new ViewerOutput();
}
QString ViewerOutput::Name() const
{
return tr("Viewer");
app/node/output/viewer/viewer.h
+1 -3
View File
@@ -46,9 +46,7 @@ class ViewerOutput : public Node
public:
ViewerOutput(bool create_buffer_inputs = true, bool create_default_streams = true);
NODE_DEFAULT_DESTRUCTOR(ViewerOutput)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(ViewerOutput)
virtual QString Name() const override;
virtual QString id() const override;
app/node/project/folder/folder.h
+1 -6
View File
@@ -37,12 +37,7 @@ class Folder : public Node
public:
Folder();
NODE_DEFAULT_DESTRUCTOR(Folder)
virtual Node* copy() const override
{
return new Folder();
}
NODE_DEFAULT_FUNCTIONS(Folder)
virtual QString Name() const override
{
app/node/project/footage/footage.h
+1 -6
View File
@@ -55,12 +55,7 @@ public:
*/
Footage(const QString& filename = QString());
NODE_DEFAULT_DESTRUCTOR(Footage)
virtual Node* copy() const override
{
return new Footage();
}
NODE_DEFAULT_FUNCTIONS(Footage)
virtual QString Name() const override
{
app/node/project/projectsettings/projectsettings.h
+1 -6
View File
@@ -31,7 +31,7 @@ class ProjectSettingsNode : public Node
public:
ProjectSettingsNode();
NODE_DEFAULT_DESTRUCTOR(ProjectSettingsNode)
NODE_DEFAULT_FUNCTIONS(ProjectSettingsNode)
virtual QString Name() const override
{
@@ -53,11 +53,6 @@ public:
return tr("Settings used throughout the project.");
}
virtual Node* copy() const override
{
return new ProjectSettingsNode();
}
enum CacheSetting {
kCacheUseDefaultLocation,
kCacheStoreAlongsideProject,
app/node/project/sequence/sequence.h
+1 -6
View File
@@ -36,12 +36,7 @@ class Sequence : public ViewerOutput
public:
Sequence();
NODE_DEFAULT_DESTRUCTOR(Sequence)
virtual Node* copy() const override
{
return new Sequence();
}
NODE_DEFAULT_FUNCTIONS(Sequence)
virtual QString Name() const override
{
app/node/time/timeoffset/timeoffsetnode.h
+1 -2
View File
@@ -30,8 +30,7 @@ class TimeOffsetNode : public Node
public:
TimeOffsetNode();
NODE_DEFAULT_DESTRUCTOR(TimeOffsetNode)
NODE_COPY_FUNCTION(TimeOffsetNode)
NODE_DEFAULT_FUNCTIONS(TimeOffsetNode)
virtual QString Name() const override
{
app/node/time/timeremap/timeremap.cpp
-5
View File
@@ -39,11 +39,6 @@ TimeRemapNode::TimeRemapNode()
AddInput(kInputInput, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable));
}
Node *TimeRemapNode::copy() const
{
return new TimeRemapNode();
}
QString TimeRemapNode::Name() const
{
return tr("Time Remap");
app/node/time/timeremap/timeremap.h
+1 -3
View File
@@ -31,9 +31,7 @@ class TimeRemapNode : public Node
public:
TimeRemapNode();
NODE_DEFAULT_DESTRUCTOR(TimeRemapNode)
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(TimeRemapNode)
virtual QString Name() const override;
virtual QString id() const override;