Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 160c2a89311e451248ad7dce5901d008d897531d..4e90013fddb0424aeebdfa50652a605b341a1796 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -6,7 +6,7 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSET_INCLUDE_H
@@ -24,7 +24,7 @@ struct LaTeXFeatures;
 // Created by AAS 970521
 
 /// for including tex/lyx files
-class InsetInclude: public Inset {
+class InsetInclude: public InsetOld {
 public:
        /// the type of inclusion
        enum Flags {
@@ -74,9 +74,9 @@ public:
        void set(Params const & params);
 
        ///
-       virtual InsetBase * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       Inset::Code lyxCode() const { return Inset::INCLUDE_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::INCLUDE_CODE; }
        /// This returns the list of labels on the child buffer
        void getLabelList(std::vector<string> &) const;
        /// This returns the list of bibkeys on the child buffer
@@ -86,25 +86,22 @@ public:
        {
                return IS_EDITABLE;
        }
-       /// With lyx3 we won't overload these 3 methods
-       void write(Buffer const *, std::ostream &) const;
        ///
-       void read(Buffer const *, LyXLex &);
+       void write(Buffer const &, std::ostream &) const;
        ///
-       int latex(Buffer const *, std::ostream &,
+       void read(Buffer const &, LyXLex &);
+       ///
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const &, std::ostream &, int linelen) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
        ///
        void validate(LaTeXFeatures &) const;
 
-       /// take up a whole row if we're not type INPUT
-       bool display() const;
-
        /// return true if the file is or got loaded.
        bool loadIfNeeded() const;
 
@@ -112,8 +109,14 @@ public:
        void addPreview(lyx::graphics::PreviewLoader &) const;
 
 private:
+       friend class InsetIncludeMailer;
+       
+       ///
+       void write(std::ostream &) const;
+       ///
+       void read(LyXLex &);
        /// get the text displayed on the button
-       string const getScreenLabel(Buffer const *) const;
+       string const getScreenLabel(Buffer const &) const;
        /// is this a verbatim include ?
        bool isVerbatim() const;
        /// get the filename of the master buffer
@@ -133,9 +136,9 @@ private:
        boost::scoped_ptr<PreviewImpl> const preview_;
 
        /// cache
-       mutable Dimension dim_;
        mutable bool set_label_;
        mutable ButtonRenderer button_;
+       mutable unsigned int center_indent_;
 };
 
 
@@ -155,7 +158,7 @@ public:
        ///
        virtual string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual string const inset2string(Buffer const &) const;
        ///
        static void string2params(string const &, InsetInclude::Params &);
        ///