Replace LString.h with support/std_string.h,

[features.git] / src / frontends / controllers / ControlParagraph.C

diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C
index 5d817d31e1a61cc209fd8b63d6371164a6602892..512c6fef3521fbe6a1c6c14942d8a5659e220cc4 100644 (file)
--- a/src/frontends/controllers/ControlParagraph.C
+++ b/src/frontends/controllers/ControlParagraph.C
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /**
  * \file ControlParagraph.C
  * This file is part of LyX, the document processor.
@@ -7,7 +6,7 @@
  * \author Edwin Leuven
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -18,8 +17,9 @@
 #include "lyxlex.h"
 #include "ParagraphParameters.h"
 #include "support/LAssert.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
+using namespace lyx::support;
 
 ControlParagraph::ControlParagraph(Dialog & parent)
        : Dialog::Controller(parent), ininset_(false)
@@ -28,7 +28,7 @@ ControlParagraph::ControlParagraph(Dialog & parent)
 
 bool ControlParagraph::initialiseParams(string const & data)
 {
-       istringstream is(data);
+       istringstream is(STRCONV(data));
        LyXLex lex(0,0);
        lex.setStream(is);
 
@@ -118,21 +118,21 @@ void ControlParagraph::dispatchParams()
 {
        ostringstream data;
        params().write(data);
-       FuncRequest const fr(LFUN_PARAGRAPH_APPLY, data.str());
+       FuncRequest const fr(LFUN_PARAGRAPH_APPLY, STRCONV(data.str()));
        kernel().dispatch(fr);
 }
 
 
 ParagraphParameters & ControlParagraph::params()
 {
-       lyx::Assert(params_.get());
+       Assert(params_.get());
        return *params_;
 }
 
 
 ParagraphParameters const & ControlParagraph::params() const
 {
-       lyx::Assert(params_.get());
+       Assert(params_.get());
        return *params_;
 }