From d13e3710e144a56155edfcfb7c353a7b19ab2ed0 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Thu, 21 Jun 2012 21:02:19 +0000 Subject: [PATCH] ICU-6954 remove unused CharsetRecognizer field from CharsetMatch X-SVN-Rev: 31978 --- icu4c/source/i18n/csmatch.cpp | 9 ++++----- icu4c/source/i18n/csmatch.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/icu4c/source/i18n/csmatch.cpp b/icu4c/source/i18n/csmatch.cpp index cb22241da3f..f6064a3120a 100644 --- 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 a05d2e3d173..6a3671c44f7 100644 --- 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; -- 2.40.0