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

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

diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h
index 327dc9efbee8af9e56ba025d7d13628b3baae0c0..f8d5a20152e21b81e5020f8ea3e49be500417752 100644 (file)
--- a/src/insets/insetspecialchar.h
+++ b/src/insets/insetspecialchar.h
@@ -34,10 +34,6 @@ public:
                END_OF_SENTENCE,
                /// Menu separator
                MENU_SEPARATOR,
-#if 0
-               /// Newline
-               NEWLINE,
-#endif
                /// Protected Separator
                PROTECTED_SEPARATOR
        };
@@ -45,6 +41,7 @@ public:
        ///
        InsetSpecialChar() {}
        ///
+       explicit
        InsetSpecialChar(Kind k);
        ///
        int ascent(Painter &, LyXFont const &) const;
@@ -55,24 +52,17 @@ public:
        ///
        void draw(Painter &, LyXFont const &, int baseline, float & x) const;
        ///
-       void Write(ostream &) const;
+       void Write(std::ostream &) const;
        /// Will not be used when lyxf3
        void Read(LyXLex & lex);
        /// 
-       int Latex(ostream &, signed char fragile, bool free_spc) const;
-#ifndef USE_OSTREAM_ONLY
-       ///
-       int Latex(string & file, signed char fragile, bool free_spc) const;
+       int Latex(std::ostream &, bool fragile, bool free_spc) const;
        ///
-       int Linuxdoc(string & file) const;
+       int Ascii(std::ostream &) const;
        ///
-       int DocBook(string & file) const;
-#else
+       int Linuxdoc(std::ostream &) const;
        ///
-       int Linuxdoc(ostream &) const;
-       ///
-       int DocBook(ostream &) const;
-#endif
+       int DocBook(std::ostream &) const;
        ///
        Inset * Clone() const;
        ///