prepare for 1.1.6pre2

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

diff --git a/src/insets/figinset.h b/src/insets/figinset.h
index 8df0d8f94f6e9ec31d33890e56a72ef466f63334..421a0da786b8f5858806fb6aff6762199008d14b 100644 (file)
--- a/src/insets/figinset.h
+++ b/src/insets/figinset.h
@@ -20,18 +20,17 @@ struct Figref;
 class InsetFig: public Inset {
 public:
        ///
-       InsetFig(int tmpx, int tmpy, Buffer *);
+       InsetFig(int tmpx, int tmpy, Buffer const &);
        ///
        ~InsetFig();
        ///
-       int ascent(Painter &, LyXFont const & font) const;
+       int ascent(BufferView *, LyXFont const & font) const;
        ///
-       int descent(Painter &, LyXFont const & font) const;
+       int descent(BufferView *, LyXFont const & font) const;
        ///
-       int width(Painter &, LyXFont const & font) const;
+       int width(BufferView *, LyXFont const & font) const;
        ///
-       void draw(Painter &, LyXFont const & font,
-                 int baseline, float & x) const;
+       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
        ///
        void Write(Buffer const *, std::ostream &) const;
        ///
@@ -39,7 +38,7 @@ public:
        ///
        int Latex(Buffer const *, std::ostream &, bool fragile, bool free_space) const;
        ///
-       int Ascii(Buffer const *, std::ostream &) const;
+       int Ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
        int Linuxdoc(Buffer const *, std::ostream &) const;
        ///
@@ -48,7 +47,7 @@ public:
        void Validate(LaTeXFeatures & features) const;
 
        /// what appears in the minibuffer when opening
-       char const * EditMessage() const;
+       string const EditMessage() const;
        
        ///
        void Edit(BufferView *, int, int, unsigned int);
@@ -59,11 +58,11 @@ public:
        ///
        Inset::Code LyxCode() const;
        ///
-       Inset * Clone() const;
+       Inset * Clone(Buffer const &) const;
        ///
        void CallbackFig(long arg);
        ///
-       void Preview(char const * p);
+       void Preview(string const & p);
        /// browse for file
        void BrowseFile();
 
@@ -135,7 +134,7 @@ public:
 private:
 
        ///
-       Buffer * owner;
+       Buffer const * owner;
        /// restore values on the form
        void RestoreForm();
        /// recompute screen params