last Friday's text*.C -> text_func shuffle

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 1b805a51404aef41b2217bba9009971372ed94a4..af480ff84fde7a82d352c8a840bb2ad7a0343e9c 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -47,6 +47,8 @@
 
 #include <boost/tuple/tuple.hpp>
 
+using namespace lyx::support;
+
 using std::vector;
 using std::copy;
 using std::endl;
@@ -115,7 +117,7 @@ void LyXText::init(BufferView * bview, bool reinit)
 LyXFont const LyXText::getFont(Buffer const * buf, ParagraphList::iterator pit,
                               pos_type pos) const
 {
-       lyx::Assert(pos >= 0);
+       Assert(pos >= 0);
 
        LyXLayout_ptr const & layout = pit->layout();
 
@@ -832,7 +834,7 @@ void LyXText::toggleFree(LyXFont const & font, bool toggleall)
        LyXCursor resetCursor = cursor;
        bool implicitSelection = (font.language() == ignore_language
                                  && font.number() == LyXFont::IGNORE)
-               ? selectWordWhenUnderCursor(WHOLE_WORD_STRICT) : false;
+               ? selectWordWhenUnderCursor(lyx::WHOLE_WORD_STRICT) : false;
 
        // Set font
        setFont(font, toggleall);
@@ -856,7 +858,8 @@ string LyXText::getStringToIndex()
        // If there is a change in the language the implicit word selection
        // is disabled.
        LyXCursor const reset_cursor = cursor;
-       bool const implicitSelection = selectWordWhenUnderCursor(PREVIOUS_WORD);
+       bool const implicitSelection =
+               selectWordWhenUnderCursor(lyx::PREVIOUS_WORD);
 
        string idxstring;
        if (!selection.set())
@@ -1128,7 +1131,7 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
                                else if (in->lyxCode() == Inset::WRAP_CODE)
                                        type = static_cast<InsetWrap*>(in)->params().type;
                                else
-                                       lyx::Assert(0);
+                                       Assert(0);
 
                                Floating const & fl = textclass.floats().getType(type);
 
@@ -1567,7 +1570,7 @@ bool LyXText::setCursor(ParagraphList::iterator pit,
 void LyXText::setCursor(LyXCursor & cur, ParagraphList::iterator pit,
                        pos_type pos, bool boundary)
 {
-       lyx::Assert(pit != ownerParagraphs().end());
+       Assert(pit != ownerParagraphs().end());
 
        cur.par(pit);
        cur.pos(pos);