Backport: Fix use of "0" for nulls and mark methods "noexcept" where simple.

Backport of changeset 7234:f4ff793e7ddd.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/Style.cxx b/src/Style.cxx
index 2cb82616b..b5f8ca091 100644
--- a/src/Style.cxx
+++ b/src/Style.cxx
@@ -16,27 +16,27 @@
 
 using namespace Scintilla;
 
-FontAlias::FontAlias() {
+FontAlias::FontAlias() noexcept {
 }
 
-FontAlias::FontAlias(const FontAlias &other) : Font() {
+FontAlias::FontAlias(const FontAlias &other) noexcept : Font() {
 	SetID(other.fid);
 }
 
 FontAlias::~FontAlias() {
-	SetID(0);
+	SetID(FontID{});
 	// ~Font will not release the actual font resource since it is now 0
 }
 
-void FontAlias::MakeAlias(const Font &fontOrigin) {
+void FontAlias::MakeAlias(const Font &fontOrigin) noexcept {
 	SetID(fontOrigin.GetID());
 }
 
-void FontAlias::ClearFont() {
-	SetID(0);
+void FontAlias::ClearFont() noexcept {
+	SetID(FontID{});
 }
 
-bool FontSpecification::operator==(const FontSpecification &other) const {
+bool FontSpecification::operator==(const FontSpecification &other) const noexcept {
 	return fontName == other.fontName &&
 	       weight == other.weight &&
 	       italic == other.italic &&
@@ -45,7 +45,7 @@ bool FontSpecification::operator==(const FontSpecification &other) const {
 	       extraFontFlag == other.extraFontFlag;
 }
 
-bool FontSpecification::operator<(const FontSpecification &other) const {
+bool FontSpecification::operator<(const FontSpecification &other) const noexcept {
 	if (fontName != other.fontName)
 		return fontName < other.fontName;
 	if (weight != other.weight)
@@ -61,11 +61,11 @@ bool FontSpecification::operator<(const FontSpecification &other) const {
 	return false;
 }
 
-FontMeasurements::FontMeasurements() {
+FontMeasurements::FontMeasurements() noexcept {
 	ClearMeasurements();
 }
 
-void FontMeasurements::ClearMeasurements() {
+void FontMeasurements::ClearMeasurements() noexcept {
 	ascent = 1;
 	descent = 1;
 	capitalHeight = 1;