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 a738b15956b3c12848ba6eaf4388ec6c267abd0c..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,6 +33,7 @@ public:
        ///
        InsetInfo();
        ///
+       explicit
        InsetInfo(string const & string);
        ///
        ~InsetInfo();
@@ -45,26 +46,19 @@ public:
        ///
        void draw(Painter &, LyXFont const &, 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;
        /// what appears in the minibuffer when opening
-       const char * EditMessage() const {return _("Opened note");}
+       char const * EditMessage() const;
        ///
        void Edit(BufferView *, int, int, unsigned int);
        ///