Get rid of lyxstring, remove usage of STRCONV.

[lyx.git] / src / mathed / math_hullinset.C

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 10bff0f49b3b804437334136fa336105475ed642..f307e21454111c5e9d29b378d8abfdc86bfa23b7 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -20,22 +20,23 @@
 #include "debug.h"
 #include "textpainter.h"
 #include "funcrequest.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "LaTeXFeatures.h"
-#include "support/LAssert.h"
 
 #include "frontends/Alert.h"
 #include "lyxrc.h"
 #include "gettext.h"
 
+using lyx::support::trim;
 
-using namespace lyx::support;
-
-using std::vector;
-using std::max;
 using std::endl;
-using std::pair;
+using std::max;
+
 using std::auto_ptr;
+using std::istringstream;
+using std::ostringstream;
+using std::pair;
+
 
 namespace {
 
@@ -261,7 +262,7 @@ void MathHullInset::drawT(TextPainter & pain, int x, int y) const
 string MathHullInset::label(row_type row) const
 {
        row_type n = nrows();
-       Assert(row < n);
+       BOOST_ASSERT(row < n);
        return label_[row];
 }
 
@@ -670,8 +671,8 @@ void MathHullInset::infoize(std::ostream & os) const
 
 void MathHullInset::check() const
 {
-       Assert(nonum_.size() == nrows());
-       Assert(label_.size() == nrows());
+       BOOST_ASSERT(nonum_.size() == nrows());
+       BOOST_ASSERT(label_.size() == nrows());
 }