diff options
author | Neil <nyamatongwe@gmail.com> | 2020-04-07 11:21:05 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2020-04-07 11:21:05 +1000 |
commit | 4a1cfeae9b35bbb3639c3f48d3bf5ec17a6aa77f (patch) | |
tree | 0e94f948ab4423e07dc2b4adc6d80c5f7c70f45b | |
parent | 4b41695ad34ff3cbdba58ad5fe2bb589035d658f (diff) | |
download | scintilla-mirror-4a1cfeae9b35bbb3639c3f48d3bf5ec17a6aa77f.tar.gz |
Use noexcept and const where possible.
-rw-r--r-- | src/Style.cxx | 10 | ||||
-rw-r--r-- | src/Style.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/Style.cxx b/src/Style.cxx index c07022dff..00497db67 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -81,7 +81,7 @@ Style::Style() : FontSpecification() { SC_WEIGHT_NORMAL, false, false, false, caseMixed, true, true, false); } -Style::Style(const Style &source) : FontSpecification(), FontMeasurements() { +Style::Style(const Style &source) noexcept : FontSpecification(), FontMeasurements() { Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff), 0, nullptr, 0, SC_WEIGHT_NORMAL, false, false, false, caseMixed, true, true, false); @@ -103,7 +103,7 @@ Style::Style(const Style &source) : FontSpecification(), FontMeasurements() { Style::~Style() { } -Style &Style::operator=(const Style &source) { +Style &Style::operator=(const Style &source) noexcept { if (this == &source) return * this; Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff), @@ -128,7 +128,7 @@ void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_, const char *fontName_, int characterSet_, int weight_, bool italic_, bool eolFilled_, bool underline_, ecaseForced caseForce_, - bool visible_, bool changeable_, bool hotspot_) { + bool visible_, bool changeable_, bool hotspot_) noexcept { fore = fore_; back = back_; characterSet = characterSet_; @@ -146,7 +146,7 @@ void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_, FontMeasurements::ClearMeasurements(); } -void Style::ClearTo(const Style &source) { +void Style::ClearTo(const Style &source) noexcept { Clear( source.fore, source.back, @@ -163,7 +163,7 @@ void Style::ClearTo(const Style &source) { source.hotspot); } -void Style::Copy(Font &font_, const FontMeasurements &fm_) { +void Style::Copy(const Font &font_, const FontMeasurements &fm_) noexcept { font.MakeAlias(font_); (FontMeasurements &)(*this) = fm_; } diff --git a/src/Style.h b/src/Style.h index 103633373..432dcf946 100644 --- a/src/Style.h +++ b/src/Style.h @@ -71,19 +71,19 @@ public: FontAlias font; Style(); - Style(const Style &source); + Style(const Style &source) noexcept; Style(Style &&) = delete; ~Style(); - Style &operator=(const Style &source); + Style &operator=(const Style &source) noexcept; Style &operator=(Style &&) = delete; void Clear(ColourDesired fore_, ColourDesired back_, int size_, const char *fontName_, int characterSet_, int weight_, bool italic_, bool eolFilled_, bool underline_, ecaseForced caseForce_, - bool visible_, bool changeable_, bool hotspot_); - void ClearTo(const Style &source); - void Copy(Font &font_, const FontMeasurements &fm_); + bool visible_, bool changeable_, bool hotspot_) noexcept; + void ClearTo(const Style &source) noexcept; + void Copy(const Font &font_, const FontMeasurements &fm_) noexcept; bool IsProtected() const noexcept { return !(changeable && visible);} }; |