ICU-6954 remove unused CharsetRecognizer field from CharsetMatch

X-SVN-Rev: 31978

diff --git a/icu4c/source/i18n/csmatch.cpp b/icu4c/source/i18n/csmatch.cpp
index cb22241da3f7a2791f5ffb686d0c5bab867e5243..f6064a3120a2dbe37eadb7e1a34a45125483e86b 100644 (file)
--- a/icu4c/source/i18n/csmatch.cpp
+++ b/icu4c/source/i18n/csmatch.cpp
@@ -19,7 +19,7 @@
 U_NAMESPACE_BEGIN
 
 CharsetMatch::CharsetMatch()
-  : csr(NULL), textIn(NULL), confidence(0), fCharsetName(NULL), fLang(NULL)
+  : textIn(NULL), confidence(0), fCharsetName(NULL), fLang(NULL)
 {
     // nothing else to do.
 }
@@ -28,16 +28,15 @@ void CharsetMatch::set(InputText *input, const CharsetRecognizer *cr, int32_t co
                        const char *csName, const char *lang)
 {
     textIn = input;
-    csr = cr;
     confidence = conf; 
     fCharsetName = csName;
     fLang = lang;
-    if (csr != NULL) {
+    if (cr != NULL) {
         if (fCharsetName == NULL) {
-            fCharsetName = csr->getName();
+            fCharsetName = cr->getName();
         }
         if (fLang == NULL) {
-            fLang = csr->getLanguage();
+            fLang = cr->getLanguage();
         }
     }
 }

diff --git a/icu4c/source/i18n/csmatch.h b/icu4c/source/i18n/csmatch.h
index a05d2e3d1739971a236a585291e7bad4c7aa8c03..6a3671c44f7e9d006611f8932c26f4bd9d7aab90 100644 (file)
--- a/icu4c/source/i18n/csmatch.h
+++ b/icu4c/source/i18n/csmatch.h
@@ -31,7 +31,6 @@ class CharsetRecognizer;
 class CharsetMatch : public UMemory
 {
  private:
-    const CharsetRecognizer *csr;
     InputText               *textIn;
     int32_t                  confidence;
     const char              *fCharsetName;