X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.C;h=683869db6274eddf270a95180a43bb51fb36d18f;hb=b99a5acc7f18c3f885856fa962c0f0a63a0ca5ad;hp=57ba8d0421249c7b657b5628e46689f342b41099;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/trans.C b/src/trans.C index 57ba8d0421..683869db62 100644 --- a/src/trans.C +++ b/src/trans.C @@ -1,10 +1,5 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif - -#include "LyXView.h" #include "trans.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -124,7 +119,7 @@ int Trans::Load(LyXLex & lex) if (lex.next(true)) { if (lyxerr.debugging(Debug::KBMAP)) lyxerr << "key\t`" << lex.text() - << "'" << endl; + << '\'' << endl; } else return -1; @@ -133,7 +128,7 @@ int Trans::Load(LyXLex & lex) if (lex.next(true)) { if (lyxerr.debugging(Debug::KBMAP)) lyxerr << "accent\t`" << lex.text() - << "'" << endl; + << '\'' << endl; } else return -1; @@ -149,7 +144,7 @@ int Trans::Load(LyXLex & lex) if (lex.next(true)) { if (lyxerr.debugging(Debug::KBMAP)) lyxerr << "allowed\t`" << lex.text() - << "'" << endl; + << '\'' << endl; } else return -1; @@ -223,7 +218,7 @@ int Trans::Load(LyXLex & lex) if (lex.next(true)) { key_from = lex.text()[0]; if (lyxerr.debugging(Debug::KBMAP)) - lyxerr << "\t`" << lex.text() << "'" + lyxerr << "\t`" << lex.text() << '\'' << endl; } else return -1; @@ -232,7 +227,7 @@ int Trans::Load(LyXLex & lex) string string_to = lex.text(); keymap_[key_from] = string_to; if (lyxerr.debugging(Debug::KBMAP)) - lyxerr << "\t`" << string_to << "'" + lyxerr << "\t`" << string_to << '\'' << endl; } else return -1; @@ -248,7 +243,7 @@ int Trans::Load(LyXLex & lex) lyxerr << "KXMOD:\t" << lex.text() << endl; if (lex.next(true)) { if (lyxerr.debugging(Debug::KBMAP)) - lyxerr << "\t`" << lex.text() << "'" + lyxerr << "\t`" << lex.text() << '\'' << endl; accent = getkeymod(lex.getString()); } else @@ -256,7 +251,7 @@ int Trans::Load(LyXLex & lex) if (lex.next(true)) { if (lyxerr.debugging(Debug::KBMAP)) - lyxerr << "\t`" << lex.text() << "'" + lyxerr << "\t`" << lex.text() << '\'' << endl; key = lex.text()[0]; } else @@ -264,7 +259,7 @@ int Trans::Load(LyXLex & lex) if (lex.next(true)) { if (lyxerr.debugging(Debug::KBMAP)) - lyxerr << "\t`" << lex.text() << "'" + lyxerr << "\t`" << lex.text() << '\'' << endl; str = lex.text(); } else @@ -321,7 +316,7 @@ int Trans::Load(string const & language) return -1; FreeKeymap(); - LyXLex lex(kmapTags, K_LAST-1); + LyXLex lex(kmapTags, K_LAST - 1); lex.setFile(filename); int const res = Load(lex); @@ -343,7 +338,7 @@ tex_accent getkeymod(string const & p) lyxerr << "p = " << p << ", lyx_accent_table[" << i << "].name = `" << lyx_accent_table[i].name - << "'" << endl; + << '\'' << endl; if (lyx_accent_table[i].name && contains(p, lyx_accent_table[i].name)) {