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 eb71f13cec53b90acb4bfb24e37d0fb0050f8a35..449d0f19ed2e01e35decdb75918c5829dbd68df3 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -4,8 +4,8 @@
  *
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1996-1999 The LyX Team.
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -30,30 +30,32 @@ public:
        ///
        InsetCommand();
        ///
+       explicit
        InsetCommand(string const & name, string const & arg = string(), 
                     string const & opt = string());
        ///
-       int Ascent(LyXFont const & font) const;
+       int ascent(Painter &, LyXFont const &) const;
        ///
-       int Descent(LyXFont const & font) const;
+       int descent(Painter &, LyXFont const &) const;
        ///
-       int Width(LyXFont const & font) const;
+       int width(Painter &, LyXFont const &) const;
        ///
-       void Draw(LyXFont, LyXScreen & scr, int baseline, float & x);
+       void draw(Painter &, LyXFont const &, int baseline, float & x) const;
        ///
-       void Write(FILE * file);
+       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(FILE * file, signed char fragile);
+       virtual int Latex(std::ostream &,
+                         bool fragile, bool free_spc) const;
        ///
-       virtual int Latex(string & file, signed char fragile);
+       int Ascii(std::ostream &) const;
        ///
-       virtual int Linuxdoc(string & file);
+       virtual int Linuxdoc(std::ostream &) const;
        ///
-       virtual int DocBook(string & file);
+       virtual int DocBook(std::ostream &) const;
        ///
        Inset * Clone() const;
        ///