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 40448ca9e59150a602581cb5894830ecdcf97ff3..018eb86d181c03fab67a187bae5cf2d2a09f0882 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -32,6 +32,7 @@ public:
        ///
        InsetLatexAccent(); 
        ///
+       explicit
        InsetLatexAccent(string const & string);
        ///
        int ascent(Painter &, LyXFont const &) const;
@@ -49,24 +50,17 @@ public:
        bool DisplayISO8859_9(Painter &, LyXFont const & font,
                              int baseline, float & x) const;
        ///
-       void Write(ostream &) const;
+       void Write(std::ostream &) const;
        ///
        void Read(LyXLex & lex);
        ///
-       int Latex(ostream &, signed char fragile, bool free_spc) const;
-#ifndef USE_OSTREAM_ONLY
+       int Latex(std::ostream &, bool fragile, bool free_spc) const;
        ///
-       int Latex(string & file, signed char fragile, bool free_spc) const;
+       int Ascii(std::ostream &) const;
        ///
-       int Linuxdoc(string & file) const;
+       int Linuxdoc(std::ostream &) const;
        ///
-       int DocBook(string & file) const;
-#else
-       ///
-       int Linuxdoc(ostream &) const;
-       ///
-       int DocBook(ostream &) const;
-#endif
+       int DocBook(std::ostream &) const;
        ///
        bool Deletable() const;
        ///
@@ -123,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();
        ///