On Linux show in crash message box the backtrace

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

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 7109bea2b185433b8eb85c2ed300df861b28a8a5..556b79ce802fae22cfd9765681ee0fae303a0b65 100644 (file)
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -317,7 +317,7 @@ void GuiBibtex::updateContents()
        for (int i = 0; i != bibfiles.count(); ++i)
                add_->bibLW->addItem(changeExtension(bibfiles[i], ""));
 
-       QString bibstyle = styleFile();
+       QString const bibstyle = styleFile();
 
        bibtocCB->setChecked(bibtotoc() && !bibtopic);
        bibtocCB->setEnabled(!bibtopic);
@@ -327,7 +327,7 @@ void GuiBibtex::updateContents()
        else if (bibtopic && btPrintCO->count() < 3)
                btPrintCO->insertItem(1, qt_("all uncited references", 0));
 
-       docstring btprint = params_["btprint"];
+       docstring const & btprint = params_["btprint"];
        int btp = 0;
        if ((bibtopic && btprint == "btPrintNotCited") ||
           (!bibtopic && btprint == "btPrintAll"))
@@ -341,7 +341,7 @@ void GuiBibtex::updateContents()
 
        int item_nr = -1;
 
-       QStringList str = bibStyles();
+       QStringList const str = bibStyles();
        for (int i = 0; i != str.count(); ++i) {
                QString item = changeExtension(str[i], "");
                if (item == bibstyle)
@@ -419,7 +419,7 @@ void GuiBibtex::applyView()
                        // use \nocite{*}
                        params_["btprint"] = from_ascii("btPrintAll");
                        break;
-               }               
+               }
        }
 }
 
@@ -435,7 +435,7 @@ QString GuiBibtex::browseBib(QString const & in_name) const
        QString const label1 = qt_("Documents|#o#O");
        QString const dir1 = toqstr(lyxrc.document_path);
        QStringList const filter(qt_("BibTeX Databases (*.bib)"));
-       return browseRelFile(in_name, bufferFilePath(),
+       return browseRelToParent(in_name, bufferFilePath(),
                qt_("Select a BibTeX database to add"), filter, false, label1, dir1);
 }
 
@@ -445,7 +445,7 @@ QString GuiBibtex::browseBst(QString const & in_name) const
        QString const label1 = qt_("Documents|#o#O");
        QString const dir1 = toqstr(lyxrc.document_path);
        QStringList const filter(qt_("BibTeX Styles (*.bst)"));
-       return browseRelFile(in_name, bufferFilePath(),
+       return browseRelToParent(in_name, bufferFilePath(),
                qt_("Select a BibTeX style"), filter, false, label1, dir1);
 }
 
@@ -484,7 +484,7 @@ QStringList GuiBibtex::bibFiles() const
 
 void GuiBibtex::rescanBibStyles() const
 {
-       rescanTexStyles();
+       rescanTexStyles("bst bib");
 }
 
 
@@ -504,22 +504,7 @@ QString GuiBibtex::styleFile() const
 {
        // the different bibtex packages have (and need) their
        // own "plain" stylefiles
-       CiteEngine const engine = buffer().params().citeEngine();
-       QString defaultstyle;
-       switch (engine) {
-       case ENGINE_BASIC:
-               defaultstyle = "plain";
-               break;
-       case ENGINE_NATBIB_AUTHORYEAR:
-               defaultstyle = "plainnat";
-               break;
-       case ENGINE_NATBIB_NUMERICAL:
-               defaultstyle = "plainnat";
-               break;
-       case ENGINE_JURABIB:
-               defaultstyle = "jurabib";
-               break;
-       }
+       QString defaultstyle = toqstr(buffer().params().defaultBiblioStyle());
 
        QString bst = toqstr(params_["options"]);
        if (bibtotoc()){
@@ -547,14 +532,14 @@ QString GuiBibtex::styleFile() const
 
 bool GuiBibtex::initialiseParams(std::string const & data)
 {
-       InsetCommand::string2params("bibtex", data, params_);
+       InsetCommand::string2params(data, params_);
        return true;
 }
 
 
 void GuiBibtex::dispatchParams()
 {
-       std::string const lfun = InsetCommand::params2string("bibtex", params_);
+       std::string const lfun = InsetCommand::params2string(params_);
        dispatch(FuncRequest(getLfun(), lfun));
 }