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

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

diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index 783e5e46a6573585916e8e86bf8907682e1a99b0..d281a0651941be49caf2248adcf383f4d9882c2f 100644 (file)
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -14,9 +14,10 @@
 
 #include "Inset.h"
 #include "ExternalTransforms.h"
+#include "EmbeddedFiles.h"
 
-#include "support/filename.h"
-#include "support/translator.h"
+#include "support/FileName.h"
+#include "support/Translator.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
@@ -69,7 +70,7 @@ public:
        InsetExternalParams();
 
        void write(Buffer const &, std::ostream &) const;
-       bool read(Buffer const &, LyXLex &);
+       bool read(Buffer const &, Lexer &);
 
        /// The name of the tempfile used for manipulations.
        support::FileName const & tempname() const { return tempname_(); }
@@ -79,7 +80,7 @@ public:
        std::string const & templatename() const { return templatename_; }
 
        /// The external file.
-       support::DocFileName filename;
+       EmbeddedFile filename;
        /// How the inset is to be displayed by LyX.
        external::DisplayType display;
        /// The scale of the displayed graphic (if shown).
@@ -104,35 +105,35 @@ private:
 class RenderBase;
 
 ///
-class InsetExternal : public InsetOld, public boost::signals::trackable
+class InsetExternal : public Inset, public boost::signals::trackable
 {
 public:
        InsetExternal();
        ///
        virtual ~InsetExternal();
        ///
-       virtual InsetBase::Code lyxCode() const { return EXTERNAL_CODE; }
+       virtual InsetCode lyxCode() const { return EXTERNAL_CODE; }
        ///
        virtual EDITABLE editable() const { return IS_EDITABLE; }
 
        ///
-       bool metrics(MetricsInfo &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
        virtual void write(Buffer const &, std::ostream &) const;
        ///
-       virtual void read(Buffer const &, LyXLex & lex);
+       virtual void read(Buffer const &, Lexer & lex);
 
        /// \returns the number of rows (\n's) of generated code.
        int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                 OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+                   OutputParams const &) const;
 
        /// Update needed features for this inset.
        virtual void validate(LaTeXFeatures & features) const;
@@ -144,16 +145,20 @@ public:
        ///
        void addPreview(graphics::PreviewLoader &) const;
        ///
-       void edit(LCursor & cur, bool left);
+       void edit(Cursor & cur, bool front, EntryDirection entry_from);
        ///
-       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+       /// external file can be embedded
+       void registerEmbeddedFiles(Buffer const &, EmbeddedFileList &) const;
+       ///
+       void updateEmbeddedFile(Buffer const &, EmbeddedFile const &);
 
 protected:
        InsetExternal(InsetExternal const &);
        ///
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
 
        /** This method is connected to the graphics loader, so we are
         *  informed when the image has been loaded.
@@ -177,7 +182,7 @@ public:
        ///
        InsetExternalMailer(InsetExternal & inset);
        ///
-       virtual InsetBase & inset() const { return inset_; }
+       virtual Inset & inset() const { return inset_; }
        ///
        virtual std::string const & name() const { return name_; }
        ///