diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h index ae1e02569..2f428b4b1 100644 --- a/aegisub/src/ass_attachment.h +++ b/aegisub/src/ass_attachment.h @@ -48,7 +48,6 @@ public: std::string GetEntryData() const override { return entry_data; } AssEntryGroup Group() const override { return group; } - AssAttachment *Clone() const override { return new AssAttachment(*this); } AssAttachment(AssAttachment const& rgt); AssAttachment(std::string const& header, AssEntryGroup group); diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp index f75298d04..4918143c6 100644 --- a/aegisub/src/ass_dialogue.cpp +++ b/aegisub/src/ass_dialogue.cpp @@ -255,9 +255,3 @@ std::string AssDialogue::GetStrippedText() const { boost::ptr_vector blocks(ParseTags()); return join(blocks | agi::of_type() | transformed(get_text_p), ""); } - -AssDialogue *AssDialogue::Clone() const { - auto clone = new AssDialogue(*this); - clone->Id = Id; - return clone; -} diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h index 03c2169b1..9d661ba84 100644 --- a/aegisub/src/ass_dialogue.h +++ b/aegisub/src/ass_dialogue.h @@ -177,8 +177,6 @@ public: /// Does this line collide with the passed line? bool CollidesWith(const AssDialogue *target) const; - AssDialogue *Clone() const override; - AssDialogue(); AssDialogue(AssDialogue const&); AssDialogue(AssDialogueBase const&); diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h index 12105e634..cfeb2dafb 100644 --- a/aegisub/src/ass_entry.h +++ b/aegisub/src/ass_entry.h @@ -50,9 +50,6 @@ class AssEntry : public boost::intrusive::make_list_base_hookass->Styles.push_back(*temp.GetStyle(styles[sel])->Clone()); + c->ass->Styles.push_back(*new AssStyle(*temp.GetStyle(styles[sel]))); } // Update diff --git a/aegisub/src/threaded_frame_source.cpp b/aegisub/src/threaded_frame_source.cpp index 52f48366d..b1075a38c 100644 --- a/aegisub/src/threaded_frame_source.cpp +++ b/aegisub/src/threaded_frame_source.cpp @@ -141,7 +141,7 @@ void ThreadedFrameSource::UpdateSubtitles(const AssFile *new_subs, std::setEvents) { if (changes.count(&e)) - changed.emplace_back(i, e.Clone()); + changed.emplace_back(i, new AssDialogue(e)); ++i; }