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

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

diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index d08022b01b83f982be3229adddfe42f33b6363b1..31903afbd6da010e312e921fb30857e61a499eed 100644 (file)
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -4,12 +4,13 @@
  *
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
+ *         Copyright 1995 Matthias Ettrich
+ *          Copyright 1995-2000 The LyX Team
  *
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _INSET_QUOTES_H
-#define _INSET_QUOTES_H
+#ifndef INSET_QUOTES_H
+#define INSET_QUOTES_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -19,7 +20,6 @@
 
 class BufferParams;
 
-class LString;
 struct LaTeXFeatures;
 
 
@@ -65,39 +65,38 @@ public:
            \item grd <- german double quote right 
            \item etc.
          \end{itemize}
-         */ 
-       InsetQuotes(LString const &string = "eld");
+         */
+       explicit
+       InsetQuotes(string const & str = "eld");
        /// Create the right quote inset after character c
-       InsetQuotes(char c, BufferParams const &params);
-       ///
-       ~InsetQuotes() {}; //nothing to do
+       InsetQuotes(char c, BufferParams const & params);
 
        ///
-       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;
        ///
        LyXFont ConvertFont(LyXFont font);
        ///
-       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(LString &file, signed char fragile);
+       int Ascii(std::ostream &) const;
        ///
-       int Linuxdoc(LString &file);
+       int Linuxdoc(std::ostream &) const;
        ///
-       int DocBook(LString &file);
+       int DocBook(std::ostream &) const;
        ///
        void Validate(LaTeXFeatures &) const;
        ///
-       Inset* Clone();
+       Inset * Clone() const;
        ///
        Inset::Code LyxCode() const;
 private:
@@ -113,9 +112,8 @@ private:
         */
        InsetQuotes(quote_language l, quote_side s, quote_times t);
        ///
-       void ParseString(LString string);
+       void ParseString(string const &);
        ///
-       LString DispString() const;
+       string DispString() const;
 };
-
 #endif