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

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

diff --git a/src/insets/insetlatex.h b/src/insets/insetlatex.h
index 995ed0c1a4c20234ce2c74e707c00b7d4bb02077..c3b5b52a500622c18ab241ffc82623a9ddd1a5cd 100644 (file)
--- a/src/insets/insetlatex.h
+++ b/src/insets/insetlatex.h
@@ -6,10 +6,10 @@
  *      
  *         Copyright (C) 1995 Matthias Ettrich
  *
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _INSET_LATEX_H
-#define _INSET_LATEX_H
+#ifndef INSET_LATEX_H
+#define INSET_LATEX_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -24,43 +24,46 @@
   delete/backspace operations. This is used when you insert a LaTeX
   figure (done as "\input "), but you still have to type the filename
   yourself after the inset. */
-class InsetLatex: public Inset {
+class InsetLatex : public Inset {
 public:
        ///
        InsetLatex();
        ///
-       InsetLatex(LString const & string);
+       explicit
+       InsetLatex(string const & string);
        ///
        ~InsetLatex();
        ///
-       int Ascent(LyXFont const &font) const;
+       int Ascent(LyXFont const & font) const;
        ///
-       int Descent(LyXFont const &font) const;
+       int Descent(LyXFont const & font) const;
        ///
-       int Width(LyXFont const &font) const;
+       int Width(LyXFont const & font) const;
        ///
-       void Draw(LyXFont font, LyXScreen &scr, int baseline, float &x);
+       void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
        ///
-       void Write(FILE *file);
+       void Write(FILE * file);
        ///
-       void Read(LyXLex &lex);
+       void Read(LyXLex & lex);
        ///
-       int Latex(FILE *file, signed char fragile);
+       int Latex(FILE * file, signed char fragile, bool free_spc);
        ///
-       int Latex(LString &file, signed char fragile);
+       int Latex(string & file, signed char fragile, bool free_spc);
        ///
-       int Linuxdoc(LString &file);
+       int Ascii(string & file) const;
        ///
-       int DocBook(LString &file);
+       int Linuxdoc(string & file);
+       ///
+       int DocBook(string & file);
        ///
        bool Deletable() const;
        ///
-       Inset* Clone();
+       Inset * Clone() const;
        ///
        Inset::Code LyxCode() const;
 private:
        ///
-       LString contents;
+       string contents;
 };
 
 #endif