Avoid redundant initialization.

zufuliu · Jan 15, 2022 · 2f849a7 · 2f849a7
1 parent 3750f79
commit 2f849a7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx
@@ -3016,8 +3016,6 @@ class UTF8Iterator {
 
 	explicit UTF8Iterator(const Document *doc_ = nullptr, Sci::Position position_ = 0) noexcept :
 		doc(doc_), position(position_), characterIndex(0), lenBytes(0), lenCharacters(0), buffered{} {
-		buffered[0] = 0;
-		buffered[1] = 0;
 		if (doc) {
 			ReadCharacter();
 		}

diff --git a/scintilla/src/EditModel.cxx b/scintilla/src/EditModel.cxx
@@ -60,7 +60,7 @@ using namespace Scintilla::Internal;
 Caret::Caret() noexcept :
 	active(false), on(false), period(500) {}
 
-EditModel::EditModel() : braces{} {
+EditModel::EditModel() {
 	inOverstrike = false;
 	trackLineWidth = false;
 	xOffset = 0;

diff --git a/scintilla/src/Partitioning.h b/scintilla/src/Partitioning.h
@@ -88,7 +88,7 @@ class Partitioning {
 	}
 
 public:
-	explicit Partitioning(int growSize) : stepPartition(0), stepLength(0) {
+	explicit Partitioning(int growSize) {
 		Allocate(growSize);
 	}
 

diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx
@@ -364,7 +364,7 @@ XYPOSITION ScreenLine::TabPositionAfter(XYPOSITION xPosition) const noexcept {
 	return (std::floor((xPosition + TabWidthMinimumPixels()) / TabWidth()) + 1) * TabWidth();
 }
 
-LineLayoutCache::LineLayoutCache() :
+LineLayoutCache::LineLayoutCache() noexcept:
 	lastCaretSlot(SIZE_MAX),
 	level(LineCache::None),
 	allInvalidated(false), styleClock(-1) {
@@ -876,7 +876,7 @@ TextSegment BreakFinder::Next() {
 
 		const int lengthSegment = nextBreak - prev;
 		if (lengthSegment < lengthStartSubdivision) {
-			return TextSegment(prev, lengthSegment, repr);
+			return {prev, lengthSegment, repr};
 		}
 		subBreak = prev;
 	}
@@ -893,7 +893,7 @@ TextSegment BreakFinder::Next() {
 	} else {
 		subBreak = -1;
 	}
-	return TextSegment(startSegment, lengthSegment);
+	return {startSegment, lengthSegment, nullptr};
 }
 
 bool BreakFinder::More() const noexcept {

diff --git a/scintilla/src/PositionCache.h b/scintilla/src/PositionCache.h
@@ -157,7 +157,7 @@ class LineLayoutCache final {
 	int styleClock;
 	void AllocateForLevel(Sci::Line linesOnScreen, Sci::Line linesInDoc);
 public:
-	LineLayoutCache();
+	LineLayoutCache() noexcept;
 	// Deleted so LineLayoutCache objects can not be copied.
 	LineLayoutCache(const LineLayoutCache &) = delete;
 	LineLayoutCache(LineLayoutCache &&) = delete;
@@ -243,8 +243,6 @@ struct TextSegment {
 	const int start;
 	const int length;
 	const Representation * const representation;
-	TextSegment(int start_ = 0, int length_ = 0, const Representation *representation_ = nullptr) noexcept :
-		start(start_), length(length_), representation(representation_) {}
 	int end() const noexcept {
 		return start + length;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,7 @@ class Partitioning { @@
     	}
     public:
-    	explicit Partitioning(int growSize) : stepPartition(0), stepLength(0) {
+    	explicit Partitioning(int growSize) {
     		Allocate(growSize);
     	}
@@ Expand Down @@