Replace LString.h with support/std_string.h,

[features.git] / src / insets / insettext.h

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index d998a0f09f9fc86144ddf1dea8d2c7f95281c7d9..1add1fcd5574096f2395c835af007247fab9a886 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -6,15 +6,14 @@
  *
  * \author Jürgen Vigna
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETTEXT_H
 #define INSETTEXT_H
 
 #include "updatableinset.h"
-#include "textcursor.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "LColor.h"
 #include "ParagraphList.h"
 #include "RowList.h"
@@ -63,9 +62,9 @@ public:
        /// empty inset to empty par, or just mark as erased
        void clear(bool just_mark_erased);
        ///
-       void read(Buffer const *, LyXLex &);
+       void read(Buffer const &, LyXLex &);
        ///
-       void write(Buffer const *, std::ostream &) const;
+       void write(Buffer const &, std::ostream &) const;
        ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
@@ -84,18 +83,16 @@ public:
        bool unlockInsetInInset(BufferView *,
                                UpdatableInset *, bool lr = false);
        ///
-       bool updateInsetInInset(BufferView *, InsetOld *);
-       ///
        RESULT localDispatch(FuncRequest const &);
        ///
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const &, std::ostream &, int linelen) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const ;
+       int linuxdoc(Buffer const &, std::ostream &) const ;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const ;
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const ;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
@@ -123,9 +120,7 @@ public:
        ///
        void init(InsetText const * ins);
        ///
-       void writeParagraphData(Buffer const *, std::ostream &) const;
-       ///
-       void setParagraphData(ParagraphList const &);
+       void writeParagraphData(Buffer const &, std::ostream &) const;
        ///
        void setText(string const &, LyXFont const &);
        ///
@@ -133,9 +128,9 @@ public:
        ///
        bool getAutoBreakRows() const { return autoBreakRows; }
        ///
-       void setDrawFrame(BufferView *, DrawFrame);
+       void setDrawFrame(DrawFrame);
        ///
-       void setFrameColor(BufferView *, LColor::color);
+       void setFrameColor(LColor::color);
        ///
        LyXText * getLyXText(BufferView const *,
                             bool const recursive = false) const;
@@ -144,8 +139,6 @@ public:
        ///
        void deleteLyXText(BufferView *, bool recursive = true) const;
        ///
-       void resizeLyXText(BufferView *, bool force = false) const;
-       ///
        bool showInsetDialog(BufferView *) const;
        ///
        void getLabelList(std::vector<string> &) const;
@@ -209,7 +202,7 @@ public:
                return true;
        }
        ///
-       ParagraphList paragraphs;
+       mutable ParagraphList paragraphs;
 protected:
        ///
        void updateLocal(BufferView *, bool mark_dirty);
@@ -237,13 +230,9 @@ private:
        void lfunMouseMotion(FuncRequest const &);
 
        ///
-       RESULT moveRight(BufferView *,
-                                        bool activate_inset = true,
-                                        bool selecting = false);
+       RESULT moveRight(BufferView *);
        ///
-       RESULT moveLeft(BufferView *,
-                                       bool activate_inset = true,
-                                       bool selecting = false);
+       RESULT moveLeft(BufferView *);
        ///
        RESULT moveRightIntern(BufferView *, bool front,
                                               bool activate_inset = true,
@@ -258,7 +247,7 @@ private:
        ///
        RESULT moveDown(BufferView *);
        ///
-       void setCharFont(Buffer const *, int pos, LyXFont const & font);
+       void setCharFont(Buffer const &, int pos, LyXFont const & font);
        ///
        bool checkAndActivateInset(BufferView * bv, bool front);
        ///
@@ -269,12 +258,8 @@ private:
        ///
        int cx() const;
        ///
-       int cix() const;
-       ///
        int cy() const;
        ///
-       int ciy() const;
-       ///
        lyx::pos_type cpos() const;
        ///
        ParagraphList::iterator cpar() const;
@@ -287,10 +272,6 @@ private:
        ///
        void clearInset(BufferView *, int start_x, int baseline) const;
        ///
-       void saveLyXTextState() const;
-       ///
-       void restoreLyXTextState() const;
-       ///
        void collapseParagraphs(BufferView *);
 
        /* Private structures and variables */
@@ -314,19 +295,10 @@ private:
        UpdatableInset * the_locking_inset;
        ///
        mutable ParagraphList::iterator old_par;
-       ///
-       mutable int last_drawn_width;
-
-       /// some funny 'temporarily saved state'
-       mutable TextCursor sstate;
 
        ///
        // to remember old painted frame dimensions to clear it on the right spot!
        ///
-       mutable int frame_x;
-       mutable int frame_y;
-       mutable int frame_w;
-       mutable int frame_h;
        mutable bool in_insetAllowed;
        ///
        // these are used to check for mouse movement in Motion selection code
@@ -334,8 +306,6 @@ private:
        int mouse_x;
        int mouse_y;
 public:
-       ///
-       void reinitLyXText() const;
        ///
        mutable LyXText text_;
        ///