Dekels tabular/textinset patches

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index ae15380f54ddf1dbf4f4440a7674a78aa2a94b0a..0206ec3f9c8057a1ea16c3e3d56d52346750e663 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -75,7 +75,7 @@ void BufferParams::writeFile(ostream & os) const
        // then the the preamble
        if (!preamble.empty()) {
                // remove '\n' from the end of preamble
-               string tmppreamble = strip(preamble, '\n');
+               string const tmppreamble = strip(preamble, '\n');
                os << "\\begin_preamble\n"
                   << tmppreamble
                   << "\n\\end_preamble\n";
@@ -198,16 +198,15 @@ void BufferParams::readLanguage(LyXLex & lex)
 {
        if (!lex.next()) return;
        
-       string tmptok = lex.GetString();
+       string const tmptok = lex.GetString();
 
        // check if tmptok is part of tex_babel in tex-defs.h
        language = languages.getLanguage(tmptok);
        if (!language) {
                // Language tmptok was not found
                language = default_language;
-               lyxerr << "Warning: language `"
-                      << tmptok << "' not recognized!\n"
-                      << "         Setting language to `" << language->lang()
+               lyxerr << "Warning: Setting language `"
+                      << tmptok << "' to `" << language->lang()
                       << "'." << endl;
        }
 }
@@ -215,23 +214,18 @@ void BufferParams::readLanguage(LyXLex & lex)
 
 void BufferParams::readGraphicsDriver(LyXLex & lex)
 {
-       string tmptok;
-       string test;
-       int n = 0;
-       
-       
        if (!lex.next()) return;
        
-       tmptok = lex.GetString();
+       string const tmptok = lex.GetString();
        // check if tmptok is part of tex_graphics in tex_defs.h
+       int n = 0;
        while (true) {
-               test = tex_graphics[n++];
+               string const test = tex_graphics[n++];
                
                if (test == tmptok) {    
                        graphicsDriver = tmptok;
                        break;
-               }      
-               else if (test == "last_item") {
+               } else if (test == "last_item") {
                        lex.printError(
                                "Warning: graphics driver `$$Token' not recognized!\n"
                                "         Setting graphics driver to `default'.\n");