Remove a redundant deletion of a QObject

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index fcce743f39ba273cacd2a1a4406aa89d1a790b3b..6ef39dcb4def5ac21e4392e1f1647b87507beca5 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1046,6 +1046,8 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(langModule->languagePackageCO, SIGNAL(currentIndexChanged(int)),
                this, SLOT(languagePackageChanged(int)));
+       connect(langModule->dynamicQuotesCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
 
        langModule->languagePackageLE->setValidator(new NoNewLineValidator(
                langModule->languagePackageLE));
@@ -1069,6 +1071,8 @@ GuiDocument::GuiDocument(GuiView & lv)
 
        for (int i = 0; i < quoteparams.stylescount(); ++i) {
                InsetQuotesParams::QuoteStyle qs = InsetQuotesParams::QuoteStyle(i);
+               if (qs == InsetQuotesParams::DynamicQuotes)
+                       continue;
                langModule->quoteStyleCO->addItem(toqstr(quoteparams.getGuiLabel(qs)), qs);
        }
 
@@ -2652,6 +2656,7 @@ void GuiDocument::applyView()
 
        bp_.quotes_style = (InsetQuotesParams::QuoteStyle) langModule->quoteStyleCO->itemData(
                langModule->quoteStyleCO->currentIndex()).toInt();
+       bp_.dynamic_quotes = langModule->dynamicQuotesCB->isChecked();
 
        QString const langname = langModule->languageCO->itemData(
                langModule->languageCO->currentIndex()).toString();
@@ -3064,6 +3069,7 @@ void GuiDocument::paramsToDialog()
 
        langModule->quoteStyleCO->setCurrentIndex(
                bp_.quotes_style);
+       langModule->dynamicQuotesCB->setChecked(bp_.dynamic_quotes);
 
        bool default_enc = true;
        if (bp_.inputenc != "auto") {