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 ec01892a4c0fd599695d068c0a008acc9bf3d4b2..e713fb8f02d0fa6cd8fb57d29c01e089740fe2e5 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -19,8 +19,6 @@
 #include "buffer.h"
 #include "support/filetools.h"
 
-using std::ostream;
-
 struct LaTeXFeatures;
 
 // Created by AAS 970521
@@ -56,24 +54,20 @@ public:
                return IS_EDITABLE;
        }
         /// With lyx3 we won't overload these 3 methods
-        void Write(ostream &) const;
+        void Write(std::ostream &) const;
         ///
        void Read(LyXLex &);
        /// 
-       int Latex(ostream &, signed char fragile, bool free_spc) const;
+       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); }
         ///