diff options
author | Neil <nyamatongwe@gmail.com> | 2023-12-30 08:52:40 +1100 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2023-12-30 08:52:40 +1100 |
commit | 95413c5c3a74285e62e8e1d9a9ee1dcec4dba336 (patch) | |
tree | 0b12d8aabde7d7ed9d260e41cc232fba9358da65 /src/Selection.cxx | |
parent | afce8e03c9a083f4ffa86dc223ea7bdf81f520bb (diff) | |
download | scintilla-mirror-95413c5c3a74285e62e8e1d9a9ee1dcec4dba336.tar.gz |
Avoid unnecessary use of push_back and emplace_back by preserving ranges[0].
This allows more methods to be noexcept.
Diffstat (limited to 'src/Selection.cxx')
-rw-r--r-- | src/Selection.cxx | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/Selection.cxx b/src/Selection.cxx index 53559e329..48cebb16c 100644 --- a/src/Selection.cxx +++ b/src/Selection.cxx @@ -230,7 +230,7 @@ SelectionSegment Selection::Limits() const noexcept { } } -SelectionSegment Selection::LimitsForRectangularElseMain() const { +SelectionSegment Selection::LimitsForRectangularElseMain() const noexcept { if (IsRectangular()) { return Limits(); } else { @@ -343,10 +343,12 @@ void Selection::TrimOtherSelections(size_t r, SelectionRange range) noexcept { } } -void Selection::SetSelection(SelectionRange range) { - ranges.clear(); - ranges.push_back(range); - mainRange = ranges.size() - 1; +void Selection::SetSelection(SelectionRange range) noexcept { + if (ranges.size() > 1) { + ranges.erase(ranges.begin() + 1, ranges.end()); + } + ranges[0] = range; + mainRange = 0; } void Selection::AddSelection(SelectionRange range) { @@ -360,7 +362,7 @@ void Selection::AddSelectionWithoutTrim(SelectionRange range) { mainRange = ranges.size() - 1; } -void Selection::DropSelection(size_t r) { +void Selection::DropSelection(size_t r) noexcept { if ((ranges.size() > 1) && (r < ranges.size())) { size_t mainNew = mainRange; if (mainNew >= r) { @@ -375,7 +377,7 @@ void Selection::DropSelection(size_t r) { } } -void Selection::DropAdditionalRanges() { +void Selection::DropAdditionalRanges() noexcept { SetSelection(RangeMain()); } @@ -425,17 +427,18 @@ Sci::Position Selection::VirtualSpaceFor(Sci::Position pos) const noexcept { return virtualSpace; } -void Selection::Clear() { - ranges.clear(); - ranges.emplace_back(); - mainRange = ranges.size() - 1; +void Selection::Clear() noexcept { + if (ranges.size() > 1) { + ranges.erase(ranges.begin() + 1, ranges.end()); + } + mainRange = 0; selType = SelTypes::stream; moveExtends = false; ranges[mainRange].Reset(); rangeRectangular.Reset(); } -void Selection::RemoveDuplicates() { +void Selection::RemoveDuplicates() noexcept { for (size_t i=0; i<ranges.size()-1; i++) { if (ranges[i].Empty()) { size_t j=i+1; |