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

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

diff --git a/src/insets/inseterror.h b/src/insets/inseterror.h
index 998a755cfcaed778e4b0d6334318e344c83a3a27..519da5fe93dff0ddeeac40001ac9138aee86016f 100644 (file)
--- a/src/insets/inseterror.h
+++ b/src/insets/inseterror.h
@@ -29,12 +29,12 @@
 class InsetError: public Inset {
 public:
        ///
+       explicit
        InsetError(string const & string);
        ///
        InsetError();
        ///
        ~InsetError();
-#ifdef USE_PAINTER
        ///
        int ascent(Painter &, LyXFont const & font) const;
        ///
@@ -42,38 +42,27 @@ public:
        ///
        int width(Painter &, LyXFont const & font) const;
        ///
-       void draw(Painter &, LyXFont const & font,
-                 int baseline, float & x) const;
-#else
+       void draw(Painter &, LyXFont const & font, int baseline, float & x) const;
        ///
-       int Ascent(LyXFont const & font) const;
-       ///
-       int Descent(LyXFont const & font) const;
-       ///
-       int Width(LyXFont const & font) const;
-       ///
-       void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
-#endif
-       ///
-       void Write(ostream &);
+       void Write(std::ostream &) const;
        ///
        void Read(LyXLex & lex);
        ///
-       int Latex(ostream &, 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;
        ///
        bool AutoDelete() const;
        /// what appears in the minibuffer when opening
-       char const * EditMessage() const {return _("Opened error");}
+       char const * EditMessage() const;
        ///
-       void Edit(int, int);
+       void Edit(BufferView *, int x, int y, unsigned int button);
        ///
-       unsigned char Editable() const;
+       EDITABLE Editable() const;
        ///
        Inset * Clone() const;
        ///