From a1bd7f50bffddf79877e7a83719eefe1b6a259c5 Mon Sep 17 00:00:00 2001 From: Alan Liu Date: Tue, 30 Mar 2004 22:39:45 +0000 Subject: [PATCH] ICU-3668 back out risky character iterator changes! X-SVN-Rev: 14805 --- icu4c/source/common/schriter.cpp | 2 +- icu4c/source/common/uchriter.cpp | 6 +++--- icu4c/source/common/unicode/chariter.h | 6 +++--- icu4c/source/common/unicode/schriter.h | 2 +- icu4c/source/common/unicode/uchriter.h | 6 +++--- icu4c/source/test/intltest/citrtest.cpp | 12 ++++++------ 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/icu4c/source/common/schriter.cpp b/icu4c/source/common/schriter.cpp index 897711d29c4..ad665ba3851 100644 --- a/icu4c/source/common/schriter.cpp +++ b/icu4c/source/common/schriter.cpp @@ -109,7 +109,7 @@ StringCharacterIterator::setText(const UnicodeString& newText) { } void -StringCharacterIterator::getText(UnicodeString& result) const { +StringCharacterIterator::getText(UnicodeString& result) { result = text; } U_NAMESPACE_END diff --git a/icu4c/source/common/uchriter.cpp b/icu4c/source/common/uchriter.cpp index 78982c35872..f3ee3e29801 100644 --- a/icu4c/source/common/uchriter.cpp +++ b/icu4c/source/common/uchriter.cpp @@ -166,7 +166,7 @@ UCharCharacterIterator::nextPostInc() { } UBool -UCharCharacterIterator::hasNext() const { +UCharCharacterIterator::hasNext() { return (UBool)(pos < end ? TRUE : FALSE); } @@ -180,7 +180,7 @@ UCharCharacterIterator::previous() { } UBool -UCharCharacterIterator::hasPrevious() const { +UCharCharacterIterator::hasPrevious() { return (UBool)(pos > begin ? TRUE : FALSE); } @@ -356,7 +356,7 @@ void UCharCharacterIterator::setText(const UChar* newText, } void -UCharCharacterIterator::getText(UnicodeString& result) const { +UCharCharacterIterator::getText(UnicodeString& result) { result = UnicodeString(text, textLength); } diff --git a/icu4c/source/common/unicode/chariter.h b/icu4c/source/common/unicode/chariter.h index 8133a4cabf6..0a9110d3751 100644 --- a/icu4c/source/common/unicode/chariter.h +++ b/icu4c/source/common/unicode/chariter.h @@ -164,7 +164,7 @@ public: * at or after the current position in the iteration range. * @stable ICU 2.0 */ - virtual UBool hasNext() const = 0; + virtual UBool hasNext() = 0; protected: /** Default constructor to be overridden in the implementing class. @stable ICU 2.0*/ @@ -528,7 +528,7 @@ public: * before the current position in the iteration range, return TRUE otherwise. * @stable ICU 2.0 */ - virtual UBool hasPrevious() const = 0; + virtual UBool hasPrevious() = 0; /** * Returns the numeric index in the underlying text-storage @@ -603,7 +603,7 @@ public: * @param result Receives a copy of the text under iteration. * @stable ICU 2.0 */ - virtual void getText(UnicodeString& result) const = 0; + virtual void getText(UnicodeString& result) = 0; protected: /** diff --git a/icu4c/source/common/unicode/schriter.h b/icu4c/source/common/unicode/schriter.h index 4693d007c31..8f995bd8390 100644 --- a/icu4c/source/common/unicode/schriter.h +++ b/icu4c/source/common/unicode/schriter.h @@ -139,7 +139,7 @@ public: * @param result Receives a copy of the text under iteration. * @stable ICU 2.0 */ - virtual void getText(UnicodeString& result) const; + virtual void getText(UnicodeString& result); /** * Return a class ID for this object (not really public) diff --git a/icu4c/source/common/unicode/uchriter.h b/icu4c/source/common/unicode/uchriter.h index 786c66823b2..4f3f8495f3a 100644 --- a/icu4c/source/common/unicode/uchriter.h +++ b/icu4c/source/common/unicode/uchriter.h @@ -272,7 +272,7 @@ public: * at or after the current position in the iteration range. * @stable ICU 2.0 */ - virtual UBool hasNext() const; + virtual UBool hasNext(); /** * Advances to the previous code unit in the iteration range (toward @@ -301,7 +301,7 @@ public: * before the current position in the iteration range. * @stable ICU 2.0 */ - virtual UBool hasPrevious() const; + virtual UBool hasPrevious(); /** * Moves the current position relative to the start or end of the @@ -342,7 +342,7 @@ public: * @param result Receives a copy of the text under iteration. * @stable ICU 2.0 */ - virtual void getText(UnicodeString& result) const; + virtual void getText(UnicodeString& result); /** * Return a class ID for this class (not really public) diff --git a/icu4c/source/test/intltest/citrtest.cpp b/icu4c/source/test/intltest/citrtest.cpp index 7831e820d53..df2a7363318 100644 --- a/icu4c/source/test/intltest/citrtest.cpp +++ b/icu4c/source/test/intltest/citrtest.cpp @@ -36,7 +36,7 @@ public: text = newText; } - virtual void getText(UnicodeString& result) const { + virtual void getText(UnicodeString& result) { text.extract(0,text.length(),result); } virtual UClassID getDynamicClassID(void) const{ @@ -58,7 +58,7 @@ public: } virtual UChar nextPostInc(void){ return text.charAt(pos++);} virtual UChar32 next32PostInc(void){return text.char32At(pos++);} - virtual UBool hasNext() const { return TRUE;}; + virtual UBool hasNext() { return TRUE;}; virtual UChar first(){return DONE;}; virtual UChar32 first32(){return DONE;}; virtual UChar last(){return DONE;}; @@ -121,7 +121,7 @@ public: return pos; }; - virtual UBool hasPrevious() const {return TRUE;}; + virtual UBool hasPrevious() {return TRUE;}; SCharacterIterator& operator=(const SCharacterIterator& that){ text = that.text; @@ -974,7 +974,7 @@ public: } } - virtual UBool hasNext() const { + virtual UBool hasNext() { return pos0; } - virtual void getText(UnicodeString &result) const { + virtual void getText(UnicodeString &result) { result.setTo(s, LENGTHOF(s)); }