Get rid of lyxstring, remove usage of STRCONV.

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index dd5386c8eb7590a5c99138b08e7c397e3f5ebd77..730b7d0159785ab38a5dd73d88407faae3e7740b 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -30,24 +30,24 @@
 #include "lyxrc.h"
 #include "lyxrow.h"
 #include "texrow.h"
+#include "vspace.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"
 
 #include "support/lstrings.h"
-#include "support/LAssert.h"
 #include "support/textutils.h"
-
 #include "support/std_sstream.h"
 
+using lyx::pos_type;
 
-using namespace lyx::support;
+using lyx::support::contains;
+using lyx::support::subst;
 
-using std::ostream;
-using std::ostringstream;
 using std::endl;
 
-using lyx::pos_type;
+using std::ostream;
+using std::ostringstream;
 
 
 Paragraph::Paragraph()
@@ -293,14 +293,14 @@ bool Paragraph::insetAllowed(InsetOld::Code code)
 
 InsetOld * Paragraph::getInset(pos_type pos)
 {
-       Assert(pos < size());
+       BOOST_ASSERT(pos < size());
        return insetlist.get(pos);
 }
 
 
 InsetOld const * Paragraph::getInset(pos_type pos) const
 {
-       Assert(pos < size());
+       BOOST_ASSERT(pos < size());
        return insetlist.get(pos);
 }
 
@@ -309,7 +309,7 @@ InsetOld const * Paragraph::getInset(pos_type pos) const
 LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
                                         pos_type pos) const
 {
-       Assert(pos <= size());
+       BOOST_ASSERT(pos <= size());
 
        Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
        Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
@@ -329,7 +329,7 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
 
 lyx::pos_type Paragraph::getEndPosOfFontSpan(lyx::pos_type pos) const
 {
-       Assert(pos <= size());
+       BOOST_ASSERT(pos <= size());
 
        Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
        Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
@@ -362,7 +362,7 @@ LyXFont const Paragraph::getFirstFontSettings() const
 LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
                                 LyXFont const & outerfont) const
 {
-       Assert(pos >= 0);
+       BOOST_ASSERT(pos >= 0);
 
        LyXLayout_ptr const & lout = layout();
 
@@ -484,7 +484,7 @@ Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 
 void Paragraph::setFont(pos_type pos, LyXFont const & font)
 {
-       Assert(pos <= size());
+       BOOST_ASSERT(pos <= size());
 
        // First, reduce font against layout/label font
        // Update: The SetCharFont() routine in text2.C already
@@ -1160,7 +1160,7 @@ string const Paragraph::asString(Buffer const & buffer,
                        getInset(i)->ascii(buffer, os);
        }
 
-       return STRCONV(os.str());
+       return os.str();
 }
 
 
@@ -1207,14 +1207,14 @@ void Paragraph::cleanChanges()
 
 Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
 {
-       Assert(!size() || pos < size());
+       BOOST_ASSERT(!size() || pos < size());
        return pimpl_->lookupChange(pos);
 }
 
 
 Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
 {
-       Assert(!size() || pos < size());
+       BOOST_ASSERT(!size() || pos < size());
        return pimpl_->lookupChangeFull(pos);
 }