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 edd3e9fa1e33d76713bd6e7aea6d5ca566c6e6ca..2e4267a8880f91efc0c68dad0fe99b895c44ab25 100644 (file)
--- a/src/insets/insetinfo.h
+++ b/src/insets/insetinfo.h
@@ -1,15 +1,16 @@
 // -*- C++ -*-
 /* This file is part of*
- * ======================================================
+ * ====================================================== 
  *
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 the LyX Team.
  *
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _INSET_INFO_H
-#define _INSET_INFO_H
+#ifndef INSET_INFO_H
+#define INSET_INFO_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -27,53 +28,53 @@
   in a yellow box. Currently, the Read-function is a terrible hack. 
   Some day in the distant future, this will hopefully be obsoleted by 
   a true comment-environment. */
-class InsetInfo: public Inset {
+class InsetInfo : public Inset {
 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);
+       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;
        ///
-       Inset* Clone();
+       Inset * Clone() const;
        ///
        static void CloseInfoCB(FL_OBJECT *, long data);
 private:
        ///
        string contents;
        ///
-       FL_FORM *form;
+       FL_FORM * form;
        ///
-       FL_OBJECT *strobj;
+       FL_OBJECT * strobj;
 };
-
 #endif