clear()->erase() ; lots of using directives for cxx

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index b8085e016b017d1bfa49694ab57de6573e354c01..018eb86d181c03fab67a187bae5cf2d2a09f0882 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -32,8 +32,8 @@ public:
        ///
        InsetLatexAccent(); 
        ///
+       explicit
        InsetLatexAccent(string const & string);
-#ifdef USE_PAINTER
        ///
        int ascent(Painter &, LyXFont const &) const;
        ///
@@ -42,41 +42,25 @@ public:
        int width(Painter &, LyXFont const &) const;
        ///
        void draw(Painter &, LyXFont const &, int baseline, float & x) const;
-#else
-       ///
-       int Ascent(LyXFont const & font) const;
-       ///
-       int Descent(LyXFont const & font) const;
-       ///
-       int Width(LyXFont const & font) const;
-       ///
-       void Draw(LyXFont, LyXScreen & scr, int baseline, float & x);
-#endif
        ///
        int Lbearing(LyXFont const & font) const;
        ///
        int Rbearing(LyXFont const & font) const;
-#ifdef USE_PAINTER
        ///
        bool DisplayISO8859_9(Painter &, LyXFont const & font,
                              int baseline, float & x) const;
-#else
-       ///
-       bool DisplayISO8859_9(LyXFont font, LyXScreen & scr,
-                             int baseline, float & x);
-#endif
        ///
-       void Write(ostream &);
+       void Write(std::ostream &) const;
        ///
        void Read(LyXLex & lex);
        ///
-       int Latex(ostream &, signed char fragile);
+       int Latex(std::ostream &, bool fragile, bool free_spc) const;
        ///
-       int Latex(string & file, signed char fragile);
+       int Ascii(std::ostream &) const;
        ///
-       int Linuxdoc(string & file);
+       int Linuxdoc(std::ostream &) const;
        ///
-       int DocBook(string & file);
+       int DocBook(std::ostream &) const;
        ///
        bool Deletable() const;
        ///
@@ -133,7 +117,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();
        ///