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

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

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index a37d9a2b795da8320eb9c0d4e302431f36261c35..b0e1e84f5c11d22ffcebcb6e2ac23086e85c54f4 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -6,7 +6,7 @@
  *      
  *         Copyright (C) 1997 LyX Team (this file was created this year)
  * 
- * ======================================================*/
+ * ====================================================== */
 
 #ifndef INSET_INCLUDE_H
 #define INSET_INCLUDE_H
@@ -37,7 +37,7 @@ public:
        ///
        ~InsetInclude();
         ///
-        Inset * Clone();
+        Inset * Clone() const;
        ///
        Inset::Code LyxCode() const { return Inset::INCLUDE_CODE; }
        /// This is 1 if the childs have labels, 0 otherwise
@@ -45,7 +45,7 @@ public:
        /// This returns the list of labels on the child buffer
        string getLabel(int) const;
        /// This returns the list of bibkeys on the child buffer
-       string getKeys() const;
+       string getKeys(char delim) const;
        ///
        void Edit(int, int);
        ///
@@ -54,11 +54,11 @@ public:
                return 1;
        }
         /// With lyx3 we won't overload these 3 methods
-        void Write(FILE *);
+        void Write(ostream &);
         ///
        void Read(LyXLex &);
        /// 
-       int Latex(FILE * file, signed char fragile);
+       int Latex(ostream &, signed char fragile);
        ///
        int Latex(string & file, signed char fragile);
        
@@ -66,7 +66,7 @@ public:
        void Validate(LaTeXFeatures &) const;
        
         /// Input inserts anything inside a paragraph, Display can give some visual feedback 
-       bool Display() const { return !(isInput()); }
+       bool display() const { return !(isInput()); }
        ///
        string getScreenLabel() const;
        ///
@@ -78,7 +78,7 @@ public:
         ///
         void setFilename(string const & n) { setContents(n); }
         ///
-        string getMasterFilename() const { return master->getFileName(); }
+        string getMasterFilename() const { return master->fileName(); }
         ///
         string getFileName() const { 
                return filename;
@@ -93,7 +93,7 @@ public:
         */ 
        bool isVerb() const;
        ///
-       bool isVerbVisibleSpace() const { return flag==InsetInclude::VERBAST;}
+       bool isVerbVisibleSpace() const { return flag == InsetInclude::VERBAST;}
         ///  
        bool isInclude() const { return flag == InsetInclude::INCLUDE;}
         ///  
@@ -112,7 +112,7 @@ private:
         ///
         enum Include_Flags {
                ///
-               INCLUDE=0,
+               INCLUDE= 0,
                ///
                VERB = 1,
                ///
@@ -135,7 +135,7 @@ private:
 inline 
 bool InsetInclude::isVerb() const
 {
-    return (bool)(flag==InsetInclude::VERB || flag==InsetInclude::VERBAST); 
+       return flag == InsetInclude::VERB || flag == InsetInclude::VERBAST; 
 }
 
 
@@ -179,10 +179,10 @@ void InsetInclude::setVerb()
 inline
 void InsetInclude::setVisibleSpace(bool b)
 {
-        if (b && flag==InsetInclude::VERB) {
+        if (b && flag == InsetInclude::VERB) {
            setCmdName("verbatiminput*");
            flag = InsetInclude::VERBAST;
-       } else if (!b && flag==InsetInclude::VERBAST) {
+       } else if (!b && flag == InsetInclude::VERBAST) {
            setCmdName("verbatiminput");
            flag = InsetInclude::VERB;
        }