This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index c22b2cd61ecb46f8384c3a31f0e9e36ee992843f..6675a4bf2550b59f99fe8945476f72575fd27a66 100644 (file)
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -5,6 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars Gullik Bjønnes
+ * \author Richard Heck (conversion to InsetCommand)
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,15 +14,13 @@
 #define INSET_INCLUDE_H
 
 #include "BiblioInfo.h"
-#include "Inset.h"
+#include "InsetCommand.h"
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
 #include "MailInset.h"
 #include "Counters.h"
 #include "EmbeddedFiles.h"
 
-#include "support/FileName.h"
-
 #include <boost/scoped_ptr.hpp>
 
 namespace lyx {
@@ -31,26 +30,20 @@ class Dimension;
 class LaTeXFeatures;
 class RenderMonitoredPreview;
 
-
 /// for including tex/lyx files
-class InsetInclude : public Inset {
+class InsetInclude : public InsetCommand {
 public:
        ///
        InsetInclude(InsetCommandParams const &);
-       ~InsetInclude();
 
        /// Override these InsetButton methods if Previewing
-       bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
        virtual DisplayType display() const;
-
-       /// get the parameters
-       InsetCommandParams const & params() const;
-
        ///
-       Inset::Code lyxCode() const { return Inset::INCLUDE_CODE; }
+       InsetCode lyxCode() const { return INCLUDE_CODE; }
        /** Fills \c list
         *  \param buffer the Buffer containing this inset.
         *  \param list the list of labels in the child buffer.
@@ -77,15 +70,11 @@ public:
         *  Return an empty vector if the child doc is not loaded.
         *  \param buffer the Buffer containing this inset.
         */
-       std::vector<support::FileName> const &
-       getBibfilesCache(Buffer const & buffer) const;
+       EmbeddedFileList const &
+               getBibfilesCache(Buffer const & buffer) const;
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
        ///
-       void write(Buffer const &, std::ostream &) const;
-       ///
-       void read(Buffer const &, Lexer &);
-       ///
        int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
@@ -99,13 +88,19 @@ public:
        ///
        void addPreview(graphics::PreviewLoader &) const;
        ///
-       void addToToc(TocList &, Buffer const &, ParConstIterator const &) const;
-       ///
-       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+       void addToToc(Buffer const &, ParConstIterator const &) const;
        ///
        void updateLabels(Buffer const & buffer, ParIterator const &);
        /// child document can be embedded
-       void registerEmbeddedFiles(Buffer const &, EmbeddedFiles &) const;
+       void registerEmbeddedFiles(Buffer const &, EmbeddedFileList &) const;
+       ///
+       void updateEmbeddedFile(Buffer const & buf, EmbeddedFile const & file);
+       ///
+       static CommandInfo const * findInfo(std::string const &);
+       ///
+       static std::string defaultCommand() { return "include"; };
+       ///
+       static bool isCompatibleCommand(std::string const & s);
 protected:
        InsetInclude(InsetInclude const &);
        ///
@@ -118,19 +113,10 @@ private:
         */
        void fileChanged() const;
 
-       friend class InsetIncludeMailer;
-
        /// set the parameters
        void set(InsetCommandParams const & params, Buffer const &);
        /// get the text displayed on the button
        docstring const getScreenLabel(Buffer const &) const;
-       ///
-       void write(std::ostream &) const;
-       ///
-       void read(Lexer &);
-
-       /// the parameters
-       InsetCommandParams params_;
        /// holds the entity name that defines the file location (SGML)
        docstring const include_label;
 
@@ -143,31 +129,16 @@ private:
        mutable docstring listings_label_;
 };
 
-
-class InsetIncludeMailer : public MailInset {
-public:
-       ///
-       InsetIncludeMailer(InsetInclude & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
-       ///
-       static void string2params(std::string const &, InsetCommandParams &);
-       ///
-       static std::string const params2string(InsetCommandParams const &);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetInclude & inset_;
-};
-
+/// return the child buffer if the file is a LyX doc and is loaded
+Buffer * getChildBuffer(Buffer const & buffer, InsetCommandParams const & params);
+       
 /// return loaded Buffer or zero if the file loading did not proceed.
 Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params);
 
+///
+void resetParentBuffer(Buffer const * parent, InsetCommandParams const & params,
+       bool close_it);
+
 } // namespace lyx
 
 #endif // INSETINCLUDE_H