The std::string mammoth path.

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

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index a7acd816f6bfb2ddf183be617ba5949710d6cfec..9be7eb2e91296ba127894a372e79ca1761346fa9 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -13,6 +13,7 @@
 #include "insetwrap.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "Floating.h"
@@ -20,12 +21,16 @@
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
+#include "LColor.h"
 #include "lyxlex.h"
+#include "paragraph.h"
 
 #include "support/tostr.h"
 
 #include "support/std_sstream.h"
 
+
+using std::string;
 using std::endl;
 using std::auto_ptr;
 using std::istringstream;
@@ -238,7 +243,7 @@ void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
 
        for (; tmp != end; ++tmp) {
                if (tmp->layout()->name() == caplayout) {
-                       string const name = floatname(params_.type, buf.params);
+                       string const name = floatname(params_.type, buf.params());
                        string const str =
                                tostr(toclist[name].size() + 1)
                                + ". " + tmp->asString(buf, false);
@@ -270,7 +275,7 @@ void InsetWrapMailer::string2params(string const & in,
        if (in.empty())
                return;
 
-       istringstream data(STRCONV(in));
+       istringstream data(in);
        LyXLex lex(0,0);
        lex.setStream(data);
 
@@ -301,5 +306,5 @@ string const InsetWrapMailer::params2string(InsetWrapParams const & params)
        ostringstream data;
        data << name_ << ' ';
        params.write(data);
-       return STRCONV(data.str());
+       return data.str();
 }