organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 13:35:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-3668 back out risky character iterator changes!

Browse source 
X-SVN-Rev: 14805
This commit is contained in:
Alan Liu 2004-03-30 22:39:45 +00:00
parent cd78ce4444
commit a1bd7f50bf
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/schriter.cpp
View file

@ -109,7 +109,7 @@ StringCharacterIterator::setText(const UnicodeString& newText) {
}
void
StringCharacterIterator::getText(UnicodeString& result) const {
StringCharacterIterator::getText(UnicodeString& result) {
result = text;
}
U_NAMESPACE_END

6
icu4c/source/common/uchriter.cpp
View file

@ -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);
}

6
icu4c/source/common/unicode/chariter.h
View file

@ -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:
/**

2
icu4c/source/common/unicode/schriter.h
View file

@ -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)

6
icu4c/source/common/unicode/uchriter.h
View file

@ -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)

12
icu4c/source/test/intltest/citrtest.cpp
View file

@ -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 pos<LENGTHOF(s);
}
@ -1053,11 +1053,11 @@ public:
}
}
virtual UBool hasPrevious() const {
virtual UBool hasPrevious() {
return pos>0;
}
virtual void getText(UnicodeString &result) const {
virtual void getText(UnicodeString &result) {
result.setTo(s, LENGTHOF(s));
}