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 a6ce64de31422d52d81ffb861d958721d7057d0a..1add1fcd5574096f2395c835af007247fab9a886 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -6,14 +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 "LString.h"
+#include "support/std_string.h"
 #include "LColor.h"
 #include "ParagraphList.h"
 #include "RowList.h"
@@ -62,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;
        ///
@@ -85,14 +85,14 @@ public:
        ///
        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;
        ///
@@ -120,7 +120,7 @@ public:
        ///
        void init(InsetText const * ins);
        ///
-       void writeParagraphData(Buffer const *, std::ostream &) const;
+       void writeParagraphData(Buffer const &, std::ostream &) const;
        ///
        void setText(string const &, LyXFont const &);
        ///
@@ -202,7 +202,7 @@ public:
                return true;
        }
        ///
-       ParagraphList paragraphs;
+       mutable ParagraphList paragraphs;
 protected:
        ///
        void updateLocal(BufferView *, bool mark_dirty);
@@ -247,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);
        ///
@@ -258,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;