Final touch 'inset display()'; fix 'is a bit silly' bug

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index dfb139efb3a78d7003e10df71aaa09b15f2495e1..fb86a5526e2ed9d8494c9fd00fd7d1bb06bc7b82 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -6,17 +6,16 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSET_LATEX_ACCENT_H
 #define INSET_LATEX_ACCENT_H
 
-
 #include "inset.h"
-#include "LString.h"
 
-class LyXLex;
+class Dimension;
+
 
 /** Insertion of accents
 
@@ -26,43 +25,42 @@ class LyXLex;
   it also can handle other special characters (e.g. Hstroke)
   Initiated by Ivan Schreter, later modified by Lgb.
   */
-class InsetLatexAccent : public Inset {
+class InsetLatexAccent : public InsetOld {
 public:
        ///
        InsetLatexAccent();
        ///
        explicit
-       InsetLatexAccent(string const & string);
+       InsetLatexAccent(std::string const & str);
        ///
-       void dimension(BufferView *, LyXFont const &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       void draw(BufferView *, LyXFont const &, int, float &) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
        int lbearing(LyXFont const & font) const;
        ///
        int rbearing(LyXFont const & font) const;
        ///
-       bool displayISO8859_9(BufferView *, LyXFont const & font,
-                             int baseline, float & x) const;
+       bool displayISO8859_9(PainterInfo & pi, int x, int y) const;
        ///
-       void write(Buffer const *, std::ostream &) const;
+       void write(Buffer const &, std::ostream &) const;
        ///
-       void read(Buffer const *, LyXLex & lex);
+       void read(Buffer const &, LyXLex & lex);
        ///
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const &, std::ostream &, int linelen) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
        ///
        bool directWrite() const;
        ///
-       virtual Inset * clone(Buffer const &, bool same_id = false) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       Inset::Code lyxCode()const;
+       InsetOld::Code lyxCode()const;
        ///
        inline bool canDisplay();
        // should this inset be handled like a normal charater
@@ -118,7 +116,7 @@ private:
        /// Check if we know the modifier and can display it ok on screen.
        void checkContents();
        ///
-       string contents;
+       std::string contents;
        /// can display as proper char
        bool  candisp;
        /// modifier type