ws changes only

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

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 4640c0578417fc48b5ae48b0cdcb0061c08fae58..0f0ba8a817347305f8acb8c1a78e84cce080aa0c 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -14,6 +14,7 @@
 #include "insetfloat.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "Floating.h"
@@ -22,6 +23,7 @@
 #include "gettext.h"
 #include "iterators.h"
 #include "LaTeXFeatures.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "paragraph.h"
 
@@ -30,9 +32,10 @@
 
 #include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::contains;
 
 using std::endl;
+using std::string;
 using std::auto_ptr;
 using std::istringstream;
 using std::ostream;
@@ -430,7 +433,7 @@ void InsetFloatMailer::string2params(string const & in,
        if (in.empty())
                return;
 
-       istringstream data(STRCONV(in));
+       istringstream data(in);
        LyXLex lex(0,0);
        lex.setStream(data);
 
@@ -461,5 +464,5 @@ string const InsetFloatMailer::params2string(InsetFloatParams const & params)
        ostringstream data;
        data << name_ << ' ';
        params.write(data);
-       return STRCONV(data.str());
+       return data.str();
 }