hopefully fix tex2lyx linking.

[lyx.git] / src / lyxfind.C

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 61517f69e6f9f737e99c33d952ee684bb663b9ac..98f30e15d3ae62d39b87d2c5959ebe17133bfba0 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -28,18 +28,16 @@
 #include "undo.h"
 
 #include "frontends/Alert.h"
-#include "frontends/LyXView.h"
 
 #include "support/convert.h"
 
 #include <sstream>
 
-using lyx::support::lowercase;
-using lyx::support::uppercase;
-using lyx::support::split;
+namespace lyx {
 
-using lyx::pit_type;
-using lyx::pos_type;
+using support::lowercase;
+using support::uppercase;
+using support::split;
 
 using std::advance;
 using std::ostringstream;
@@ -58,7 +56,7 @@ bool parse_bool(string & howto)
 }
 
 
-class MatchString : public std::binary_function<Paragraph, lyx::pos_type, bool>
+class MatchString : public std::binary_function<Paragraph, pos_type, bool>
 {
 public:
        MatchString(string const & str, bool cs, bool mw)
@@ -66,11 +64,11 @@ public:
        {}
 
        // returns true if the specified string is at the specified position
-       bool operator()(Paragraph const & par, lyx::pos_type pos) const
+       bool operator()(Paragraph const & par, pos_type pos) const
        {
                string::size_type const size = str.length();
-               lyx::pos_type i = 0;
-               lyx::pos_type const parsize = par.size();
+               pos_type i = 0;
+               pos_type const parsize = par.size();
                for (i = 0; pos + i < parsize; ++i) {
                        if (string::size_type(i) >= size)
                                break;
@@ -87,7 +85,7 @@ public:
                if (mw) {
                        if (pos > 0 && par.isLetter(pos - 1))
                                return false;
-                       if (pos + lyx::pos_type(size) < parsize
+                       if (pos + pos_type(size) < parsize
                            && par.isLetter(pos + size))
                                return false;
                }
@@ -128,8 +126,7 @@ bool findBackwards(DocIterator & cur, MatchString const & match)
 bool findChange(DocIterator & cur)
 {
        for (; cur; cur.forwardPos())
-               if (cur.inTexted() && cur.paragraph().lookupChange(cur.pos()).type
-                   != Change::UNCHANGED)
+               if (cur.inTexted() && !cur.paragraph().isUnchanged(cur.pos()))
                        return true;
        return false;
 }
@@ -138,10 +135,11 @@ bool findChange(DocIterator & cur)
 bool searchAllowed(BufferView * bv, string const & str)
 {
        if (str.empty()) {
-               Alert::error(_("Search error"), _("Search string is empty"));
+               frontend::Alert::error(_("Search error"),
+                                           _("Search string is empty"));
                return false;
        }
-       return bv->available();
+       return bv->buffer();
 }
 
 
@@ -182,17 +180,20 @@ int replaceAll(BufferView * bv,
 
        DocIterator cur = doc_iterator_begin(buf.inset());
        while (findForward(cur, match)) {
-               lyx::pos_type pos = cur.pos();
+               pos_type pos = cur.pos();
                LyXFont const font
                        = cur.paragraph().getFontSettings(buf.params(), pos);
-               int striked = ssize - cur.paragraph().erase(pos, pos + ssize);
-               cur.paragraph().insert(pos, replacestr, font);
+               int striked = ssize - cur.paragraph().eraseChars(pos, pos + ssize,
+                                                           buf.params().trackChanges);
+               cur.paragraph().insert(pos, from_utf8(replacestr), font,
+                                      Change(buf.params().trackChanges ?
+                                             Change::INSERTED : Change::UNCHANGED));
                for (int i = 0; i < rsize + striked; ++i)
                        cur.forwardChar();
                ++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 +207,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 = to_utf8(bv->cursor().selectionAsString(false));
        if ((cs && str1 != str2) || lowercase(str1) != lowercase(str2)) {
                find(bv, searchstr, cs, mw, fw);
                return false;
@@ -226,7 +227,7 @@ int replace(BufferView * bv, string const & searchstr,
                return 0;
 
        LCursor & cur = bv->cursor();
-       lyx::cap::replaceSelectionWithString(cur, replacestr, fw);
+       cap::replaceSelectionWithString(cur, replacestr, fw);
        bv->buffer()->markDirty();
        find(bv, searchstr, cs, mw, fw);
        bv->update();
@@ -237,9 +238,6 @@ int replace(BufferView * bv, string const & searchstr,
 } // namespace anon
 
 
-namespace lyx {
-namespace find {
-
 string const find2string(string const & search,
                         bool casesensitive, bool matchword, bool forward)
 {
@@ -278,18 +276,18 @@ void find(BufferView * bv, FuncRequest const & ev)
        // "<search>
        //  <casesensitive> <matchword> <forward>"
        string search;
-       string howto = split(ev.argument, search, '\n');
+       string howto = split(to_utf8(ev.argument()), search, '\n');
 
        bool casesensitive = parse_bool(howto);
        bool matchword     = parse_bool(howto);
        bool forward       = parse_bool(howto);
 
-       bool const found = ::find(bv, search,
+       bool const found = find(bv, search,
                                  casesensitive, matchword, forward);
 
        if (!found)
                // emit message signal.
-               bv->buffer()->message(_("String not found!"));
+               bv->message(_("String not found!"));
 }
 
 
@@ -303,9 +301,9 @@ void replace(BufferView * bv, FuncRequest const & ev)
        //  <replace>
        //  <casesensitive> <matchword> <all> <forward>"
        string search;
-       string replace;
-       string howto = split(ev.argument, search, '\n');
-       howto = split(howto, replace, '\n');
+       string rplc;
+       string howto = split(to_utf8(ev.argument()), search, '\n');
+       howto = split(howto, rplc, '\n');
 
        bool casesensitive = parse_bool(howto);
        bool matchword     = parse_bool(howto);
@@ -315,8 +313,8 @@ void replace(BufferView * bv, FuncRequest const & ev)
        Buffer * buf = bv->buffer();
 
        int const replace_count = all
-               ? ::replaceAll(bv, search, replace, casesensitive, matchword)
-               : ::replace(bv, search, replace, casesensitive, matchword, forward);
+               ? replaceAll(bv, search, rplc, casesensitive, matchword)
+               : replace(bv, search, rplc, casesensitive, matchword, forward);
 
        if (replace_count == 0) {
                // emit message signal.
@@ -326,7 +324,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 +335,7 @@ void replace(BufferView * bv, FuncRequest const & ev)
 
 bool findNextChange(BufferView * bv)
 {
-       if (!bv->available())
+       if (!bv->buffer())
                return false;
 
        DocIterator cur = bv->cursor();
@@ -367,5 +365,4 @@ bool findNextChange(BufferView * bv)
        return true;
 }
 
-} // find namespace
 } // lyx namespace