prepare for 1.1.6pre2

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index eb92980d4cedcdf6feb958974aec95e7736bcd86..cfa525aea591a4ad1f26d9108da1a97ee8e1527e 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -75,7 +75,7 @@ public:
     ///
     ~InsetText();
     ///
-    Inset * Clone() const;
+    Inset * Clone(Buffer const &) const;
     ///
     InsetText & operator=(InsetText const & it);
     ///
@@ -126,11 +126,11 @@ public:
     int Latex(Buffer const *, std::ostream &,
              bool fragile, bool free_spc) const;
     ///
-    int Ascii(Buffer const *, std::ostream &) const { return 0; }
+    int Ascii(Buffer const *, std::ostream &, int linelen) const;
     ///
     int Linuxdoc(Buffer const *, std::ostream &) const { return 0; }
     ///
-    int DocBook(Buffer const *, std::ostream &) const { return 0; }
+    int DocBook(Buffer const *, std::ostream &) const ;
     ///
     void Validate(LaTeXFeatures & features) const;
     ///
@@ -138,7 +138,7 @@ public:
     ///
     void GetCursorPos(BufferView *, int & x, int & y) const;
     ///
-    int InsetInInsetY();
+    unsigned int InsetInInsetY();
     ///
     void ToggleInsetCursor(BufferView *);
     ///
@@ -196,13 +196,15 @@ private:
     ///
     int BeginningOfMainBody(Buffer const *, LyXParagraph * par) const;
     ///
-    void ShowInsetCursor(BufferView *);
+    void ShowInsetCursor(BufferView *, bool show=true);
     ///
     void HideInsetCursor(BufferView *);
     ///
-    UpdatableInset::RESULT moveRight(BufferView *, bool activate_inset = true);
+    UpdatableInset::RESULT moveRight(BufferView *, bool activate_inset = true,
+                                    bool selecting = false);
     ///
-    UpdatableInset::RESULT moveLeft(BufferView *, bool activate_inset = true);
+    UpdatableInset::RESULT moveLeft(BufferView *, bool activate_inset = true,
+                                   bool selecting = false);
     ///
     UpdatableInset::RESULT moveUp(BufferView *);
     ///
@@ -223,7 +225,7 @@ private:
     ///
     int cy(BufferView *) const;
     ///
-    int cpos(BufferView *) const;
+    LyXParagraph::size_type cpos(BufferView *) const;
     ///
     LyXParagraph * cpar(BufferView *) const;
     ///
@@ -252,7 +254,7 @@ private:
     ///
     LyXParagraph * inset_par;
     ///
-    int inset_pos;
+    LyXParagraph::size_type inset_pos;
     ///
     mutable int inset_x;
     ///