Clean up InsetGraphics::Cache and rename as GraphicsInset.

[lyx.git] / src / insets / insetert.C

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 881ca1c0179050e4a1e87e70f8b08ede1bed205f..f7c10d35b371d5ce1e6512f4868bafd1770bc684 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -63,16 +63,16 @@ InsetERT::InsetERT(BufferParams const & bp, bool collapsed)
 }
 
 
-InsetERT::InsetERT(InsetERT const & in, bool same_id)
-       : InsetCollapsable(in, same_id), status_(in.status_)
+InsetERT::InsetERT(InsetERT const & in)
+       : InsetCollapsable(in), status_(in.status_)
 {
        init();
 }
 
 
-Inset * InsetERT::clone(Buffer const &, bool same_id) const
+Inset * InsetERT::clone() const
 {
-       return new InsetERT(*const_cast<InsetERT *>(this), same_id);
+       return new InsetERT(*this);
 }
 
 
@@ -323,8 +323,8 @@ void InsetERT::lfunMouseMotion(FuncRequest const & cmd)
 }
 
 
-int InsetERT::latex(Buffer const *, ostream & os, bool /*fragile*/,
-                   bool /*free_spc*/) const
+int InsetERT::latex(Buffer const *, ostream & os,
+                   LatexRunParams const &) const
 {
        ParagraphList::iterator par = inset.paragraphs.begin();
        ParagraphList::iterator end = inset.paragraphs.end();
@@ -552,20 +552,18 @@ bool InsetERT::checkInsertChar(LyXFont & /* font */)
 }
 
 
-void InsetERT::dimension(BufferView * bv, LyXFont const & font,
-       Dimension & dim) const
+void InsetERT::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (inlined())
-               inset.dimension(bv, font, dim);
+               inset.metrics(mi, dim);
        else
-               InsetCollapsable::dimension(bv, font, dim);
+               InsetCollapsable::metrics(mi, dim);
 }
 
 
-void InsetERT::draw(BufferView * bv, LyXFont const & f,
-                   int baseline, float & x) const
+void InsetERT::draw(PainterInfo & pi, int x, int y) const
 {
-       InsetCollapsable::draw(bv, f, baseline, x, inlined());
+       InsetCollapsable::draw(pi, x, y, inlined());
 }