From 877def4f243e1ef5eb39a6132f3969844e00be95 Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 11 Jun 2020 10:08:29 +1000 Subject: Backport: Use noexcept where safe and maintainable. Backport of changeset 8300:266c8247814e. --- src/ContractionState.cxx | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/ContractionState.cxx') diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index 8d2427629..8897f3d95 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -60,32 +60,32 @@ public: void Clear() noexcept override; - Sci::Line LinesInDoc() const override; - Sci::Line LinesDisplayed() const override; - Sci::Line DisplayFromDoc(Sci::Line lineDoc) const override; - Sci::Line DisplayLastFromDoc(Sci::Line lineDoc) const override; - Sci::Line DocFromDisplay(Sci::Line lineDisplay) const override; + Sci::Line LinesInDoc() const noexcept override; + Sci::Line LinesDisplayed() const noexcept override; + Sci::Line DisplayFromDoc(Sci::Line lineDoc) const noexcept override; + Sci::Line DisplayLastFromDoc(Sci::Line lineDoc) const noexcept override; + Sci::Line DocFromDisplay(Sci::Line lineDisplay) const noexcept override; void InsertLines(Sci::Line lineDoc, Sci::Line lineCount) override; void DeleteLines(Sci::Line lineDoc, Sci::Line lineCount) override; - bool GetVisible(Sci::Line lineDoc) const override; + bool GetVisible(Sci::Line lineDoc) const noexcept override; bool SetVisible(Sci::Line lineDocStart, Sci::Line lineDocEnd, bool isVisible) override; - bool HiddenLines() const override; + bool HiddenLines() const noexcept override; - const char *GetFoldDisplayText(Sci::Line lineDoc) const override; + const char *GetFoldDisplayText(Sci::Line lineDoc) const noexcept override; bool SetFoldDisplayText(Sci::Line lineDoc, const char *text) override; - bool GetExpanded(Sci::Line lineDoc) const override; + bool GetExpanded(Sci::Line lineDoc) const noexcept override; bool SetExpanded(Sci::Line lineDoc, bool isExpanded) override; - Sci::Line ContractedNext(Sci::Line lineDocStart) const override; + Sci::Line ContractedNext(Sci::Line lineDocStart) const noexcept override; - int GetHeight(Sci::Line lineDoc) const override; + int GetHeight(Sci::Line lineDoc) const noexcept override; bool SetHeight(Sci::Line lineDoc, int height) override; - void ShowAll() override; + void ShowAll() noexcept override; - void Check() const; + void Check() const noexcept; }; template @@ -157,7 +157,7 @@ void ContractionState::Clear() noexcept { } template -Sci::Line ContractionState::LinesInDoc() const { +Sci::Line ContractionState::LinesInDoc() const noexcept { if (OneToOne()) { return linesInDocument; } else { @@ -166,7 +166,7 @@ Sci::Line ContractionState::LinesInDoc() const { } template -Sci::Line ContractionState::LinesDisplayed() const { +Sci::Line ContractionState::LinesDisplayed() const noexcept { if (OneToOne()) { return linesInDocument; } else { @@ -175,7 +175,7 @@ Sci::Line ContractionState::LinesDisplayed() const { } template -Sci::Line ContractionState::DisplayFromDoc(Sci::Line lineDoc) const { +Sci::Line ContractionState::DisplayFromDoc(Sci::Line lineDoc) const noexcept { if (OneToOne()) { return (lineDoc <= linesInDocument) ? lineDoc : linesInDocument; } else { @@ -186,12 +186,12 @@ Sci::Line ContractionState::DisplayFromDoc(Sci::Line lineDoc) const { } template -Sci::Line ContractionState::DisplayLastFromDoc(Sci::Line lineDoc) const { +Sci::Line ContractionState::DisplayLastFromDoc(Sci::Line lineDoc) const noexcept { return DisplayFromDoc(lineDoc) + GetHeight(lineDoc) - 1; } template -Sci::Line ContractionState::DocFromDisplay(Sci::Line lineDisplay) const { +Sci::Line ContractionState::DocFromDisplay(Sci::Line lineDisplay) const noexcept { if (OneToOne()) { return lineDisplay; } else { @@ -232,7 +232,7 @@ void ContractionState::DeleteLines(Sci::Line lineDoc, Sci::Line lineCount) } template -bool ContractionState::GetVisible(Sci::Line lineDoc) const { +bool ContractionState::GetVisible(Sci::Line lineDoc) const noexcept { if (OneToOne()) { return true; } else { @@ -269,7 +269,7 @@ bool ContractionState::SetVisible(Sci::Line lineDocStart, Sci::Line lineDo } template -bool ContractionState::HiddenLines() const { +bool ContractionState::HiddenLines() const noexcept { if (OneToOne()) { return false; } else { @@ -278,7 +278,7 @@ bool ContractionState::HiddenLines() const { } template -const char *ContractionState::GetFoldDisplayText(Sci::Line lineDoc) const { +const char *ContractionState::GetFoldDisplayText(Sci::Line lineDoc) const noexcept { Check(); return foldDisplayTexts->ValueAt(lineDoc).get(); } @@ -299,7 +299,7 @@ bool ContractionState::SetFoldDisplayText(Sci::Line lineDoc, const char *t } template -bool ContractionState::GetExpanded(Sci::Line lineDoc) const { +bool ContractionState::GetExpanded(Sci::Line lineDoc) const noexcept { if (OneToOne()) { return true; } else { @@ -326,7 +326,7 @@ bool ContractionState::SetExpanded(Sci::Line lineDoc, bool isExpanded) { } template -Sci::Line ContractionState::ContractedNext(Sci::Line lineDocStart) const { +Sci::Line ContractionState::ContractedNext(Sci::Line lineDocStart) const noexcept { if (OneToOne()) { return -1; } else { @@ -344,7 +344,7 @@ Sci::Line ContractionState::ContractedNext(Sci::Line lineDocStart) const { } template -int ContractionState::GetHeight(Sci::Line lineDoc) const { +int ContractionState::GetHeight(Sci::Line lineDoc) const noexcept { if (OneToOne()) { return 1; } else { @@ -377,7 +377,7 @@ bool ContractionState::SetHeight(Sci::Line lineDoc, int height) { } template -void ContractionState::ShowAll() { +void ContractionState::ShowAll() noexcept { const LINE lines = static_cast(LinesInDoc()); Clear(); linesInDocument = lines; @@ -386,7 +386,7 @@ void ContractionState::ShowAll() { // Debugging checks template -void ContractionState::Check() const { +void ContractionState::Check() const noexcept { #ifdef CHECK_CORRECTNESS for (Sci::Line vline = 0; vline < LinesDisplayed(); vline++) { const Sci::Line lineDoc = DocFromDisplay(vline); -- cgit v1.2.3