get rid of the \use_escape_chars pref, which was not used

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30161 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2009-06-18 15:53:49 +00:00
parent 889fdbd39b
commit dae70977a0
4 changed files with 4 additions and 16 deletions

View File

@ -25,8 +25,9 @@ The following variables are obsoleted in 2.0
\use_personal_dictionary and \use_spell_lib (ispell support has been
removed)
- \spellchecker_use_alt_lang (actually not used by the UI, it is as
simple to check whether the relevant variable is empty)
- \spellchecker_use_alt_lang and \use_escape_chars (actually not used
by the UI, and it is as simple to check whether the relevant
variable is empty)
- \custom_export_command and \custom_export_format

View File

@ -270,7 +270,6 @@ void LyXRC::setDefaults()
display_graphics = true;
// Spellchecker settings:
spellchecker_accept_compound = false;
spellchecker_use_esc_chars = false;
spellcheck_continuously = false;
use_kbmap = false;
rtl_support = true;
@ -880,9 +879,6 @@ int LyXRC::read(Lexer & lexrc)
case RC_USE_PIXMAP_CACHE:
lexrc >> use_pixmap_cache;
break;
case RC_USE_ESC_CHARS:
lexrc >> spellchecker_use_esc_chars;
break;
case RC_ALT_LANG:
lexrc >> spellchecker_alt_lang;
break;
@ -1118,6 +1114,7 @@ int LyXRC::read(Lexer & lexrc)
case RC_PERS_DICT:
case RC_PLAINTEXT_ROFF_COMMAND:
case RC_USE_ALT_LANG:
case RC_USE_ESC_CHARS:
case RC_USE_INP_ENC:
case RC_USE_PERS_DICT:
case RC_USE_SPELL_LIB:
@ -2203,11 +2200,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
if (tag != RC_LAST)
break;
case RC_USE_ESC_CHARS:
if (ignore_system_lyxrc ||
spellchecker_use_esc_chars != system_lyxrc.spellchecker_use_esc_chars) {
os << "\\use_escape_chars " << convert<string>(spellchecker_use_esc_chars)
<< '\n';
}
if (tag != RC_LAST)
break;
case RC_ESC_CHARS:

View File

@ -328,8 +328,6 @@ public:
bool use_tooltip;
/// Use pixmap cache?
bool use_pixmap_cache;
/// Use escape chars?
bool spellchecker_use_esc_chars;
/// Alternate language for spellchecker
std::string spellchecker_alt_lang;
/// Escape characters

View File

@ -1264,9 +1264,7 @@ PrefSpellchecker::PrefSpellchecker(GuiPreferences * form)
void PrefSpellchecker::apply(LyXRC & rc) const
{
rc.spellchecker_alt_lang = fromqstr(altLanguageED->text());
// FIXME: remove spellchecker_use_esc_chars
rc.spellchecker_esc_chars = fromqstr(escapeCharactersED->text());
rc.spellchecker_use_esc_chars = !rc.spellchecker_esc_chars.empty();
rc.spellchecker_accept_compound = compoundWordCB->isChecked();
rc.spellcheck_continuously = spellcheckContinuouslyCB->isChecked();
}
@ -1275,7 +1273,6 @@ void PrefSpellchecker::apply(LyXRC & rc) const
void PrefSpellchecker::update(LyXRC const & rc)
{
altLanguageED->setText(toqstr(rc.spellchecker_alt_lang));
// FIXME: remove spellchecker_use_esc_chars
escapeCharactersED->setText(toqstr(rc.spellchecker_esc_chars));
compoundWordCB->setChecked(rc.spellchecker_accept_compound);
spellcheckContinuouslyCB->setChecked(rc.spellcheck_continuously);