timeline: removed unused variable in undo command

This commit is contained in:
itsmattkc
2020-01-19 23:52:23 +11:00
parent 48e6fd3955
commit 1dfac0ea7f
5 changed files with 12 additions and 15 deletions
+1 -1
View File
@@ -210,7 +210,7 @@ void SpeedDurationDialog::accept()
GapBlock* gap = new GapBlock();
gap->set_length_and_media_out(gap_length);
new NodeAddCommand(static_cast<NodeGraph*>(clip->parent()), gap, command);
new TrackInsertBlockBetweenBlocksCommand(TrackOutput::TrackFromBlock(clip), gap, clip, next_block, command);
new TrackInsertBlockAfterCommand(TrackOutput::TrackFromBlock(clip), gap, clip, command);
}
}
}
+1
View File
@@ -273,6 +273,7 @@ QVariant NodeInput::StringToValue(const QString &string, QList<NodeInput::Footag
return QVariant::fromValue(rational::fromString(string));
case kFootage:
footage_connections.append({this, string.toULongLong()});
/* fall through */
default:
return string;
}
+4 -5
View File
@@ -53,11 +53,10 @@ void TimelineWidget::RippleTool::MouseReleaseInternal(TimelineViewMouseEvent *ev
Block* block_to_append_gap_to = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kReferenceBlock));
new TrackInsertBlockBetweenBlocksCommand(parent()->GetTrackFromReference(ghost->Track()),
gap,
block_to_append_gap_to,
block_to_append_gap_to->next(),
command);
new TrackInsertBlockAfterCommand(parent()->GetTrackFromReference(ghost->Track()),
gap,
block_to_append_gap_to,
command);
}
} else {
// This was a Block that already existed
+4 -6
View File
@@ -106,25 +106,23 @@ void TrackRippleRemoveBlockCommand::undo()
}
}
TrackInsertBlockBetweenBlocksCommand::TrackInsertBlockBetweenBlocksCommand(TrackOutput *track,
TrackInsertBlockAfterCommand::TrackInsertBlockAfterCommand(TrackOutput *track,
Block *block,
Block *before,
Block *after,
QUndoCommand *parent) :
QUndoCommand(parent),
track_(track),
block_(block),
before_(before),
after_(after)
before_(before)
{
}
void TrackInsertBlockBetweenBlocksCommand::redo()
void TrackInsertBlockAfterCommand::redo()
{
track_->InsertBlockAfter(block_, before_);
}
void TrackInsertBlockBetweenBlocksCommand::undo()
void TrackInsertBlockAfterCommand::undo()
{
track_->RippleRemoveBlock(block_);
}
+2 -3
View File
@@ -108,9 +108,9 @@ private:
Block* block_;
};
class TrackInsertBlockBetweenBlocksCommand : public QUndoCommand {
class TrackInsertBlockAfterCommand : public QUndoCommand {
public:
TrackInsertBlockBetweenBlocksCommand(TrackOutput* track, Block* block, Block* before, Block* after, QUndoCommand* parent = nullptr);
TrackInsertBlockAfterCommand(TrackOutput* track, Block* block, Block* before, QUndoCommand* parent = nullptr);
virtual void redo() override;
virtual void undo() override;
@@ -121,7 +121,6 @@ private:
Block* block_;
Block* before_;
Block* after_;
};
/**