prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h
index b8147ed634a434042f7a2e55faf0d07928c97b4c..4beca59ade374fe87c2d4481e730bc97266bebec 100644 (file)
--- a/src/insets/insetexternal.h
+++ b/src/insets/insetexternal.h
@@ -13,28 +13,31 @@
 #define INSET_EXTERNAL_H
 
 #include "inset.h"
-#include "ExternalTemplate.h"
 #include "graphics/GraphicsTypes.h"
+#include "support/filename.h"
 #include "LString.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
 
-class GraphicInset;
+class RenderInset;
 
 ///
-class InsetExternal : public Inset, public boost::signals::trackable {
+class InsetExternal : public InsetOld, public boost::signals::trackable {
 public:
        /// hold parameters settable from the GUI
        struct Params {
                Params();
+               ~Params();
                /// the filename
-               string filename;
+               lyx::support::FileName filename;
                /// the current template used
-               ExternalTemplate templ;
+               string templatename;
+               /// The name of the tempfile used for manipulations.
+               string tempname;
                /// how the inset is displayed by LyX
-               grfx::DisplayType display;
+               lyx::graphics::DisplayType display;
                /// The scale of the displayed graphic (If shown).
                unsigned int lyxscale;
        };
@@ -46,16 +49,10 @@ public:
        virtual ~InsetExternal();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
-       /** Would not be needed if editExternal were dispatched properly from
-        *  the frontends rather than being invoked directly.
-        */
-       virtual void cache(BufferView *) const;
        ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
-       /// what appears in the minibuffer when opening
-       virtual string const editMessage() const;
        ///
        virtual EDITABLE editable() const { return IS_EDITABLE; }
        ///
@@ -82,13 +79,16 @@ public:
        virtual void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
-       virtual Inset::Code lyxCode() const { return EXTERNAL_CODE; }
+       virtual InsetOld::Code lyxCode() const { return EXTERNAL_CODE; }
 
        ///
-       virtual Inset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
+
+       /// return a copy of our current params
+       Params const & params() const;
 
        /// Set the inset parameters.
-       virtual void setParams(Params const &, string const & filepath);
+       virtual void setParams(Params const &, Buffer const *);
 
        /** update the file represented by the template.
            If \param external_in_tmpdir == true, then the generated file is
@@ -97,12 +97,6 @@ public:
        void updateExternal(string const &, Buffer const *,
                            bool external_in_tmpdir) const;
 
-       /// edit file of this template
-       void editExternal() const;
-
-       /// return a copy of our current params
-       Params const & params() const;
-
 private:
        /** This method is connected to the graphics loader, so we are
         *  informed when the image has been loaded.
@@ -117,17 +111,11 @@ private:
        int write(string const & format, Buffer const *, std::ostream &,
                  bool external_in_tmpdir = false) const;
 
-       /// Substitute meta-variables in this string
-       string const doSubstitution(Buffer const *, string const & s) const;
-
        /// the current params
        Params params_;
 
-       /// A temp filename
-       mutable string tempname_;
-
        /// The thing that actually draws the image on LyX's screen.
-       boost::scoped_ptr<GraphicInset> const graphic_;
+       boost::scoped_ptr<RenderInset> renderer_;
 };
 
 
@@ -142,11 +130,13 @@ 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 &, InsetExternal::Params &);
+       static void string2params(string const &, Buffer const &,
+                                 InsetExternal::Params &);
        ///
-       static string const params2string(InsetExternal::Params const &);
+       static string const params2string(InsetExternal::Params const &,
+                                         Buffer const &);
 private:
        ///
        static string const name_;