Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 54295b4d8ddb688be3c8a46bcc8ccc3f7434290e..e4b7c9944f82b8fa77d55836bd8b13af1567e321 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -145,8 +145,8 @@ InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
 }
 
 
-InsetFloat::InsetFloat(InsetFloat const & in, bool same_id)
-       : InsetCollapsable(in, same_id), params_(in.params_)
+InsetFloat::InsetFloat(InsetFloat const & in)
+       : InsetCollapsable(in), params_(in.params_)
 {}
 
 
@@ -259,9 +259,9 @@ void InsetFloat::validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetFloat::clone(Buffer const &, bool same_id) const
+Inset * InsetFloat::clone() const
 {
-       return new InsetFloat(*const_cast<InsetFloat *>(this), same_id);
+       return new InsetFloat(*this);
 }
 
 
@@ -271,8 +271,8 @@ string const InsetFloat::editMessage() const
 }
 
 
-int InsetFloat::latex(Buffer const * buf,
-                     ostream & os, bool fragile, bool fp) const
+int InsetFloat::latex(Buffer const * buf, ostream & os,
+                     LatexRunParams const & runparams) const
 {
        FloatList const & floats = buf->params.getLyXTextClass().floats();
        string const tmptype = (params_.wide ? params_.type + "*" : params_.type);
@@ -303,7 +303,7 @@ int InsetFloat::latex(Buffer const * buf,
        }
        os << '\n';
 
-       int const i = inset.latex(buf, os, fragile, fp);
+       int const i = inset.latex(buf, os, runparams);
 
        // The \n is used to force \end{<floatname>} to appear in a new line.
        // In this case, we do not case if the current output line is empty.
@@ -362,19 +362,17 @@ void InsetFloat::wide(bool w, BufferParams const & bp)
 
 void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const
 {
-       ParIterator pit(&*inset.paragraphs.begin());
-       ParIterator end;
+       ParIterator pit(inset.paragraphs.begin(), inset.paragraphs);
+       ParIterator end(inset.paragraphs.end(), inset.paragraphs);
 
        // Find a caption layout in one of the (child inset's) pars
        for (; pit != end; ++pit) {
-               Paragraph * tmp = *pit;
-
-               if (tmp->layout()->name() == caplayout) {
+               if (pit->layout()->name() == caplayout) {
                        string const name = floatname(params_.type, buf->params);
                        string const str =
                                tostr(toclist[name].size() + 1)
-                               + ". " + tmp->asString(buf, false);
-                       toc::TocItem const item(tmp->id(), 0 , str);
+                               + ". " + pit->asString(buf, false);
+                       toc::TocItem const item(pit->id(), 0 , str);
                        toclist[name].push_back(item);
                }
        }
@@ -401,7 +399,7 @@ void InsetFloatMailer::string2params(string const & in,
 
        if (in.empty())
                return;
-       
+
        istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);