code cosmetics to the iterator fix

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index fbf93f12c7f1fd34959e1a698c9a071a9bd14efa..41abadeb94aafc18d1f92936ce1c32313a6bf97a 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -105,25 +105,6 @@ QuotesLangTranslator const & quoteslangtranslator()
 }
 
 
-// Quote times
-typedef Translator<int, InsetQuotes::quote_times> QuotesTimesTranslator;
-
-
-QuotesTimesTranslator const init_quotestimestranslator()
-{
-       QuotesTimesTranslator translator(1, InsetQuotes::SingleQ);
-       translator.addPair(2, InsetQuotes::DoubleQ);
-       return translator;
-}
-
-
-QuotesTimesTranslator const & quotestimestranslator()
-{
-       static QuotesTimesTranslator translator = init_quotestimestranslator();
-       return translator;
-}
-
-
 // Paper size
 typedef Translator<std::string, PAPER_SIZE> PaperSizeTranslator;
 
@@ -307,7 +288,6 @@ BufferParams::BufferParams()
 {
        paragraph_separation = PARSEP_INDENT;
        quotes_language = InsetQuotes::EnglishQ;
-       quotes_times = InsetQuotes::DoubleQ;
        fontsize = "default";
 
        /*  PaperLayout */
@@ -460,10 +440,6 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
                string quotes_lang;
                lex >> quotes_lang;
                quotes_language = quoteslangtranslator().find(quotes_lang);
-       } else if (token == "\\quotes_times") {
-               int qtimes;
-               lex >> qtimes;
-               quotes_times = quotestimestranslator().find(qtimes);
        } else if (token == "\\papersize") {
                string ppsize;
                lex >> ppsize;
@@ -620,8 +596,8 @@ void BufferParams::writeFile(ostream & os) const
           << "\n\\paperorientation " << string_orientation[orientation]
           << '\n';
 
-       std::list<Branch>::const_iterator it = branchlist().begin();
-       std::list<Branch>::const_iterator end = branchlist().end();
+       BranchList::const_iterator it = branchlist().begin();
+       BranchList::const_iterator end = branchlist().end();
        for (; it != end; ++it) {
                os << "\\branch " << it->getBranch()
                   << "\n\\selected " << it->getSelected()
@@ -663,9 +639,7 @@ void BufferParams::writeFile(ostream & os) const
           << string_paragraph_separation[paragraph_separation]
           << "\n\\defskip " << getDefSkip().asLyXCommand()
           << "\n\\quotes_language "
-          << string_quotes_language[quotes_language] << '\n'
-          << "\\quotes_times "
-          << quotestimestranslator().find(quotes_times)
+          << string_quotes_language[quotes_language]
           << "\n\\papercolumns " << columns
           << "\n\\papersides " << sides
           << "\n\\paperpagestyle " << pagestyle << '\n';
@@ -1118,6 +1092,14 @@ LyXTextClass const & BufferParams::getLyXTextClass() const
 }
 
 
+LyXFont const BufferParams::getFont() const
+{
+       LyXFont f = getLyXTextClass().defaultfont();
+       f.setLanguage(language);
+       return f;
+}
+
+
 void BufferParams::readPreamble(LyXLex & lex)
 {
        if (lex.getString() != "\\begin_preamble")