Whitespace & renaming

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 4e704e3249fac83c947672941961eaef892926a4..bb4175987063f5950e1943684315f46faeeb2148 100644 (file)
--- 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 bf165d91c58470d66d25abb9b403807099ada1f8..c6fbfdb2c0affb44db7357f1d69c143c0e1b4484 100644 (file)
--- 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 bccaaccf78019db078c0a79aef79805a476fbeee..d571806ba66f9a8ae272b2f378fb27f10018f756 100644 (file)
--- 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;