* remove various xforms relicts, in particular:

[lyx.git] / src / lyxfind.C

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 479d4771167799f20a9197f5167b4bc79b6f7c2a..c54c36b1ec8f2e0a0c16f9b3609806174a68f329 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -30,7 +30,7 @@
 #include "frontends/Alert.h"
 #include "frontends/LyXView.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 
@@ -88,7 +88,7 @@ public:
                        if (pos > 0 && par.isLetter(pos - 1))
                                return false;
                        if (pos + lyx::pos_type(size) < parsize
-                           && par.isLetter(pos + size));
+                           && par.isLetter(pos + size))
                                return false;
                }
 
@@ -127,9 +127,8 @@ bool findBackwards(DocIterator & cur, MatchString const & match)
 
 bool findChange(DocIterator & cur)
 {
-       for (; cur; cur.forwardChar())
-               if (cur.inTexted() && !cur.paragraph().empty() &&
-                   cur.paragraph().lookupChange(cur.pos())
+       for (; cur; cur.forwardPos())
+               if (cur.inTexted() && cur.paragraph().lookupChange(cur.pos()).type
                    != Change::UNCHANGED)
                        return true;
        return false;
@@ -173,7 +172,7 @@ int replaceAll(BufferView * bv,
        if (!searchAllowed(bv, searchstr) || buf.isReadonly())
                return 0;
 
-       recordUndoFullDocument(bv->cursor());
+       recordUndoFullDocument(bv);
 
        MatchString const match(searchstr, cs, mw);
        int num = 0;
@@ -326,7 +325,7 @@ void replace(BufferView * bv, FuncRequest const & ev)
                if (replace_count == 1) {
                        lv->message(_("String has been replaced."));
                } else {
-                       string str = tostr(replace_count);
+                       string str = convert<string>(replace_count);
                        str += _(" strings have been replaced.");
                        lv->message(str);
                }
@@ -339,30 +338,26 @@ bool findNextChange(BufferView * bv)
        if (!bv->available())
                return false;
 
-       DocIterator cur = DocIterator(bv->cursor());
+       DocIterator cur = bv->cursor();
 
        if (!findChange(cur))
                return false;
 
-       Paragraph const & par = cur.paragraph();
-       const pos_type pos = cur.pos();
+       bv->cursor().setCursor(cur);
+       bv->cursor().resetAnchor();
 
-       Change orig_change = par.lookupChangeFull(pos);
-       const pos_type parsize = par.size();
-       pos_type end = pos;
+       Change orig_change = cur.paragraph().lookupChange(cur.pos());
 
-       for (; end != parsize; ++end) {
-               Change change = par.lookupChangeFull(end);
+       DocIterator et = doc_iterator_end(cur.inset());
+       for (; cur != et; cur.forwardPosNoDescend()) {
+               Change change = cur.paragraph().lookupChange(cur.pos());
                if (change != orig_change) {
-                       // slight UI optimisation: for replacements, we get
-                       // text like : _old_new. Consider that as one change.
-                       if (!(orig_change.type == Change::DELETED &&
-                               change.type == Change::INSERTED))
-                               break;
+                       break;
                }
        }
-       pos_type length = end - pos;
-       bv->putSelectionAt(cur, length, false);
+       // Now put cursor to end of selection:
+       bv->cursor().setCursor(cur);
+       bv->cursor().setSelection();
        // if we used a lfun like in find/replace, dispatch would do
        // that for us
        bv->update();