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

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

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index afdbcb98c4766a1ab2a376c06e19d7a2e43b3e31..449d0f19ed2e01e35decdb75918c5829dbd68df3 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -30,6 +30,7 @@ public:
        ///
        InsetCommand();
        ///
+       explicit
        InsetCommand(string const & name, string const & arg = string(), 
                     string const & opt = string());
        ///
@@ -41,26 +42,20 @@ public:
        ///
        void draw(Painter &, LyXFont const &, int baseline, float & x) const;
        ///
-       void Write(ostream &) const;
+       void Write(std::ostream &) const;
        /// Parse the command.
        void scanCommand(string const & cmd);
        /// Will not be used when lyxf3
        void Read(LyXLex & lex);
        /// 
-       virtual int Latex(ostream &, signed char fragile) const;
-#ifndef USE_OSTREAM_ONLY
+       virtual int Latex(std::ostream &,
+                         bool fragile, bool free_spc) const;
        ///
-       virtual int Latex(string & file, signed char fragile) const;
+       int Ascii(std::ostream &) const;
        ///
-       virtual int Linuxdoc(string & file) const;
+       virtual int Linuxdoc(std::ostream &) const;
        ///
-       virtual int DocBook(string & file) const;
-#else
-       ///
-       virtual int Linuxdoc(ostream &) const;
-       ///
-       virtual int DocBook(ostream &) const;
-#endif
+       virtual int DocBook(std::ostream &) const;
        ///
        Inset * Clone() const;
        ///