Make Cursor::disp_ private as it should be.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34144 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 3bbb23cfc21346249408c0744cde01c723030ba6..4afcda8158f0951f12ab1adf1572e52593a432d1 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2838,10 +2838,10 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
        
        // set update flags
        if (changed) {
        
        // set update flags
        if (changed) {

-               if (singlePar && !(cur.disp_.update() & Update::Force))
-                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+               if (singlePar && !(cur.result().update() & Update::Force))
+                       cur.updateFlags(cur.result().update() | Update::SinglePar);

                else
                else

-                       cur.updateFlags(cur.disp_.update() | Update::Force);
+                       cur.updateFlags(cur.result().update() | Update::Force);

        }
 }
 
        }
 }
 

diff --git a/src/Cursor.h b/src/Cursor.h
index ebb68b13f48bd069fdf43ba89eeae5347a99000f..134c95cd916596c90c6f005dc776b8d5d950610f 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -291,14 +291,14 @@ public:
        /// the anchor position
        DocIterator anchor_;
        
        /// the anchor position
        DocIterator anchor_;
        

-       ///
-       mutable DispatchResult disp_;

        ///
        DocIterator const & beforeDispatchCursor() const { return beforeDispatchCursor_; }
        ///
        void saveBeforeDispatchPosXY();
 
 private:
        ///
        DocIterator const & beforeDispatchCursor() const { return beforeDispatchCursor_; }
        ///
        void saveBeforeDispatchPosXY();
 
 private:

+       ///
+       mutable DispatchResult disp_;

        /**
         * The target x position of the cursor. This is used for when
         * we have text like :
        /**
         * The target x position of the cursor. This is used for when
         * we have text like :

diff --git a/src/Text.cpp b/src/Text.cpp
index 33932d4e9f763b609c1dc6bcef70d0ad3fbe1cf5..6cc354dfd7a93c34f4ad91f021b6cdab6ba597a4 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -2020,8 +2020,8 @@ bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/
        LASSERT(cur.bv().cursor() == cur, /**/);
        cur.insert(s);
        cur.bv().cursor() = cur;
        LASSERT(cur.bv().cursor() == cur, /**/);
        cur.insert(s);
        cur.bv().cursor() = cur;

-       if (!(cur.disp_.update() & Update::Force))
-               cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+       if (!(cur.result().update() & Update::Force))
+               cur.updateFlags(cur.result().update() | Update::SinglePar);

        return true;
 }
        
        return true;
 }
        

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index 0c51b6da4135a6e4400e4226964311f36f0f6422..d061aefcb49283841fea6756feca3903466f3f0c 100644 (file)
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -316,8 +316,8 @@ void GuiCompleter::updateVisibility(Cursor & cur, bool start, bool keep, bool cu
                inline_timer_.start(int(lyxrc.completion_inline_delay * 1000));
        else {
                // no inline completion, hence a metrics update is needed
                inline_timer_.start(int(lyxrc.completion_inline_delay * 1000));
        else {
                // no inline completion, hence a metrics update is needed

-               if (!(cur.disp_.update() & Update::Force))
-                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+               if (!(cur.result().update() & Update::Force))
+                       cur.updateFlags(cur.result().update() | Update::SinglePar);

        }
 
        // update prefix if any completion is possible
        }
 
        // update prefix if any completion is possible


@@ -338,8 +338,8 @@ void GuiCompleter::updateVisibility(bool start, bool keep)
        
        updateVisibility(cur, start, keep);
        
        
        updateVisibility(cur, start, keep);
        

-       if (cur.disp_.update())
-               gui_->bufferView().processUpdateFlags(cur.disp_.update());
+       if (cur.result().update())
+               gui_->bufferView().processUpdateFlags(cur.result().update());

 }
 
 
 }
 
 


@@ -603,8 +603,8 @@ void GuiCompleter::showPopup()
        showPopup(cur);
 
        // redraw if needed
        showPopup(cur);
 
        // redraw if needed

-       if (cur.disp_.update())
-               gui_->bufferView().processUpdateFlags(cur.disp_.update());
+       if (cur.result().update())
+               gui_->bufferView().processUpdateFlags(cur.result().update());

 }
 
 
 }
 
 


@@ -616,8 +616,8 @@ void GuiCompleter::showInline()
        showInline(cur);
 
        // redraw if needed
        showInline(cur);
 
        // redraw if needed

-       if (cur.disp_.update())
-               gui_->bufferView().processUpdateFlags(cur.disp_.update());
+       if (cur.result().update())
+               gui_->bufferView().processUpdateFlags(cur.result().update());

 }
 
 
 }
 
 


@@ -629,8 +629,8 @@ void GuiCompleter::hidePopup()
        hidePopup(cur);
        
        // redraw if needed
        hidePopup(cur);
        
        // redraw if needed

-       if (cur.disp_.update())
-               gui_->bufferView().processUpdateFlags(cur.disp_.update());
+       if (cur.result().update())
+               gui_->bufferView().processUpdateFlags(cur.result().update());

 }
 
 
 }
 
 


@@ -642,8 +642,8 @@ void GuiCompleter::hideInline()
        hideInline(cur);
        
        // redraw if needed
        hideInline(cur);
        
        // redraw if needed

-       if (cur.disp_.update())
-               gui_->bufferView().processUpdateFlags(cur.disp_.update());
+       if (cur.result().update())
+               gui_->bufferView().processUpdateFlags(cur.result().update());

 }
 
 
 }
 
 


@@ -721,8 +721,8 @@ void GuiCompleter::tab()
                popup_timer_.start(0);
 
        // redraw if needed
                popup_timer_.start(0);
 
        // redraw if needed

-       if (cur.disp_.update())
-               gui_->bufferView().processUpdateFlags(cur.disp_.update());
+       if (cur.result().update())
+               gui_->bufferView().processUpdateFlags(cur.result().update());

 }
 
 
 }
 
 


@@ -887,8 +887,8 @@ void GuiCompleter::popupActivated(const QString & completion)
        hidePopup(cur);
        hideInline(cur);
        
        hidePopup(cur);
        hideInline(cur);
        

-       if (cur.disp_.update())
-               gui_->bufferView().processUpdateFlags(cur.disp_.update());
+       if (cur.result().update())
+               gui_->bufferView().processUpdateFlags(cur.result().update());

 }
 
 
 }
 
 


@@ -903,8 +903,8 @@ void GuiCompleter::popupHighlighted(const QString & completion)
        if (inlineVisible())
                updateInline(cur, completion);
        
        if (inlineVisible())
                updateInline(cur, completion);
        

-       if (cur.disp_.update())
-               gui_->bufferView().processUpdateFlags(cur.disp_.update());
+       if (cur.result().update())
+               gui_->bufferView().processUpdateFlags(cur.result().update());

 }
 
 } // namespace frontend
 }
 
 } // namespace frontend

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 8cefaa6984f23026738c7a33b277b3afeb814e99..0b6a4d86cb39d43059503b34d467ab8b91e306b0 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -704,13 +704,13 @@ bool InsetMathScript::notifyCursorLeaves(Cursor const & old, Cursor & cur)
                        // must be a subscript...
                        old.recordUndoInset();
                        removeScript(false);
                        // must be a subscript...
                        old.recordUndoInset();
                        removeScript(false);

-                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+                       cur.updateFlags(cur.result().update() | Update::SinglePar);

                        return true;
                } else if (cell(1).empty()) {
                        // must be a superscript...
                        old.recordUndoInset();
                        removeScript(true);
                        return true;
                } else if (cell(1).empty()) {
                        // must be a superscript...
                        old.recordUndoInset();
                        removeScript(true);

-                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+                       cur.updateFlags(cur.result().update() | Update::SinglePar);

                        return true;
                }
        }
                        return true;
                }
        }


@@ -740,7 +740,7 @@ bool InsetMathScript::notifyCursorLeaves(Cursor const & old, Cursor & cur)
                insetCur.cell().insert(insetCur.pos(), ar);
 
                // redraw
                insetCur.cell().insert(insetCur.pos(), ar);
 
                // redraw

-               cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+               cur.updateFlags(cur.result().update() | Update::SinglePar);

                return true;
        }
 
                return true;
        }
 

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 3eedbee531f17d9f6cf115c61fcc0ec8060bbc84..d458f76ebb3cfe48e4fa6ebd314b56974f0938bd 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -641,7 +641,7 @@ bool MathMacro::notifyCursorLeaves(Cursor const & old, Cursor & cur)
                        inset_cursor.cell().erase(inset_cursor.pos());
                        inset_cursor.cell().insert(inset_cursor.pos(),
                                createInsetMath(unfolded_name, cur.buffer()));
                        inset_cursor.cell().erase(inset_cursor.pos());
                        inset_cursor.cell().insert(inset_cursor.pos(),
                                createInsetMath(unfolded_name, cur.buffer()));

-                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+                       cur.updateFlags(cur.result().update() | Update::SinglePar);

                        return true;
                }
        }
                        return true;
                }
        }