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 1b0b299e4ce58968c43588e3cb9c6ff962136157..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();
@@ -326,7 +326,7 @@ void replace(BufferView * bv, FuncRequest const & ev)
                        // 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.");
                        // emit message signal.
                        buf->message(str);
@@ -337,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();