From: Yuriy Skalko Date: Thu, 5 Nov 2020 10:01:21 +0000 (+0200) Subject: Whitespace & renaming X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=589e780e153e8cddd577b31316248e1c457c29e3;p=features.git Whitespace & renaming --- diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 4e704e3249..bb41759870 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 bf165d91c5..c6fbfdb2c0 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 bccaaccf78..d571806ba6 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_) : 0; + Text * getText(int idx) const override { + return (idx == 0) ? const_cast(&text_) : nullptr; } /// bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const override;