[LyX/master] Whitespace & renaming

Yuriy Skalko yuriy.skalko at gmail.com
Fri Nov 6 19:05:10 UTC 2020


commit 589e780e153e8cddd577b31316248e1c457c29e3
Author: Yuriy Skalko <yuriy.skalko at gmail.com>
Date:   Thu Nov 5 12:01:21 2020 +0200

    Whitespace & renaming
---
 src/BufferView.cpp     |    6 +++---
 src/insets/Inset.h     |    4 ++--
 src/insets/InsetText.h |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 4e704e3..bb41759 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -504,9 +504,9 @@ void BufferView::processUpdateFlags(Update::flags flags)
 	// We handle this before FitCursor because the later will require
 	// correct metrics at cursor position.
 	if (!(flags & Update::ForceDraw)
-	    && (flags & Update::SinglePar)
-		&& !singleParUpdate())
-			updateMetrics(flags);
+			&& (flags & Update::SinglePar)
+			&& !singleParUpdate())
+		updateMetrics(flags);
 
 	// Then make sure that the screen contains the cursor if needed
 	if (flags & Update::FitCursor) {
diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index bf165d9..c6fbfdb 100644
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -529,8 +529,8 @@ public:
 	///
 	virtual bool allowSpellCheck() const { return false; }
 
-	/// if this insets owns text cells (e.g. InsetText) return cell num
-	virtual Text * getText(int /*num*/) const { return 0; }
+	/// if this insets owns text cells (e.g. InsetText) return cell idx
+	virtual Text * getText(int /*idx*/) const { return 0; }
 
 	/** Adds a LaTeX snippet to the Preview Loader for transformation
 	 *  into a bitmap image. Does not start the loading process.
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index bccaacc..d571806 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -114,8 +114,8 @@ public:
 	///
 	void setFrameColor(ColorCode);
 	///
-	Text * getText(int i) const override {
-		return (i == 0) ? const_cast<Text*>(&text_) : 0;
+	Text * getText(int idx) const override {
+		return (idx == 0) ? const_cast<Text*>(&text_) : nullptr;
 	}
 	///
 	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const override;


More information about the lyx-cvs mailing list