ws changes only

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 482492943b1fe29147dcc7ef2ca8ce77e6cae539..cb7246f6dbcdd34cdd7eaa2fe7caf22c7c0e7230 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,24 +15,25 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
-#include "LString.h"
+#include <boost/utility.hpp>
 
-#include "insets/inset.h"
+#include <string>
 
-#include <boost/utility.hpp>
 
+class Buffer;
 class Change;
-class LyXView;
+class Encoding;
+class ErrorList;
+class FuncRequest;
+class InsetOld;
+class Language;
 class LyXText;
-class TeXErrors;
-class Buffer;
 class LyXScreen;
-class Language;
+class LyXView;
 class Painter;
+class TeXErrors;
 class UpdatableInset;
 class WordLangTuple;
-class Encoding;
-class ErrorList;
 
 /**
  * A buffer view encapsulates a view onto a particular
@@ -64,23 +65,32 @@ public:
        /// return the owning main view
        LyXView * owner() const;
 
+       /// return the visible top y
+       int top_y() const;
+
+       /// set the visible top y
+       void top_y(int);
+
        /// resize event has happened
        void resize();
 
        /// reload the contained buffer
        void reload();
        /// create a new buffer based on template
-       bool newFile(string const & fname, string const & tname,
+       bool newFile(std::string const & fname, std::string const & tname,
                     bool named = true);
        /// load a buffer into the view
-       bool loadLyXFile(string const & name, bool tolastfiles = true);
+       bool loadLyXFile(std::string const & name, bool tolastfiles = true);
 
        /// fit the user cursor within the visible view
        bool fitCursor();
        /// perform pending painting updates
        void update();
-       /// update for a particular inset
-       void updateInset();
+       /** update for a particular inset. Gets a pointer and not a
+        *  reference because we really need the pointer information
+        *  to find it in the buffer.
+        */
+       void updateInset(InsetOld const *);
        /// reset the scrollbar to reflect current view position
        void updateScrollbar();
        /// FIXME
@@ -128,14 +138,14 @@ public:
        /// Select the "current" word
        void selectLastWord();
        /// replace the currently selected word
-       void replaceWord(string const & replacestring);
+       void replaceWord(std::string const & replacestring);
        /// Update after spellcheck finishes
        void endOfSpellCheck();
        /// return the next word
        WordLangTuple const nextWord(float & value);
 
        /// move cursor to the named label
-       void gotoLabel(string const & label);
+       void gotoLabel(std::string const & label);
 
        /// undo last action
        void undo();
@@ -145,7 +155,7 @@ public:
        /// get the stored error list
        ErrorList const & getErrorList() const;
        /// show the error list to the user
-       void showErrorList(string const &) const;
+       void showErrorList(std::string const &) const;
        /// set the cursor based on the given TeX source row
        void setCursorFromRow(int row);
 
@@ -153,10 +163,10 @@ public:
         * Insert an inset into the buffer.
         * Place it in a layout of lout,
         */
-       bool insertInset(InsetOld * inset, string const & lout = string());
+       bool insertInset(InsetOld * inset, std::string const & lout = std::string());
 
        /// Inserts a lyx file at cursor position. return false if it fails
-       bool insertLyXFile(string const & file);
+       bool insertLyXFile(std::string const & file);
 
        /// FIXME
        bool fitLockedInsetCursor(int x, int y, int asc, int desc);
@@ -180,12 +190,12 @@ public:
        void switchKeyMap();
 
        /// FIXME
-       bool ChangeRefsIfUnique(string const & from, string const & to);
+       bool ChangeRefsIfUnique(std::string const & from, std::string const & to);
 
        /// get the contents of the window system clipboard
-       string const getClipboard() const;
+       std::string const getClipboard() const;
        /// fill the window system clipboard
-       void stuffClipboard(string const &) const;
+       void stuffClipboard(std::string const &) const;
        /// tell the window system we have a selection
        void haveSelection(bool sel);
 
@@ -196,18 +206,6 @@ private:
        /// Set the current locking inset
        void theLockingInset(UpdatableInset * inset);
 
-       /// return the lyxtext containing this inset
-       LyXText * getParentText(InsetOld * inset) const;
-
-       /**
-        * Change all insets with the given code's contents to a new
-        * string. May only be used with InsetCommand-derived insets
-        * Returns true if a screen update is needed.
-        */
-       bool ChangeInsets(InsetOld::Code code, string const & from,
-                         string const & to);
-
-
        struct Pimpl;
        friend struct BufferView::Pimpl;