ws changes only

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 9edd348baa0711b3f94c3fe5e60fbcf95d621cf1..614e8f996e3754e1ddd53089804f5258c1c9e2c2 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -21,7 +21,6 @@
 
 #include "frontends/mouse_state.h"
 
-#include "support/std_string.h"
 
 class Buffer;
 class BufferParams;
@@ -50,13 +49,13 @@ public:
                ALWAYS
        };
        ///
-       InsetText(BufferParams const &);
+       explicit InsetText(BufferParams const &);
        ///
-       explicit InsetText(InsetText const &);
+       InsetText(InsetText const &);
        ///
        virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       InsetText & operator=(InsetText const & it);
+       void operator=(InsetText const & it);
        /// empty inset to empty par, or just mark as erased
        void clear(bool just_mark_erased);
        ///
@@ -70,7 +69,7 @@ public:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       string const editMessage() const;
+       std::string const editMessage() const;
        ///
        bool isTextInset() const { return true; }
        ///
@@ -81,7 +80,7 @@ public:
        bool unlockInsetInInset(BufferView *,
                                UpdatableInset *, bool lr = false);
        ///
-       RESULT localDispatch(FuncRequest const &);
+       dispatch_result localDispatch(FuncRequest const &);
        ///
        int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
@@ -116,11 +115,9 @@ public:
                     bool toggleall = false,
                     bool selectall = false);
        ///
-       void init(InsetText const * ins);
-       ///
        void writeParagraphData(Buffer const &, std::ostream &) const;
        ///
-       void setText(string const &, LyXFont const &);
+       void setText(std::string const &, LyXFont const &);
        ///
        void setAutoBreakRows(bool);
        ///
@@ -140,7 +137,7 @@ public:
        ///
        bool showInsetDialog(BufferView *) const;
        /// Appends \c list with all labels found within this inset.
-       void getLabelList(Buffer const &, std::vector<string> & list) const;
+       void getLabelList(Buffer const &, std::vector<std::string> & list) const;
        ///
        int scroll(bool recursive = true) const;
        ///
@@ -181,10 +178,10 @@ public:
        bool nextChange(BufferView *, lyx::pos_type & length);
 
        ///
-       bool searchForward(BufferView *, string const &,
+       bool searchForward(BufferView *, std::string const &,
                           bool = true, bool = false);
        ///
-       bool searchBackward(BufferView *, string const &,
+       bool searchBackward(BufferView *, std::string const &,
                            bool = true, bool = false);
        ///
        bool checkInsertChar(LyXFont &);
@@ -211,6 +208,8 @@ protected:
        void lockInset(BufferView *, UpdatableInset *);
 
 private:
+       ///
+       void init();
        ///
        void lfunMousePress(FuncRequest const &);
        ///
@@ -219,22 +218,22 @@ private:
        void lfunMouseMotion(FuncRequest const &);
 
        ///
-       RESULT moveRight(BufferView *);
+       dispatch_result moveRight(BufferView *);
        ///
-       RESULT moveLeft(BufferView *);
+       dispatch_result moveLeft(BufferView *);
        ///
-       RESULT moveRightIntern(BufferView *, bool front,
+       dispatch_result moveRightIntern(BufferView *, bool front,
                                               bool activate_inset = true,
                                               bool selecting = false);
        ///
-       RESULT moveLeftIntern(BufferView *, bool front,
+       dispatch_result moveLeftIntern(BufferView *, bool front,
                                              bool activate_inset = true,
                                              bool selecting = false);
 
        ///
-       RESULT moveUp(BufferView *);
+       dispatch_result moveUp(BufferView *);
        ///
-       RESULT moveDown(BufferView *);
+        dispatch_result moveDown(BufferView *);
        ///
        void setCharFont(Buffer const &, int pos, LyXFont const & font);
        ///
@@ -277,7 +276,7 @@ private:
        ///
        mutable int top_y;
        ///
-       ParagraphList::iterator inset_par;
+       lyx::paroffset_type inset_par;
        ///
        lyx::pos_type inset_pos;
        ///
@@ -291,7 +290,7 @@ private:
        ///
        UpdatableInset * the_locking_inset;
        ///
-       mutable ParagraphList::iterator old_par;
+       mutable lyx::paroffset_type old_par;
 
        ///
        // to remember old painted frame dimensions to clear it on the right spot!