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

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

diff --git a/src/insets/lyxinset.h b/src/insets/lyxinset.h
index 7a1b9ed3b48a68e1c241ca54a45b0482d7169a89..42d37b6b6bf9ded5fed6056dd0e74dc84a97f7a9 100644 (file)
--- a/src/insets/lyxinset.h
+++ b/src/insets/lyxinset.h
@@ -21,6 +21,7 @@
 #include "lyxlex.h"
 #include "lyxscreen.h"
 
+
 class Buffer;
 struct LaTeXFeatures;
 
@@ -91,7 +92,7 @@ public:
        virtual void Draw(LyXFont font, LyXScreen & scr,
                          int baseline, float & x) = 0;
        /// what appears in the minibuffer when opening
-       virtual char const * EditMessage() {return _("Opened inset");}
+       virtual char const * EditMessage() const {return _("Opened inset");}
        ///
        virtual void Edit(int, int);
        ///
@@ -99,14 +100,15 @@ public:
        ///
        virtual bool AutoDelete() const;
        ///
-       virtual void Write(FILE * file)= 0;
+       virtual void Write(ostream &) = 0;
        ///
-       virtual void Read(LyXLex & lex)= 0;
+       virtual void Read(LyXLex & lex) = 0;
        /** returns the number of rows (\n's) of generated tex code.
         fragile != 0 means, that the inset should take care about
         fragile commands by adding a \protect before.
         */
-       virtual int Latex(FILE * file, signed char fragile) = 0;
+       virtual int Latex(ostream &, signed char fragile) = 0;
+       ///
        virtual int Latex(string & file, signed char fragile) = 0;
        ///
        virtual int Linuxdoc(string & /*file*/) = 0;
@@ -125,22 +127,16 @@ public:
                return string();
        }
 
-       /// used for autocorrection
-       virtual bool IsEqual(Inset * /*other*/){
-               return false;
-       }
-
        ///
-       virtual Inset * Clone() = 0;
+       virtual Inset * Clone() const = 0;
 
        /// returns true to override begin and end inset in file
        virtual bool DirectWrite() const;
 
        /// Returns true if the inset should be centered alone
-       virtual bool Display() const { return false; }  
- 
+       virtual bool display() const { return false; }  
        /// Changes the display state of the inset
-       virtual void SetDisplay(bool) {  }  
+       virtual void display(bool) {}  
        ///
        virtual int GetNumberOfLabels() const {
                return 0;
@@ -178,14 +174,14 @@ public:
 class UpdatableInset: public Inset {
 public:
        ///
-       virtual ~UpdatableInset() {}
+       //virtual ~UpdatableInset() {}
        ///
        virtual unsigned char Editable() const;
    
        /// may call ToggleLockedInsetCursor
        virtual void ToggleInsetCursor();
        ///
-       virtual void GetCursorPos(int &, int &) {}
+       virtual void GetCursorPos(int &, int &) const {}
        ///
        virtual void InsetButtonPress(int x, int y, int button);
        ///