pos=string::npos for regex not found, use handcoded transform in lstring.C, fix the...

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 0548009af5ed25a3aae682ed64bedcda07403a02..5e65463fc6dc0d329479724316135325887c17d9 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -27,16 +27,16 @@
   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 Inset {
 public:
        ///
        InsetLatexAccent(); 
        ///
        InsetLatexAccent(string const & string);
+#if 0     // the compiler generated version should be ok.
        ///
        InsetLatexAccent(InsetLatexAccent const &);
-       ///
-       ~InsetLatexAccent();
+#endif
        ///
        int Ascent(LyXFont const & font) const;
        ///
@@ -44,16 +44,20 @@ public:
        ///
        int Width(LyXFont const & font) const;
        ///
+       int Lbearing(LyXFont const & font) const;
+       ///
+       int Rbearing(LyXFont const & font) const;
+       ///
        bool DisplayISO8859_9(LyXFont font, LyXScreen & scr,
                              int baseline, float & x);
        ///
        void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
        ///
-       void Write(FILE * file);
+       void Write(ostream &);
        ///
        void Read(LyXLex & lex);
        ///
-       int Latex(FILE * file, signed char fragile);
+       int Latex(ostream &, signed char fragile);
        ///
        int Latex(string & file, signed char fragile);
        ///
@@ -65,14 +69,11 @@ public:
        ///
        bool DirectWrite() const;
        ///
-       Inset * Clone();
+       Inset * Clone() const;
        ///
        Inset::Code LyxCode()const;
        ///
-       bool IsEqual(Inset * other);
-       ///
        inline bool CanDisplay();
-private:
        /// all the accent types
        enum ACCENT_TYPES{
                ///
@@ -118,7 +119,7 @@ private:
                ///
                LSLASH
        };
-
+private:
        friend ostream & operator<<(ostream &, ACCENT_TYPES);
        /// Check if we know the modifier and can display it ok on screen.
        void checkContents();