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 c54c36b1ec8f2e0a0c16f9b3609806174a68f329..d18ae9b58be9f32ad9a7906c8b8850484ba12152 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -141,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();
 }
 
 
@@ -192,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();
@@ -206,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;
@@ -226,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();
@@ -274,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);
@@ -290,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!"));
 }
 
 
@@ -305,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);
@@ -313,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 = convert<string>(replace_count);
+                       docstring str = convert<docstring>(replace_count);
                        str += _(" strings have been replaced.");
-                       lv->message(str);
+                       // emit message signal.
+                       buf->message(str);
                }
        }
 }
@@ -335,7 +337,7 @@ void replace(BufferView * bv, FuncRequest const & ev)
 
 bool findNextChange(BufferView * bv)
 {
-       if (!bv->available())
+       if (!bv->buffer())
                return false;
 
        DocIterator cur = bv->cursor();