fix compilation pb ; update eu.po

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 3a80b51f5eb4795cd58a046f293f093aefd53d04..9d7cbe436233f3b4bcaccaf6883c735df9861493 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -19,8 +19,6 @@
 #include "LString.h"
 #include "lyxlex.h"
 
-using std::ostream;
-
 /** Insertion of accents
   
   Proper handling of accented characters.
@@ -32,40 +30,44 @@ using std::ostream;
 class InsetLatexAccent : public Inset {
 public:
        ///
-       InsetLatexAccent(); 
+       InsetLatexAccent();
        ///
+       explicit
        InsetLatexAccent(string const & string);
        ///
-       int ascent(Painter &, LyXFont const &) const;
+       int ascent(BufferView *, LyXFont const &) const;
        ///
-       int descent(Painter &, LyXFont const &) const;
+       int descent(BufferView *, LyXFont const &) const;
        ///
-       int width(Painter &, LyXFont const &) const;
+       int width(BufferView *, LyXFont const &) const;
        ///
-       void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
        ///
        int Lbearing(LyXFont const & font) const;
        ///
        int Rbearing(LyXFont const & font) const;
        ///
-       bool DisplayISO8859_9(Painter &, LyXFont const & font,
+       bool DisplayISO8859_9(BufferView *, LyXFont const & font,
                              int baseline, float & x) const;
        ///
-       void Write(ostream &) const;
+       void Write(Buffer const *, std::ostream &) const;
+       ///
+       void Read(Buffer const *, LyXLex & lex);
        ///
-       void Read(LyXLex & lex);
+       int Latex(Buffer const *, std::ostream &,
+                 bool fragile, bool free_spc) const;
        ///
-       int Latex(ostream &, signed char fragile, bool free_spc) const;
+       int Ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(ostream &) const;
+       int Linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int DocBook(ostream &) const;
+       int DocBook(Buffer const *, std::ostream &) const;
        ///
        bool Deletable() const;
        ///
        bool DirectWrite() const;
        ///
-       Inset * Clone() const;
+       Inset * Clone(Buffer const &) const;
        ///
        Inset::Code LyxCode()const;
        ///
@@ -116,7 +118,7 @@ public:
                LSLASH
        };
 private:
-       friend ostream & operator<<(ostream &, ACCENT_TYPES);
+       friend std::ostream & operator<<(std::ostream &, ACCENT_TYPES);
        /// Check if we know the modifier and can display it ok on screen.
        void checkContents();
        ///
@@ -136,6 +138,7 @@ private:
        mutable char  ic;    
 };
 
+
 bool InsetLatexAccent::CanDisplay()
 {
        return candisp;