If we are in a closeEvent, we don't want to close all buffers, because these may...

[lyx.git] / src / frontends / qt4 / FindAndReplace.cpp

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index cec8a27616ed74cb160b17cbaf1270762abbb226..26bbc9612a9c43bb55666a88fda5aa9c1cd8dcd2 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -26,7 +26,6 @@
 #include "output_latex.h"
 #include "TexRow.h"
 
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
@@ -60,7 +59,7 @@ FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
 
 bool FindAndReplaceWidget::eventFilter(QObject *obj, QEvent *event)
 {
-       LYXERR(Debug::DEBUG, "FindAndReplace::eventFilter()" << std::endl);
+       LYXERR(Debug::FIND, "FindAndReplace::eventFilter()");
        if (obj == find_work_area_ && event->type() == QEvent::KeyPress) {
                QKeyEvent *e = static_cast<QKeyEvent *> (event);
                if (e->key() == Qt::Key_Escape && e->modifiers() == Qt::NoModifier) {
@@ -93,7 +92,7 @@ static docstring buffer_to_latex(Buffer & buffer) {
        ParagraphList::const_iterator const end = buffer.paragraphs().end();
        for (; pit != end; ++pit) {
                TeXOnePar(buffer, buffer.text(), pit, os, buffer.texrow(), runparams);
-               LYXERR(Debug::DEBUG, "searchString up to here: " << os.str());
+               LYXERR(Debug::FIND, "searchString up to here: " << os.str());
        }
        return os.str();
 }
@@ -116,11 +115,10 @@ void FindAndReplaceWidget::findAndReplace(
                runparams.linelen = 100000; //lyxrc.plaintext_linelen;
                runparams.dryrun = true;
                for (; it != end; ++it) {
-                       LYXERR(Debug::DEBUG, "Adding to search string: '" << it->asString(false) << "'");
+                       LYXERR(Debug::FIND, "Adding to search string: '" << it->asString(false) << "'");
                        searchString += it->stringify(pos_type(0), it->size(), AS_STR_INSETS, runparams);
                }
        }
-//     lyxerr << "Searching for '" << to_utf8(searchString) << "'" << std::endl;
        if (to_utf8(searchString).empty()) {
                buffer.message(_("Nothing to search"));
                return;
@@ -133,12 +131,21 @@ void FindAndReplaceWidget::findAndReplace(
        } else {
                replaceString = from_utf8(LYX_FR_NULL_STRING);
        }
+       LYXERR(Debug::FIND, "FindAndReplaceOptions: "
+              << "searchstring=" << searchString
+              << ", casesensitiv=" << casesensitive
+              << ", matchword=" << matchword
+              << ", backwards=" << backwards
+              << ", expandmacros=" << expandmacros
+              << ", ignoreformat=" << ignoreformat
+              << ", regexp=" << regexp
+              << ", replaceString" << replaceString);
        FindAndReplaceOptions opt(searchString, casesensitive, matchword, ! backwards,
                expandmacros, ignoreformat, regexp, replaceString);
-       LYXERR(Debug::DEBUG, "Dispatching LFUN_WORD_FINDADV" << std::endl);
+       LYXERR(Debug::FIND, "Dispatching LFUN_WORD_FINDADV");
        std::ostringstream oss;
        oss << opt;
-       LYXERR(Debug::DEBUG, "Dispatching LFUN_WORD_FINDADV" << std::endl);
+       LYXERR(Debug::FIND, "Dispatching LFUN_WORD_FINDADV");
        dispatch(FuncRequest(LFUN_WORD_FINDADV, from_utf8(oss.str())));
 
        //      findAdv(&theApp()->currentView()->currentWorkArea()->bufferView(),
@@ -167,7 +174,7 @@ void FindAndReplaceWidget::on_regexpInsertCombo_currentIndexChanged(int index)
        static char const * regexps[] = {
                ".*", ".+", "[a-z]+", "[0-9]+"
        };
-       //lyxerr << "Index: " << index << std::endl;
+       LYXERR(Debug::FIND, "Index: " << index);
        if (index >= 1 && index < 1 + int(sizeof(regexps)/sizeof(regexps[0]))) {
                find_work_area_->setFocus();
                Cursor & cur = find_work_area_->bufferView().cursor();
@@ -212,7 +219,7 @@ void FindAndReplaceWidget::on_replaceallPB_clicked()
 }
 
 
-void FindAndReplaceWidget::showEvent(QShowEvent *ev)
+void FindAndReplaceWidget::showEvent(QShowEvent * /* ev */)
 {
        replace_work_area_->setEnabled(true);
        replace_work_area_->redraw();
@@ -231,7 +238,7 @@ void FindAndReplaceWidget::hideEvent(QHideEvent *ev)
 }
 
 
-bool FindAndReplaceWidget::initialiseParams(std::string const & params)
+bool FindAndReplaceWidget::initialiseParams(std::string const & /* params */)
 {
        find_work_area_->redraw();
        replace_work_area_->setEnabled(true);