remove block enum

Replaced with dynamic casts.
This commit is contained in:
itsmattkc
2021-04-22 11:50:24 +10:00
parent 50644b8e10
commit 269fa6d905
16 changed files with 40 additions and 86 deletions
-8
View File
@@ -39,14 +39,6 @@ public:
NODE_DEFAULT_DESTRUCTOR(Block)
enum Type {
kClip,
kGap,
kTransition
};
virtual Type type() const = 0;
virtual QVector<CategoryID> Category() const override;
const rational& in() const
-5
View File
@@ -34,11 +34,6 @@ Node *ClipBlock::copy() const
return new ClipBlock();
}
Block::Type ClipBlock::type() const
{
return kClip;
}
QString ClipBlock::Name() const
{
return tr("Clip");
-2
View File
@@ -38,8 +38,6 @@ public:
virtual Node* copy() const override;
virtual Type type() const override;
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Description() const override;
-5
View File
@@ -31,11 +31,6 @@ Node *GapBlock::copy() const
return new GapBlock();
}
Block::Type GapBlock::type() const
{
return kGap;
}
QString GapBlock::Name() const
{
return tr("Gap");
-2
View File
@@ -38,8 +38,6 @@ public:
virtual Node * copy() const override;
virtual Type type() const override;
virtual QString Name() const override;
virtual QString id() const override;
virtual QString Description() const override;
+2 -7
View File
@@ -39,11 +39,6 @@ TransitionBlock::TransitionBlock() :
AddInput(kCurveInput, NodeValue::kCombo, InputFlags(kInputFlagNotKeyframable | kInputFlagNotConnectable));
}
Block::Type TransitionBlock::type() const
{
return kTransition;
}
void TransitionBlock::Retranslate()
{
Block::Retranslate();
@@ -255,7 +250,7 @@ void TransitionBlock::InputConnectedEvent(const QString &input, int element, con
// If node is not a block, this will just be null
if ((connected_out_block_ = dynamic_cast<Block*>(output.node()))) {
Q_ASSERT(connected_out_block_->type() != Block::kTransition
Q_ASSERT(!dynamic_cast<TransitionBlock*>(connected_out_block_)
&& !connected_out_block_->out_transition()
&& connected_out_block_ == this->previous());
@@ -265,7 +260,7 @@ void TransitionBlock::InputConnectedEvent(const QString &input, int element, con
// If node is not a block, this will just be null
if ((connected_in_block_ = dynamic_cast<Block*>(output.node()))) {
Q_ASSERT(connected_in_block_->type() != Block::kTransition
Q_ASSERT(!dynamic_cast<TransitionBlock*>(connected_in_block_)
&& !connected_in_block_->in_transition()
&& connected_in_block_ == this->next());
-2
View File
@@ -33,8 +33,6 @@ public:
NODE_DEFAULT_DESTRUCTOR(TransitionBlock)
virtual Type type() const override;
virtual void Retranslate() override;
rational in_offset() const;