From e0b9970672505bd3ec9f2fca8c0faec2199de46d Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Wed, 12 Mar 2014 14:54:46 -0700
Subject: [PATCH] Eliminate a bunch of pointless copies of the selection set
---
src/audio_timing_dialogue.cpp | 4 ++--
src/command/audio.cpp | 2 +-
src/command/edit.cpp | 12 +++++-------
src/command/grid.cpp | 2 +-
src/command/time.cpp | 4 ++--
src/dialog_shift_times.cpp | 2 +-
6 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/audio_timing_dialogue.cpp b/src/audio_timing_dialogue.cpp
index 433a3f985..3b53c8010 100644
--- a/src/audio_timing_dialogue.cpp
+++ b/src/audio_timing_dialogue.cpp
@@ -735,7 +735,7 @@ void AudioTimingControllerDialogue::RegenerateInactiveLines()
bool was_empty = inactive_lines.empty();
inactive_lines.clear();
- SubtitleSelection sel = context->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = context->selectionController->GetSelectedSet();
switch (int mode = inactive_line_mode->GetInt())
{
@@ -798,7 +798,7 @@ void AudioTimingControllerDialogue::RegenerateSelectedLines()
selected_lines.clear();
AssDialogue *active = context->selectionController->GetActiveLine();
- SubtitleSelection sel = context->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = context->selectionController->GetSelectedSet();
for (auto line : sel)
{
if (line == active) continue;
diff --git a/src/command/audio.cpp b/src/command/audio.cpp
index 827b70cc2..fe8e39925 100644
--- a/src/command/audio.cpp
+++ b/src/command/audio.cpp
@@ -191,7 +191,7 @@ struct audio_save_clip : public Command {
}
void operator()(agi::Context *c) override {
- SubtitleSelection sel = c->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = c->selectionController->GetSelectedSet();
if (sel.empty()) return;
AssTime start = INT_MAX, end = 0;
diff --git a/src/command/edit.cpp b/src/command/edit.cpp
index 204a672d6..3b99c8190 100644
--- a/src/command/edit.cpp
+++ b/src/command/edit.cpp
@@ -476,7 +476,7 @@ struct edit_find_replace : public Command {
static std::string get_entry_data(AssDialogue *d) { return d->GetEntryData(); }
static void copy_lines(agi::Context *c) {
- SubtitleSelection sel = c->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = c->selectionController->GetSelectedSet();
SetClipboard(join(c->ass->Line
| agi::of_type<AssDialogue>()
| filtered([&](AssDialogue *d) { return sel.count(d); })
@@ -485,7 +485,7 @@ static void copy_lines(agi::Context *c) {
}
static void delete_lines(agi::Context *c, wxString const& commit_message) {
- SubtitleSelection sel = c->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = c->selectionController->GetSelectedSet();
// Find a line near the active line not being deleted to make the new active line
AssDialogue *pre_sel = nullptr;
@@ -686,7 +686,7 @@ struct edit_line_duplicate_shift_back : public validate_video_and_sel_nonempty {
};
static void combine_lines(agi::Context *c, void (*combiner)(AssDialogue *, AssDialogue *), wxString const& message) {
- SubtitleSelection sel = c->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = c->selectionController->GetSelectedSet();
AssDialogue *first = nullptr;
for (entryIter it = c->ass->Line.begin(); it != c->ass->Line.end(); ) {
@@ -703,9 +703,7 @@ static void combine_lines(agi::Context *c, void (*combiner)(AssDialogue *, AssDi
delete diag;
}
- sel.clear();
- sel.insert(first);
- c->selectionController->SetSelectionAndActive(sel, first);
+ c->selectionController->SetSelectionAndActive({first}, first);
c->ass->Commit(message, AssFile::COMMIT_DIAG_ADDREM | AssFile::COMMIT_DIAG_FULL);
}
@@ -915,7 +913,7 @@ struct edit_line_recombine : public validate_sel_multiple {
STR_HELP("Recombine subtitles which have been split and merged")
void operator()(agi::Context *c) override {
- auto sel_set = c->selectionController->GetSelectedSet();
+ auto const& sel_set = c->selectionController->GetSelectedSet();
if (sel_set.size() < 2) return;
auto active_line = c->selectionController->GetActiveLine();
diff --git a/src/command/grid.cpp b/src/command/grid.cpp
index cd6985e06..54d2a3a43 100644
--- a/src/command/grid.cpp
+++ b/src/command/grid.cpp
@@ -387,7 +387,7 @@ struct grid_swap : public Command {
}
void operator()(agi::Context *c) override {
- SubtitleSelection sel = c->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = c->selectionController->GetSelectedSet();
if (sel.size() == 2) {
(*sel.begin())->swap_nodes(**sel.rbegin());
c->ass->Commit(_("swap lines"), AssFile::COMMIT_ORDER);
diff --git a/src/command/time.cpp b/src/command/time.cpp
index 747634aa4..53d6831f7 100644
--- a/src/command/time.cpp
+++ b/src/command/time.cpp
@@ -62,7 +62,7 @@ namespace {
struct validate_adjoinable : public Command {
CMD_TYPE(COMMAND_VALIDATE)
bool Validate(const agi::Context *c) override {
- SubtitleSelection sel = c->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = c->selectionController->GetSelectedSet();
if (sel.size() < 2) return !sel.empty();
size_t found = 0;
@@ -79,7 +79,7 @@ namespace {
};
static void adjoin_lines(agi::Context *c, bool set_start) {
- auto sel = c->selectionController->GetSelectedSet();
+ auto const& sel = c->selectionController->GetSelectedSet();
AssDialogue *prev = nullptr;
size_t seen = 0;
bool prev_sel = false;
diff --git a/src/dialog_shift_times.cpp b/src/dialog_shift_times.cpp
index 01b0d6272..ee54405a9 100644
--- a/src/dialog_shift_times.cpp
+++ b/src/dialog_shift_times.cpp
@@ -333,7 +333,7 @@ void DialogShiftTimes::Process(wxCommandEvent &) {
bool start = type != 2;
bool end = type != 1;
- SubtitleSelection sel = context->selectionController->GetSelectedSet();
+ SubtitleSelection const& sel = context->selectionController->GetSelectedSet();
long shift;
if (by_time) {
--
GitLab