Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index a35b782b0bf0c40f666ba157fdc4571f5890690c..4563725054ece411ed30c872729ca80ec79e8ae4 100644 (file)
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -22,7 +22,7 @@ struct InsetWrapParams {
        void write(std::ostream &) const;
        ///
        void read(LyXLex &);
-    
+
        ///
        string type;
        ///
@@ -39,11 +39,11 @@ public:
        ///
        InsetWrap(BufferParams const &, string const &);
        ///
-       InsetWrap(InsetWrap const &, bool same_id = false);
+       InsetWrap(InsetWrap const &);
        ///
        ~InsetWrap();
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd); 
+       virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
        void write(Buffer const * buf, std::ostream & os) const;
        ///
@@ -51,11 +51,12 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset * clone(Buffer const &, bool same_id = false) const;
+       Inset * clone() const;
        ///
        Inset::Code lyxCode() const { return Inset::WRAP_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, bool fragile, bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///
@@ -65,16 +66,6 @@ public:
        ///
        int getMaxWidth(BufferView *, UpdatableInset const *) const;
        ///
-       string const & type() const;
-       ///
-       LyXLength const & pageWidth() const;
-       ///
-       void pageWidth(LyXLength const &);
-       ///
-       void placement(string const & p);
-       ///
-       string const & placement() const;
-       ///
        void addToToc(toc::TocList &, Buffer const *) const;
        ///
        bool  showInsetDialog(BufferView *) const;
@@ -97,7 +88,7 @@ public:
        ///
        InsetWrapMailer(InsetWrap & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///