code: use macros for default node functions

Easier to maintain
2022-05-04 11:01:17 -07:00
parent 91b761693b
commit d55d9c820f
69 changed files with 49 additions and 269 deletions
@@ -37,8 +37,6 @@ class Block : public Node
 public:
  Block();

-  NODE_DEFAULT_DESTRUCTOR(Block)
-
  virtual QVector<CategoryID> Category() const override;

  const rational& in() const
@@ -61,11 +61,6 @@ ClipBlock::ClipBlock() :
  SetEffectInput(kBufferIn);
 }

-Node *ClipBlock::copy() const
-{
-  return new ClipBlock();
-}
-
 QString ClipBlock::Name() const
 {
  if (track()) {
@@ -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;
@@ -26,11 +26,6 @@ GapBlock::GapBlock()
 {
 }

-Node *GapBlock::copy() const
-{
-  return new GapBlock();
-}
-
 QString GapBlock::Name() const
 {
  return tr("Gap");
@@ -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;
@@ -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");
@@ -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;
@@ -24,12 +24,6 @@ namespace olive {

 CrossDissolveTransition::CrossDissolveTransition()
 {
-
-}
-
-Node *CrossDissolveTransition::copy() const
-{
-  return new CrossDissolveTransition();
 }

 QString CrossDissolveTransition::Name() const
@@ -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;
@@ -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");
@@ -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;
@@ -33,8 +33,6 @@ class TransitionBlock : public Block
 public:
  TransitionBlock();

-  NODE_DEFAULT_DESTRUCTOR(TransitionBlock)
-
  virtual void Retranslate() override;

  rational in_offset() const;