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

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

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 28c603614577527b95bcd4205238b440f2a487ba..e713fb8f02d0fa6cd8fb57d29c01e089740fe2e5 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -4,7 +4,7 @@
  *
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1997 LyX Team (this file was created this year)
+ *         Copyright 1997 LyX Team (this file was created this year)
  * 
  * ====================================================== */
 
@@ -37,7 +37,7 @@ public:
        ///
        ~InsetInclude();
         ///
-        InsetInclude * Clone() const;
+        Inset * Clone() const;
        ///
        Inset::Code LyxCode() const { return Inset::INCLUDE_CODE; }
        /// This is 1 if the childs have labels, 0 otherwise
@@ -45,40 +45,33 @@ 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);
+       void Edit(BufferView *, int x, int y, unsigned int button);
        ///
-       unsigned char Editable() const
+       EDITABLE Editable() const
        {
-               return 1;
+               return IS_EDITABLE;
        }
         /// With lyx3 we won't overload these 3 methods
-        void Write(FILE *);
+        void Write(std::ostream &) const;
         ///
        void Read(LyXLex &);
        /// 
-       int Latex(FILE * file, signed char fragile);
-       ///
-       int Latex(string & file, signed char fragile);
-       
+       int Latex(std::ostream &, bool fragile, bool free_spc) const;
        ///
        void Validate(LaTeXFeatures &) const;
        
         /// Input inserts anything inside a paragraph, Display can give some visual feedback 
-       bool display() const { return !(isInput()); }
+       bool display() const;
        ///
        string getScreenLabel() const;
        ///
-       void setContents(string const & c) {
-               InsetCommand::setContents(c);
-               filename = MakeAbsPath(contents, 
-                                      OnlyPath(getMasterFilename())); 
-       }
+       void setContents(string const & c);
         ///
         void setFilename(string const & n) { setContents(n); }
         ///
-        string getMasterFilename() const { return master->getFileName(); }
+        string getMasterFilename() const { return master->fileName(); }
         ///
         string getFileName() const { 
                return filename;
@@ -135,7 +128,7 @@ private:
 inline 
 bool InsetInclude::isVerb() const
 {
-    return (bool)(flag == InsetInclude::VERB || flag == InsetInclude::VERBAST); 
+       return flag == InsetInclude::VERB || flag == InsetInclude::VERBAST; 
 }