Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 96f261b5c2d7ae5a305cccb02a588b65901948d2..a5ffa5a7ba3fd42c60608982353f93a22d8778fd 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -20,24 +20,28 @@
 #include "FloatList.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
+#include "Lsstream.h"
 #include "lyxfont.h"
 #include "lyxlex.h"
 #include "lyxtext.h"
+#include "Lsstream.h"
 
 #include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 
 #include "support/LOstream.h"
-#include "support/lstrings.h"
+#include "support/tostr.h"
 
 using std::ostream;
 using std::endl;
 
+
 namespace {
 
 // this should not be hardcoded, but be part of the definition
 // of the float (JMarc)
 string const caplayout("Caption");
+
 string floatname(string const & type, BufferParams const & bp)
 {
        FloatList const & floats = bp.getLyXTextClass().floats();
@@ -71,8 +75,8 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
 }
 
 
-InsetWrap::InsetWrap(InsetWrap const & in, bool same_id)
-       : InsetCollapsable(in, same_id), params_(in.params_)
+InsetWrap::InsetWrap(InsetWrap const & in)
+       : InsetCollapsable(in), params_(in.params_)
 {}
 
 
@@ -176,9 +180,9 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetWrap::clone(Buffer const &, bool same_id) const
+Inset * InsetWrap::clone() const
 {
-       return new InsetWrap(*const_cast<InsetWrap *>(this), same_id);
+       return new InsetWrap(*this);
 }
 
 
@@ -188,8 +192,8 @@ string const InsetWrap::editMessage() const
 }
 
 
-int InsetWrap::latex(Buffer const * buf,
-                     ostream & os, bool fragile, bool fp) const
+int InsetWrap::latex(Buffer const * buf, ostream & os,
+                    LatexRunParams const & runparams) const
 {
        os << "\\begin{floating" << params_.type << '}';
        if (!params_.placement.empty()) {
@@ -197,7 +201,7 @@ int InsetWrap::latex(Buffer const * buf,
        }
        os  << '{' << params_.width.asLatexString() << "}%\n";
 
-       int const i = inset.latex(buf, os, fragile, fp);
+       int const i = inset.latex(buf, os, runparams);
 
        os << "\\end{floating" << params_.type << "}%\n";
        return i + 2;
@@ -267,8 +271,6 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
 {
        // Now find the caption in the float...
-       // We now tranverse the paragraphs of
-       // the inset...
        ParagraphList::iterator tmp = inset.paragraphs.begin();
        ParagraphList::iterator end = inset.paragraphs.end();
 
@@ -281,7 +283,6 @@ void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
                        toc::TocItem const item(tmp->id(), 0 , str);
                        toclist[name].push_back(item);
                }
-               ++tmp;
        }
 }
 
@@ -304,7 +305,10 @@ void InsetWrapMailer::string2params(string const & in,
 {
        params = InsetWrapParams();
 
-       istringstream data(in);
+       if (in.empty())
+               return;
+
+       istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);
 
@@ -330,12 +334,10 @@ void InsetWrapMailer::string2params(string const & in,
 }
 
 
-string const
-InsetWrapMailer::params2string(InsetWrapParams const & params)
+string const InsetWrapMailer::params2string(InsetWrapParams const & params)
 {
        ostringstream data;
        data << name_ << ' ';
        params.write(data);
-
-       return data.str();
+       return STRCONV(data.str());
 }