Fix bug #10879.

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index 4f97d27b102ba6c4a19a81f179799fe48f327c3e..3ab716acb16792df12e7e441ccaa750b8e132cab 100644 (file)
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -142,12 +142,12 @@ ErrorList const & GuiErrorList::errorList() const
 }
 
 
-bool GuiErrorList::initialiseParams(string const & data)
+bool GuiErrorList::initialiseParams(string const & sdata)
 {
-       from_master_ = prefixIs(data, "from_master|");
-       string error_type = data;
+       from_master_ = prefixIs(sdata, "from_master|");
+       string error_type = sdata;
        if (from_master_)
-               error_type = split(data, '|');
+               error_type = split(sdata, '|');
        error_type_ = error_type;
        buf_ = from_master_ ?
                bufferview()->buffer().masterBuffer()

diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp
index e9c2965381190d338a88ed56e619eff05a435d58..c063ca236260789badf89e16a8178c55e010e019 100644 (file)
--- a/src/frontends/qt4/GuiHyperlink.cpp
+++ b/src/frontends/qt4/GuiHyperlink.cpp
@@ -71,10 +71,10 @@ void GuiHyperlink::paramsToDialog(Inset const * inset)
 }
 
 
-bool GuiHyperlink::initialiseParams(std::string const & data)
+bool GuiHyperlink::initialiseParams(std::string const & sdata)
 {
        InsetCommandParams params(insetCode());
-       if (!InsetCommand::string2params(data, params))
+       if (!InsetCommand::string2params(sdata, params))
                return false;
        targetED->setText(toqstr(params["target"]));
        nameED->setText(toqstr(params["name"]));

diff --git a/src/frontends/qt4/GuiIndex.cpp b/src/frontends/qt4/GuiIndex.cpp
index 0f25c93da72f4f3d32825e568e4d8857c8f444fd..aec568e0b06d48d75239264bc2b612cc2a4bdec5 100644 (file)
--- a/src/frontends/qt4/GuiIndex.cpp
+++ b/src/frontends/qt4/GuiIndex.cpp
@@ -79,9 +79,9 @@ void GuiIndex::applyView()
 }
 
 
-bool GuiIndex::initialiseParams(string const & data)
+bool GuiIndex::initialiseParams(string const & sdata)
 {
-       InsetIndex::string2params(data, params_);
+       InsetIndex::string2params(sdata, params_);
        return true;
 }
 

diff --git a/src/frontends/qt4/GuiLabel.cpp b/src/frontends/qt4/GuiLabel.cpp
index d5b207f7738ce426aa8b7f19e6c6d341b7b4d27b..78d1e3fc43dacc8d5b88e8ae86ab9032919cdc3b 100644 (file)
--- a/src/frontends/qt4/GuiLabel.cpp
+++ b/src/frontends/qt4/GuiLabel.cpp
@@ -58,10 +58,10 @@ docstring GuiLabel::dialogToParams() const
 }
 
 
-bool GuiLabel::initialiseParams(std::string const & data)
+bool GuiLabel::initialiseParams(std::string const & sdata)
 {
        InsetCommandParams p(insetCode());
-       if (!InsetCommand::string2params(data, p))
+       if (!InsetCommand::string2params(sdata, p))
                return false;
        keywordED->setText(toqstr(p["name"]));
        return true;

diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 1ab7c7e383b6b1a57d119dad3ca75c60952b6bfe..573b8cd0c5c84fff90325f7bf0c3642753c83d73 100644 (file)
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -661,9 +661,9 @@ bool GuiListings::isValid()
 }
 
 
-bool GuiListings::initialiseParams(string const & data)
+bool GuiListings::initialiseParams(string const & sdata)
 {
-       InsetListings::string2params(data, params_);
+       InsetListings::string2params(sdata, params_);
        return true;
 }
 

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 5b88d30c0827a2441eaf435108d54fe7c42c2773..0a922ea0b66efb9bb7ae86a7dc9dd573a84c99b1 100644 (file)
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -219,9 +219,9 @@ bool GuiLog::contains(QRegExp const & exp) const
 }
 
 
-bool GuiLog::initialiseParams(string const & data)
+bool GuiLog::initialiseParams(string const & sdata)
 {
-       istringstream is(data);
+       istringstream is(sdata);
        Lexer lex;
        lex.setStream(is);
 

diff --git a/src/frontends/qt4/GuiNomenclature.cpp b/src/frontends/qt4/GuiNomenclature.cpp
index 3afad18a83e3e25cf7e7a904937e9c9cdf4a8f14..92e7760abeed66d139fceef3fbf97f994f3d3de6 100644 (file)
--- a/src/frontends/qt4/GuiNomenclature.cpp
+++ b/src/frontends/qt4/GuiNomenclature.cpp
@@ -65,10 +65,10 @@ docstring GuiNomenclature::dialogToParams() const
 }
 
 
-bool GuiNomenclature::initialiseParams(std::string const & data)
+bool GuiNomenclature::initialiseParams(std::string const & sdata)
 {
        InsetCommandParams p(insetCode());
-       if (!InsetCommand::string2params(data, p))
+       if (!InsetCommand::string2params(sdata, p))
                return false;
        symbolED->setText(toqstr(p["symbol"]));
        return true;

diff --git a/src/frontends/qt4/GuiNote.cpp b/src/frontends/qt4/GuiNote.cpp
index adbb6e7425f09bbd3893116d2cc3cc34fcbe03cc..f0e6fcb6179e7cb637722f3f7d769199c76e2372 100644 (file)
--- a/src/frontends/qt4/GuiNote.cpp
+++ b/src/frontends/qt4/GuiNote.cpp
@@ -73,9 +73,9 @@ void GuiNote::applyView()
 }
 
 
-bool GuiNote::initialiseParams(string const & data)
+bool GuiNote::initialiseParams(string const & sdata)
 {
-       InsetNote::string2params(data, params_);
+       InsetNote::string2params(sdata, params_);
        return true;
 }
 

diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp
index 656e70f3042e7a19fb541b2a20dc2b271102d7f8..3cf4127fdb6fed41d353b73fba6b6e65a00bf2c5 100644 (file)
--- a/src/frontends/qt4/GuiParagraph.cpp
+++ b/src/frontends/qt4/GuiParagraph.cpp
@@ -340,9 +340,9 @@ ParagraphParameters const & GuiParagraph::params() const
 
 void GuiParagraph::dispatchParams()
 {
-       ostringstream data;
-       params_.write(data);
-       FuncRequest const fr(getLfun(), data.str());
+       ostringstream os;
+       params_.write(os);
+       FuncRequest const fr(getLfun(), os.str());
        dispatch(fr);
 }
 

diff --git a/src/frontends/qt4/GuiPhantom.cpp b/src/frontends/qt4/GuiPhantom.cpp
index 14dffea059812900d37ad1366e0f2b817734fc68..2db43413fc6091bdd0f043083014c83fe32d47fe 100644 (file)
--- a/src/frontends/qt4/GuiPhantom.cpp
+++ b/src/frontends/qt4/GuiPhantom.cpp
@@ -72,9 +72,9 @@ void GuiPhantom::applyView()
 }
 
 
-bool GuiPhantom::initialiseParams(string const & data)
+bool GuiPhantom::initialiseParams(string const & sdata)
 {
-       InsetPhantom::string2params(data, params_);
+       InsetPhantom::string2params(sdata, params_);
        return true;
 }
 

diff --git a/src/frontends/qt4/GuiPrintindex.cpp b/src/frontends/qt4/GuiPrintindex.cpp
index be8c0cd9b621b5c75a497870b315df42a06c1d6a..00b876b095f31275afde21f261adae91735e5a87 100644 (file)
--- a/src/frontends/qt4/GuiPrintindex.cpp
+++ b/src/frontends/qt4/GuiPrintindex.cpp
@@ -114,11 +114,11 @@ void GuiPrintindex::paramsToDialog(InsetCommandParams const & /*icp*/)
 }
 
 
-bool GuiPrintindex::initialiseParams(string const & data)
+bool GuiPrintindex::initialiseParams(string const & sdata)
 {
        // The name passed with LFUN_INSET_APPLY is also the name
        // used to identify the mailer.
-       InsetCommand::string2params(data, params_);
+       InsetCommand::string2params(sdata, params_);
        paramsToDialog(params_);
        return true;
 }

diff --git a/src/frontends/qt4/GuiSearch.cpp b/src/frontends/qt4/GuiSearch.cpp
index 411ba2ef10eda0c98536a1aaba5f80ff20c7bc84..a24690465c4b0bbc4d1729ce2b55dd540f37eb50 100644 (file)
--- a/src/frontends/qt4/GuiSearch.cpp
+++ b/src/frontends/qt4/GuiSearch.cpp
@@ -123,9 +123,9 @@ void GuiSearch::replaceallClicked()
 void GuiSearch::find(docstring const & search, bool casesensitive,
                         bool matchword, bool forward)
 {
-       docstring const data =
+       docstring const sdata =
                find2string(search, casesensitive, matchword, forward);
-       dispatch(FuncRequest(LFUN_WORD_FIND, data));
+       dispatch(FuncRequest(LFUN_WORD_FIND, sdata));
 }
 
 
@@ -133,10 +133,10 @@ void GuiSearch::replace(docstring const & search, docstring const & replace,
                            bool casesensitive, bool matchword,
                            bool forward, bool all)
 {
-       docstring const data =
+       docstring const sdata =
                replace2string(replace, search, casesensitive,
                                     matchword, all, forward);
-       dispatch(FuncRequest(LFUN_WORD_REPLACE, data));
+       dispatch(FuncRequest(LFUN_WORD_REPLACE, sdata));
 }
 
 

diff --git a/src/frontends/qt4/GuiShowFile.cpp b/src/frontends/qt4/GuiShowFile.cpp
index 8dc7a98df1f3b6b4597564b3d14b19af439c745f..d845455af8bc25429c0859e0c3312bb3141f2d2e 100644 (file)
--- a/src/frontends/qt4/GuiShowFile.cpp
+++ b/src/frontends/qt4/GuiShowFile.cpp
@@ -50,9 +50,9 @@ void GuiShowFile::updateContents()
 }
 
 
-bool GuiShowFile::initialiseParams(string const & data)
+bool GuiShowFile::initialiseParams(string const & sdata)
 {
-       filename_ = FileName(data);
+       filename_ = FileName(sdata);
        return true;
 }
 

diff --git a/src/frontends/qt4/GuiTabularCreate.cpp b/src/frontends/qt4/GuiTabularCreate.cpp
index 96bbe1a790314f9d34093e5b23f9feb16e363203..20b5c90497ad5a94e27a736554dc3a9a87ed22de 100644 (file)
--- a/src/frontends/qt4/GuiTabularCreate.cpp
+++ b/src/frontends/qt4/GuiTabularCreate.cpp
@@ -93,8 +93,9 @@ void GuiTabularCreate::clearParams()
 
 void GuiTabularCreate::dispatchParams()
 {
-       string const data = convert<string>(params().first) + ' ' + convert<string>(params().second);
-       dispatch(FuncRequest(getLfun(), data));
+       string const sdata = 
+               convert<string>(params().first) + ' ' + convert<string>(params().second);
+       dispatch(FuncRequest(getLfun(), sdata));
 }
 
 

diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp
index 9fbeb5adb2ba9f48cd060bbb1fbe5090ef994d78..7b4574c9e6e28ad464fe148409d27ac915361c79 100644 (file)
--- a/src/frontends/qt4/GuiTexinfo.cpp
+++ b/src/frontends/qt4/GuiTexinfo.cpp
@@ -93,10 +93,10 @@ void GuiTexInfo::viewClicked()
        // takes advantage of enum order
        static QString const ext[] = { "cls", "sty", "bst", "bib", "bbx", "cbx" };
        int const fitem = fileListLW->currentRow();
-       QStringList const & data = texdata_[activeStyle_];
-       QString file = data[fitem];
+       QStringList const & sdata = texdata_[activeStyle_];
+       QString file = sdata[fitem];
        if (!pathCB->isChecked())
-               file = texFileFromList(data[fitem], ext[activeStyle_]);
+               file = texFileFromList(sdata[fitem], ext[activeStyle_]);
        viewFile(file);
 }
 
@@ -124,28 +124,28 @@ void GuiTexInfo::updateStyles(TexFileType type)
 
        QString const filename = filenames[type];
 
-       QStringList data = texFileList(filename);
-       if (data.empty()) {
+       QStringList flist = texFileList(filename);
+       if (flist.empty()) {
                // build filelists of all availabe bst/cls/sty-files.
                // Done through kpsewhich and an external script,
                // saved in *Files.lst
                rescanTexStyles();
-               data = texFileList(filename);
+               flist = texFileList(filename);
        }
 
        if (!pathCB->isChecked()) {
-               for (int i = 0; i != data.size(); ++i)
-                       data[i] = onlyFileName(data[i]);
+               for (int i = 0; i != flist.size(); ++i)
+                       flist[i] = onlyFileName(flist[i]);
        }
        // sort on filename only (no path)
-       data.sort();
+       flist.sort();
 
        fileListLW->clear();
-       for(QString const & item : data)
+       for(QString const & item : flist)
                fileListLW->addItem(item);
 
        activeStyle_ = type;
-       texdata_[type] = data;
+       texdata_[type] = flist;
 }
 
 

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index e124a468b428c48cf161d2341fa84c5633d973f2..e05152462011ec16d7f793f500254cb71f553753 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -48,9 +48,9 @@ void GuiToc::updateView()
 }
 
 
-bool GuiToc::initialiseParams(string const & data)
+bool GuiToc::initialiseParams(string const & sdata)
 {
-       widget_->init(toqstr(data));
+       widget_->init(toqstr(sdata));
        return true;
 }
 

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 631758d59d1a2fa099fe0432914259ad7db40e5e..b0986f2a2940f66a46fe37ad7b04085f7fd2b199 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1704,10 +1704,10 @@ void GuiView::errors(string const & error_type, bool from_master)
        if (el.empty())
                return;
 
-       string data = error_type;
+       string err = error_type;
        if (from_master)
-               data = "from_master|" + error_type;
-       showDialog("errorlist", data);
+               err = "from_master|" + error_type;
+       showDialog("errorlist", err);
 }
 
 
@@ -1732,7 +1732,7 @@ void GuiView::structureChanged()
 }
 
 
-void GuiView::updateDialog(string const & name, string const & data)
+void GuiView::updateDialog(string const & name, string const & sdata)
 {
        if (!isDialogVisible(name))
                return;
@@ -1743,7 +1743,7 @@ void GuiView::updateDialog(string const & name, string const & data)
 
        Dialog * const dialog = it->second.get();
        if (dialog->isVisibleView())
-               dialog->initialiseParams(data);
+               dialog->initialiseParams(sdata);
 }
 
 
@@ -4044,43 +4044,43 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 
                case LFUN_DIALOG_SHOW: {
                        string const name = cmd.getArg(0);
-                       string data = trim(to_utf8(cmd.argument()).substr(name.size()));
+                       string sdata = trim(to_utf8(cmd.argument()).substr(name.size()));
 
                        if (name == "character") {
-                               data = freefont2string();
-                               if (!data.empty())
-                                       showDialog("character", data);
+                               sdata = freefont2string();
+                               if (!sdata.empty())
+                                       showDialog("character", sdata);
                        } else if (name == "latexlog") {
-                               // getStatus checks that
+                               // gettatus checks that
                                LATTEST(doc_buffer);
                                Buffer::LogType type;
                                string const logfile = doc_buffer->logName(&type);
                                switch (type) {
                                case Buffer::latexlog:
-                                       data = "latex ";
+                                       sdata = "latex ";
                                        break;
                                case Buffer::buildlog:
-                                       data = "literate ";
+                                       sdata = "literate ";
                                        break;
                                }
-                               data += Lexer::quoteString(logfile);
-                               showDialog("log", data);
+                               sdata += Lexer::quoteString(logfile);
+                               showDialog("log", sdata);
                        } else if (name == "vclog") {
                                // getStatus checks that
                                LATTEST(doc_buffer);
-                               string const data = "vc " +
+                               string const sdata2 = "vc " +
                                        Lexer::quoteString(doc_buffer->lyxvc().getLogFile());
-                               showDialog("log", data);
+                               showDialog("log", sdata2);
                        } else if (name == "symbols") {
-                               data = bv->cursor().getEncoding()->name();
-                               if (!data.empty())
-                                       showDialog("symbols", data);
+                               sdata = bv->cursor().getEncoding()->name();
+                               if (!sdata.empty())
+                                       showDialog("symbols", sdata);
                        // bug 5274
                        } else if (name == "prefs" && isFullScreen()) {
                                lfunUiToggle("fullscreen");
-                               showDialog("prefs", data);
+                               showDialog("prefs", sdata);
                        } else
-                               showDialog(name, data);
+                               showDialog(name, sdata);
                        break;
                }
 
@@ -4506,10 +4506,10 @@ Dialog * GuiView::findOrBuild(string const & name, bool hide_it)
 }
 
 
-void GuiView::showDialog(string const & name, string const & data,
+void GuiView::showDialog(string const & name, string const & sdata,
        Inset * inset)
 {
-       triggerShowDialog(toqstr(name), toqstr(data), inset);
+       triggerShowDialog(toqstr(name), toqstr(sdata), inset);
 }
 
 
@@ -4520,14 +4520,14 @@ void GuiView::doShowDialog(QString const & qname, QString const & qdata,
                return;
 
        const string name = fromqstr(qname);
-       const string data = fromqstr(qdata);
+       const string sdata = fromqstr(qdata);
 
        d.in_show_ = true;
        try {
                Dialog * dialog = findOrBuild(name, false);
                if (dialog) {
                        bool const visible = dialog->isVisibleView();
-                       dialog->showData(data);
+                       dialog->showData(sdata);
                        if (inset && currentBufferView())
                                currentBufferView()->editInset(name, inset);
                        // We only set the focus to the new dialog if it was not yet

diff --git a/src/frontends/qt4/GuiWrap.cpp b/src/frontends/qt4/GuiWrap.cpp
index a13f9a475b587ff4ed5908511fdc24651d4fafd2..27a52597889d8317697dc4ee7cae5e11542b8c8c 100644 (file)
--- a/src/frontends/qt4/GuiWrap.cpp
+++ b/src/frontends/qt4/GuiWrap.cpp
@@ -187,9 +187,9 @@ void GuiWrap::paramsToDialog(InsetWrapParams const & params)
 }
 
 
-bool GuiWrap::initialiseParams(string const & data)
+bool GuiWrap::initialiseParams(string const & sdata)
 {
-       InsetWrap::string2params(data, params_);
+       InsetWrap::string2params(sdata, params_);
        paramsToDialog(params_);
        return true;
 }

diff --git a/src/frontends/qt4/InsertTableWidget.cpp b/src/frontends/qt4/InsertTableWidget.cpp
index 813ccdb17a62be445930f970fc69e99c8d987fc5..773151f00d57e606e3b88bd3e452588ad666449b 100644 (file)
--- a/src/frontends/qt4/InsertTableWidget.cpp
+++ b/src/frontends/qt4/InsertTableWidget.cpp
@@ -110,8 +110,8 @@ void InsertTableWidget::mouseMoveEvent(QMouseEvent * event)
 void InsertTableWidget::mouseReleaseEvent(QMouseEvent * /*event*/)
 {
        if (underMouse_) {
-               QString const data = QString("%1 %2").arg(bottom_).arg(right_);
-               lyx::dispatch(FuncRequest(LFUN_TABULAR_INSERT, fromqstr(data)));
+               QString const qdata = QString("%1 %2").arg(bottom_).arg(right_);
+               lyx::dispatch(FuncRequest(LFUN_TABULAR_INSERT, fromqstr(qdata)));
        }
        // emit signal
        visible(false);

diff --git a/src/frontends/qt4/InsetParamsDialog.cpp b/src/frontends/qt4/InsetParamsDialog.cpp
index 44f49b5a44e01d74c1db0e2b2c7c0c9cf92fea5b..fd0044acdb1159d351168427ba487e26ec2f51a8 100644 (file)
--- a/src/frontends/qt4/InsetParamsDialog.cpp
+++ b/src/frontends/qt4/InsetParamsDialog.cpp
@@ -90,9 +90,9 @@ InsetParamsDialog::~InsetParamsDialog()
 }
 
 
-bool InsetParamsDialog::initialiseParams(std::string const & data)
+bool InsetParamsDialog::initialiseParams(std::string const & sdata)
 {
-       if (!d->widget_->initialiseParams(data))
+       if (!d->widget_->initialiseParams(sdata))
                on_restorePB_clicked();
        return true;
 }