cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / lyxfind.C

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 769aa2c44c6ec65ba5c2e943be3ad5076fa60872..d18ae9b58be9f32ad9a7906c8b8850484ba12152 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.pos() != cur.paragraph().size() &&
-                   cur.paragraph().lookupChange(cur.pos())
+       for (; cur; cur.forwardPos())
+               if (cur.inTexted() && cur.paragraph().lookupChange(cur.pos()).type
                    != Change::UNCHANGED)
                        return true;
        return false;
@@ -142,7 +141,7 @@ bool searchAllowed(BufferView * bv, string const & str)
                Alert::error(_("Search error"), _("Search string is empty"));
                return false;
        }
-       return bv->available();
+       return bv->buffer();
 }
 
 
@@ -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;
@@ -193,7 +192,7 @@ int replaceAll(BufferView * bv,
                ++num;
        }
 
-       bv->text()->init(bv);
+       bv->buffer()->text().init(bv);
        bv->putSelectionAt(doc_iterator_begin(buf.inset()), 0, false);
        if (num)
                buf.markDirty();
@@ -207,7 +206,7 @@ bool stringSelected(BufferView * bv, string const & searchstr,
        // if nothing selected or selection does not equal search
        // string search and select next occurance and return
        string const & str1 = searchstr;
-       string const str2 = bv->cursor().selectionAsString(false);
+       string const str2 = lyx::to_utf8(bv->cursor().selectionAsString(false));
        if ((cs && str1 != str2) || lowercase(str1) != lowercase(str2)) {
                find(bv, searchstr, cs, mw, fw);
                return false;
@@ -227,9 +226,7 @@ int replace(BufferView * bv, string const & searchstr,
                return 0;
 
        LCursor & cur = bv->cursor();
-       lyx::cap::replaceSelectionWithString(cur, replacestr);
-       lyx::cap::setSelectionRange(cur, replacestr.length());
-       cur.top() = fw ? cur.selEnd() : cur.selBegin();
+       lyx::cap::replaceSelectionWithString(cur, replacestr, fw);
        bv->buffer()->markDirty();
        find(bv, searchstr, cs, mw, fw);
        bv->update();
@@ -275,13 +272,13 @@ void find(BufferView * bv, FuncRequest const & ev)
        if (!bv || ev.action != LFUN_WORD_FIND)
                return;
 
-       lyxerr << "find called, cmd: " << ev << std::endl;
+       //lyxerr << "find called, cmd: " << ev << std::endl;
 
        // data is of the form
        // "<search>
        //  <casesensitive> <matchword> <forward>"
        string search;
-       string howto = split(ev.argument, search, '\n');
+       string howto = split(lyx::to_utf8(ev.argument()), search, '\n');
 
        bool casesensitive = parse_bool(howto);
        bool matchword     = parse_bool(howto);
@@ -291,7 +288,8 @@ void find(BufferView * bv, FuncRequest const & ev)
                                  casesensitive, matchword, forward);
 
        if (!found)
-               bv->owner()->message(_("String not found!"));
+               // emit message signal.
+               bv->message(_("String not found!"));
 }
 
 
@@ -306,7 +304,7 @@ void replace(BufferView * bv, FuncRequest const & ev)
        //  <casesensitive> <matchword> <all> <forward>"
        string search;
        string replace;
-       string howto = split(ev.argument, search, '\n');
+       string howto = split(lyx::to_utf8(ev.argument()), search, '\n');
        howto = split(howto, replace, '\n');
 
        bool casesensitive = parse_bool(howto);
@@ -314,21 +312,24 @@ void replace(BufferView * bv, FuncRequest const & ev)
        bool all           = parse_bool(howto);
        bool forward       = parse_bool(howto);
 
-       LyXView * lv = bv->owner();
+       Buffer * buf = bv->buffer();
 
        int const replace_count = all
                ? ::replaceAll(bv, search, replace, casesensitive, matchword)
                : ::replace(bv, search, replace, casesensitive, matchword, forward);
 
        if (replace_count == 0) {
-               lv->message(_("String not found!"));
+               // emit message signal.
+               buf->message(_("String not found!"));
        } else {
                if (replace_count == 1) {
-                       lv->message(_("String has been replaced."));
+                       // emit message signal.
+                       buf->message(_("String has been replaced."));
                } else {
-                       string str = tostr(replace_count);
+                       docstring str = convert<docstring>(replace_count);
                        str += _(" strings have been replaced.");
-                       lv->message(str);
+                       // emit message signal.
+                       buf->message(str);
                }
        }
 }
@@ -336,33 +337,29 @@ void replace(BufferView * bv, FuncRequest const & ev)
 
 bool findNextChange(BufferView * bv)
 {
-       if (!bv->available())
+       if (!bv->buffer())
                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();