From 5691dc59a12bd44b7b6fabf71fc01d010cfae8a5 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Fri, 4 Dec 2015 03:27:29 +0100
Subject: [PATCH] LangModels: rename Cyrillic models to Russian models.

Our language models are per-lang, not per script.
---
 src/CMakeLists.txt                                   |  2 +-
 .../{LangCyrillicModel.cpp => LangRussianModel.cpp}  | 12 ++++++------
 src/nsSBCSGroupProber.cpp                            | 12 ++++++------
 src/nsSBCharSetProber.h                              | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)
 rename src/LangModels/{LangCyrillicModel.cpp => LangRussianModel.cpp} (98%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b57bde..217edfc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ set(
 	CharDistribution.cpp
 	JpCntx.cpp
 	LangModels/LangBulgarianModel.cpp
-	LangModels/LangCyrillicModel.cpp
+	LangModels/LangRussianModel.cpp
 	LangModels/LangEsperantoModel.cpp
 	LangModels/LangFrenchModel.cpp
 	LangModels/LangGermanModel.cpp
diff --git a/src/LangModels/LangCyrillicModel.cpp b/src/LangModels/LangRussianModel.cpp
similarity index 98%
rename from src/LangModels/LangCyrillicModel.cpp
rename to src/LangModels/LangRussianModel.cpp
index 0acab58..a532049 100644
--- a/src/LangModels/LangCyrillicModel.cpp
+++ b/src/LangModels/LangRussianModel.cpp
@@ -300,7 +300,7 @@ static const PRUint8 RussianLangModel[] =
 };
 
 
-const SequenceModel Koi8rCyrillicModel =
+const SequenceModel Koi8rRussianModel =
 {
   KOI8R_CharToOrderMap,
   RussianLangModel,
@@ -310,7 +310,7 @@ const SequenceModel Koi8rCyrillicModel =
   "KOI8-R"
 };
 
-const SequenceModel Win1251CyrillicModel =
+const SequenceModel Win1251RussianModel =
 {
   win1251_CharToOrderMap,
   RussianLangModel,
@@ -320,7 +320,7 @@ const SequenceModel Win1251CyrillicModel =
   "WINDOWS-1251"
 };
 
-const SequenceModel Latin5CyrillicModel =
+const SequenceModel Latin5RussianModel =
 {
   latin5_CharToOrderMap,
   RussianLangModel,
@@ -330,7 +330,7 @@ const SequenceModel Latin5CyrillicModel =
   "ISO-8859-5"
 };
 
-const SequenceModel MacCyrillicModel =
+const SequenceModel MacCyrillicRussianModel =
 {
   macCyrillic_CharToOrderMap,
   RussianLangModel,
@@ -340,7 +340,7 @@ const SequenceModel MacCyrillicModel =
   "MAC-CYRILLIC"
 };
 
-const SequenceModel Ibm866CyrillicModel =
+const SequenceModel Ibm866RussianModel =
 {
   IBM866_CharToOrderMap,
   RussianLangModel,
@@ -350,7 +350,7 @@ const SequenceModel Ibm866CyrillicModel =
   "IBM866"
 };
 
-const SequenceModel Ibm855CyrillicModel =
+const SequenceModel Ibm855RussianModel =
 {
   IBM855_CharToOrderMap,
   RussianLangModel,
diff --git a/src/nsSBCSGroupProber.cpp b/src/nsSBCSGroupProber.cpp
index c6adba0..d0d597d 100644
--- a/src/nsSBCSGroupProber.cpp
+++ b/src/nsSBCSGroupProber.cpp
@@ -46,12 +46,12 @@
 
 nsSBCSGroupProber::nsSBCSGroupProber()
 {
-  mProbers[0] = new nsSingleByteCharSetProber(&Win1251CyrillicModel);
-  mProbers[1] = new nsSingleByteCharSetProber(&Koi8rCyrillicModel);
-  mProbers[2] = new nsSingleByteCharSetProber(&Latin5CyrillicModel);
-  mProbers[3] = new nsSingleByteCharSetProber(&MacCyrillicModel);
-  mProbers[4] = new nsSingleByteCharSetProber(&Ibm866CyrillicModel);
-  mProbers[5] = new nsSingleByteCharSetProber(&Ibm855CyrillicModel);
+  mProbers[0] = new nsSingleByteCharSetProber(&Win1251RussianModel);
+  mProbers[1] = new nsSingleByteCharSetProber(&Koi8rRussianModel);
+  mProbers[2] = new nsSingleByteCharSetProber(&Latin5RussianModel);
+  mProbers[3] = new nsSingleByteCharSetProber(&MacCyrillicRussianModel);
+  mProbers[4] = new nsSingleByteCharSetProber(&Ibm866RussianModel);
+  mProbers[5] = new nsSingleByteCharSetProber(&Ibm855RussianModel);
 
   mProbers[6] = new nsSingleByteCharSetProber(&Latin7GreekModel);
   mProbers[7] = new nsSingleByteCharSetProber(&Win1253GreekModel);
diff --git a/src/nsSBCharSetProber.h b/src/nsSBCharSetProber.h
index 86264ae..14e9b17 100644
--- a/src/nsSBCharSetProber.h
+++ b/src/nsSBCharSetProber.h
@@ -123,12 +123,12 @@ class nsSingleByteCharSetProber : public nsCharSetProber{
 };
 
 
-extern const SequenceModel Koi8rCyrillicModel;
-extern const SequenceModel Win1251CyrillicModel;
-extern const SequenceModel Latin5CyrillicModel;
-extern const SequenceModel MacCyrillicModel;
-extern const SequenceModel Ibm866CyrillicModel;
-extern const SequenceModel Ibm855CyrillicModel;
+extern const SequenceModel Koi8rRussianModel;
+extern const SequenceModel Win1251RussianModel;
+extern const SequenceModel Latin5RussianModel;
+extern const SequenceModel MacCyrillicRussianModel;
+extern const SequenceModel Ibm866RussianModel;
+extern const SequenceModel Ibm855RussianModel;
 
 extern const SequenceModel Latin7GreekModel;
 extern const SequenceModel Win1253GreekModel;