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

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

diff --git a/src/insets/insetinfo.h b/src/insets/insetinfo.h
index 371375c375decff90ad380bc70b7e2725f280a08..2e4267a8880f91efc0c68dad0fe99b895c44ab25 100644 (file)
--- a/src/insets/insetinfo.h
+++ b/src/insets/insetinfo.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 the LyX Team.
+ *           Copyright 1995-2000 the LyX Team.
  *
  * ====================================================== */
 
@@ -33,35 +33,36 @@ public:
        ///
        InsetInfo();
        ///
+       explicit
        InsetInfo(string const & string);
        ///
        ~InsetInfo();
        ///
-       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 font, 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;
        ///
        void Read(LyXLex & lex);
        ///
-       int Latex(FILE * file, 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;
        /// what appears in the minibuffer when opening
-       char const * EditMessage() {return "Opened note";}
+       char const * EditMessage() const;
        ///
-       void Edit(int, int);
+       void Edit(BufferView *, int, int, unsigned int);
        ///
-       unsigned char Editable() const;
+       EDITABLE Editable() const;
        ///
        Inset::Code LyxCode() const;
        ///