From 6b92b1c6ae0779da0ce49007daab8aff16b71622 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 18 Jun 2009 10:56:33 +0000
Subject: [PATCH] pref \use_input_encoding is not used anymore

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30155 a592a061-630c-0410-9148-cb99ea01b6c8
---
 RELEASE-NOTES                              |  5 ++-
 src/LyXRC.cpp                              | 13 +-------
 src/LyXRC.h                                |  2 --
 src/frontends/qt4/GuiPrefs.cpp             |  4 ---
 src/frontends/qt4/ui/PrefSpellcheckerUi.ui | 38 ++++++++--------------
 5 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index faca0449ec..0f8342564b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -20,7 +20,10 @@ be more eventually.
 The following variables are obsoleted in 2.0
 
 - \plaintext_roff_command (was not used anymore)
-- \spell_command and \use_spell_lib (ispell support has been removed)
+
+- \spell_command, \use_input_encoding and \use_spell_lib (ispell
+  support has been removed)
+
 - \custom_export_command and \custom_export_format
 
 
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index b79d4be6e7..50153fb504 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -270,7 +270,6 @@ void LyXRC::setDefaults()
 	display_graphics = true;
 	// Spellchecker settings:
 	spellchecker_accept_compound = false;
-	spellchecker_use_input_encoding = false;
 	spellchecker_use_alt_lang = false;
 	spellchecker_use_pers_dict = false;
 	spellchecker_use_esc_chars = false;
@@ -886,7 +885,7 @@ int LyXRC::read(Lexer & lexrc)
 			lexrc >> spellchecker_accept_compound;
 			break;
 		case RC_USE_INP_ENC:
-			lexrc >> spellchecker_use_input_encoding;
+			(void) lexrc.getString(); // Obsoleted in 2.0
 			break;
 		case RC_USE_ALT_LANG:
 			lexrc >> spellchecker_use_alt_lang;
@@ -2266,16 +2265,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
-	case RC_USE_INP_ENC:
-		if (ignore_system_lyxrc ||
-		    spellchecker_use_input_encoding
-		    != system_lyxrc.spellchecker_use_input_encoding) {
-			os << "\\use_input_encoding "
-			   << convert<string>(spellchecker_use_input_encoding)
-			   << '\n';
-		}
-		if (tag != RC_LAST)
-			break;
 
 		os << "\n#\n"
 		   << "# LANGUAGE SUPPORT SECTION ##########################\n"
diff --git a/src/LyXRC.h b/src/LyXRC.h
index 273c253071..06ef2760aa 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -324,8 +324,6 @@ public:
 	unsigned int plaintext_linelen;
 	/// Accept compound words in spellchecker?
 	bool spellchecker_accept_compound;
-	/// Pass input encoding switch to the spellchecker?
-	bool spellchecker_use_input_encoding;
 	/// Use alternate language?
 	bool spellchecker_use_alt_lang;
 	/// Use personal dictionary?
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index ba3e5f488b..23392ad666 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1260,8 +1260,6 @@ PrefSpellchecker::PrefSpellchecker(GuiPreferences * form)
 		this, SIGNAL(changed()));
 	connect(compoundWordCB, SIGNAL(clicked()),
 		this, SIGNAL(changed()));
-	connect(inputEncodingCB, SIGNAL(clicked()),
-		this, SIGNAL(changed()));
 	connect(spellcheckContinuouslyCB, SIGNAL(clicked()),
 		this, SIGNAL(changed()));
 }
@@ -1279,7 +1277,6 @@ void PrefSpellchecker::apply(LyXRC & rc) const
 	rc.spellchecker_pers_dict = internal_path(fromqstr(persDictionaryED->text()));
 	rc.spellchecker_use_pers_dict = !rc.spellchecker_pers_dict.empty();
 	rc.spellchecker_accept_compound = compoundWordCB->isChecked();
-	rc.spellchecker_use_input_encoding = inputEncodingCB->isChecked();
 	rc.spellcheck_continuously = spellcheckContinuouslyCB->isChecked();
 }
 
@@ -1293,7 +1290,6 @@ void PrefSpellchecker::update(LyXRC const & rc)
 	// FIXME: remove spellchecker_use_pers_dict
 	persDictionaryED->setText(toqstr(external_path(rc.spellchecker_pers_dict)));
 	compoundWordCB->setChecked(rc.spellchecker_accept_compound);
-	inputEncodingCB->setChecked(rc.spellchecker_use_input_encoding);
 	spellcheckContinuouslyCB->setChecked(rc.spellcheck_continuously);
 }
 
diff --git a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
index aac3492c2f..597b05b2bb 100644
--- a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
+++ b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
@@ -5,14 +5,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>405</width>
-    <height>215</height>
+    <width>519</width>
+    <height>208</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item row="0" column="0" >
     <widget class="QLabel" name="altLanguageLA" >
      <property name="text" >
@@ -75,7 +81,7 @@
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>41</width>
        <height>22</height>
@@ -93,21 +99,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="4" >
-    <widget class="QCheckBox" name="inputEncodingCB" >
-     <property name="text" >
-      <string>Use input encod&amp;ing</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="3" >
+   <item row="4" column="0" colspan="3" >
     <widget class="QCheckBox" name="spellcheckContinuouslyCB" >
      <property name="text" >
       <string>Spellcheck continuously (mark misspelled words with wavy underline)</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="4" >
+   <item row="5" column="0" colspan="4" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -115,7 +114,7 @@
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>20</height>
@@ -124,16 +123,6 @@
     </spacer>
    </item>
   </layout>
-  <zorder>altLanguageLA</zorder>
-  <zorder>persDictionaryLA</zorder>
-  <zorder>escapeCharactersLA</zorder>
-  <zorder>inputEncodingCB</zorder>
-  <zorder>compoundWordCB</zorder>
-  <zorder>spellcheckContinuouslyCB</zorder>
-  <zorder>persDictionaryPB</zorder>
-  <zorder>escapeCharactersED</zorder>
-  <zorder>persDictionaryED</zorder>
-  <zorder>altLanguageED</zorder>
  </widget>
  <tabstops>
   <tabstop>altLanguageED</tabstop>
@@ -141,7 +130,6 @@
   <tabstop>persDictionaryED</tabstop>
   <tabstop>persDictionaryPB</tabstop>
   <tabstop>compoundWordCB</tabstop>
-  <tabstop>inputEncodingCB</tabstop>
  </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>