Code cleanup.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32682 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index bb4518031a43dc37d69a0297d0c708308c6d1d62..e95f06e27fa9d4fe963124ce12475cf36eb10bb6 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -1011,15 +1011,8 @@ bool prev_document_buffer(Buffer * & p_buf) {
  ** Return true if restarted from first open buffer.
  **/
 bool next_open_buffer(Buffer * & p_buf) {
-       BufferList::const_iterator it = find(theBufferList().begin(), theBufferList().end(), p_buf);
-       LASSERT(it != theBufferList().end(), /**/)
-       ++it;
-       if (it == theBufferList().end()) {
-               p_buf = *theBufferList().begin();
-               return true;
-       }
-       p_buf = *it;
-       return false;
+       p_buf = theBufferList().next(p_buf);
+       return p_buf == *theBufferList().begin();
 }
 
 
@@ -1028,17 +1021,8 @@ bool next_open_buffer(Buffer * & p_buf) {
  ** Return true if restarted from last open buffer.
  **/
 bool prev_open_buffer(Buffer * & p_buf) {
-       BufferList::const_iterator it = find(theBufferList().begin(), theBufferList().end(), p_buf);
-       LASSERT(it != theBufferList().end(), /**/)
-       if (it == theBufferList().begin()) {
-               it = theBufferList().end();
-               --it;
-               p_buf = *it;
-               return true;
-       }
-       --it;
-       p_buf = *it;
-       return false;
+       p_buf = theBufferList().previous(p_buf);
+       return p_buf == *(theBufferList().end() - 1);
 }
 
 
@@ -1062,15 +1046,16 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match)
                }
                // No match has been found in current buffer
                bool prompt = false;
-               if (match.opt.scope == FindAndReplaceOptions::S_BUFFER) {
+               switch (match.opt.scope) {
+               case FindAndReplaceOptions::S_BUFFER:
                        prompt = true;
-               } else if (match.opt.scope == FindAndReplaceOptions::S_DOCUMENT) {
+                       break;
+               case FindAndReplaceOptions::S_DOCUMENT:
                        prompt = next_document_buffer(match.p_buf);
-               } else if (match.opt.scope == FindAndReplaceOptions::S_OPEN_BUFFERS) {
+                       break;
+               case FindAndReplaceOptions::S_OPEN_BUFFERS:
                        prompt = next_open_buffer(match.p_buf);
-               } else {
-                       /* Unimplemented scope */
-                       LASSERT(false, /**/);
+                       break;
                }
                if (prompt) {
                        if (wrap_answer != -1)
@@ -1177,15 +1162,16 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) {
                }
                // No match has been found in current buffer
                bool prompt = false;
-               if (match.opt.scope == FindAndReplaceOptions::S_BUFFER) {
+               switch (match.opt.scope) {
+               case FindAndReplaceOptions::S_BUFFER:
                        prompt = true;
-               } else if (match.opt.scope == FindAndReplaceOptions::S_DOCUMENT) {
+                       break;
+               case FindAndReplaceOptions::S_DOCUMENT:
                        prompt = prev_document_buffer(match.p_buf);
-               } else if (match.opt.scope == FindAndReplaceOptions::S_OPEN_BUFFERS) {
+                       break;
+               case FindAndReplaceOptions::S_OPEN_BUFFERS:
                        prompt = prev_open_buffer(match.p_buf);
-               } else {
-                       /* Unimplemented scope */
-                       LASSERT(false, /**/);
+                       break;
                }
                if (prompt) {
                        wrap_answer = frontend::Alert::prompt(

diff --git a/src/lyxfind.h b/src/lyxfind.h
index 3a3e91013e05328164c57310b62a6dec0a294c55..ff68b8ee643852295bb7d5ad2d4b415873ad318e 100644 (file)
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -82,7 +82,7 @@ public:
                S_BUFFER,
                S_DOCUMENT,
                S_OPEN_BUFFERS,
-               S_ALL_MANUALS
+               /*S_ALL_MANUALS*/
        } SearchScope;
        FindAndReplaceOptions(
                docstring const & search,