organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 17:01:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-12992 change UnicodeString functions from const UChar * to ConstChar16Ptr where possible

Browse source 
X-SVN-Rev: 39719
This commit is contained in:
Markus Scherer 2017-03-01 22:06:25 +00:00
parent 4c1c730f57
commit b9ef7bcac4
5 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/common/caniter.cpp
View file

@ -311,12 +311,12 @@ void U_EXPORT2 CanonicalIterator::permute(UnicodeString &source, UBool skipZeros
// see what the permutations of the characters before and after this one are
//Hashtable *subpermute = permute(source.substring(0,i) + source.substring(i + UTF16.getCharCount(cp)));
permute(subPermuteString.replace(i, U16_LENGTH(cp), NULL, 0), skipZeros, &subpermute, status);
permute(subPermuteString.remove(i, U16_LENGTH(cp)), skipZeros, &subpermute, status);
/* Test for buffer overflows */
if(U_FAILURE(status)) {
return;
}
// The upper replace is destructive. The question is do we have to make a copy, or we don't care about the contents
// The upper remove is destructive. The question is do we have to make a copy, or we don't care about the contents
// of source at this point.
// prefix this character to all of them

42
icu4c/source/common/unicode/unistr.h
View file

@ -119,7 +119,7 @@ class UnicodeStringAppendable; // unicode/appendable.h
* <code>NUL</code>, must be specified as a constant.
* @stable ICU 2.0
*/
#define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const UChar *)u ## cs, _length)
#define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, u ## cs, _length)
/**
* Unicode String literals in C++.
@ -436,7 +436,7 @@ public:
* in <code>srcChars</code>.
* @stable ICU 2.0
*/
inline int8_t compare(const UChar *srcChars,
inline int8_t compare(ConstChar16Ptr srcChars,
int32_t srcLength) const;
/**
@ -590,7 +590,7 @@ public:
* in code point order
* @stable ICU 2.0
*/
inline int8_t compareCodePointOrder(const UChar *srcChars,
inline int8_t compareCodePointOrder(ConstChar16Ptr srcChars,
int32_t srcLength) const;
/**
@ -763,7 +763,7 @@ public:
* @return A negative, zero, or positive integer indicating the comparison result.
* @stable ICU 2.0
*/
inline int8_t caseCompare(const UChar *srcChars,
inline int8_t caseCompare(ConstChar16Ptr srcChars,
int32_t srcLength,
uint32_t options) const;
@ -881,7 +881,7 @@ public:
* FALSE otherwise
* @stable ICU 2.0
*/
inline UBool startsWith(const UChar *srcChars,
inline UBool startsWith(ConstChar16Ptr srcChars,
int32_t srcLength) const;
/**
@ -928,7 +928,7 @@ public:
* FALSE otherwise
* @stable ICU 2.0
*/
inline UBool endsWith(const UChar *srcChars,
inline UBool endsWith(ConstChar16Ptr srcChars,
int32_t srcLength) const;
/**
@ -1034,7 +1034,7 @@ public:
* or -1 if not found.
* @stable ICU 2.0
*/
inline int32_t indexOf(const UChar *srcChars,
inline int32_t indexOf(ConstChar16Ptr srcChars,
int32_t srcLength,
int32_t start,
int32_t length) const;
@ -1217,7 +1217,7 @@ public:
* or -1 if not found.
* @stable ICU 2.0
*/
inline int32_t lastIndexOf(const UChar *srcChars,
inline int32_t lastIndexOf(ConstChar16Ptr srcChars,
int32_t srcLength,
int32_t start,
int32_t length) const;
@ -2220,7 +2220,7 @@ public:
* @return a reference to this
* @stable ICU 2.0
*/
inline UnicodeString& append(const UChar *srcChars,
inline UnicodeString& append(ConstChar16Ptr srcChars,
int32_t srcLength);
/**
@ -2299,7 +2299,7 @@ public:
* @stable ICU 2.0
*/
inline UnicodeString& insert(int32_t start,
const UChar *srcChars,
ConstChar16Ptr srcChars,
int32_t srcLength);
/**
@ -2403,7 +2403,7 @@ public:
*/
inline UnicodeString& replace(int32_t start,
int32_t length,
const UChar *srcChars,
ConstChar16Ptr srcChars,
int32_t srcLength);
/**
@ -4011,7 +4011,7 @@ UnicodeString::compare(int32_t start,
{ return doCompare(start, _length, srcText, 0, srcText.length()); }
inline int8_t
UnicodeString::compare(const UChar *srcChars,
UnicodeString::compare(ConstChar16Ptr srcChars,
int32_t srcLength) const
{ return doCompare(0, length(), srcChars, 0, srcLength); }
@ -4072,7 +4072,7 @@ UnicodeString::compareCodePointOrder(int32_t start,
{ return doCompareCodePointOrder(start, _length, srcText, 0, srcText.length()); }
inline int8_t
UnicodeString::compareCodePointOrder(const UChar *srcChars,
UnicodeString::compareCodePointOrder(ConstChar16Ptr srcChars,
int32_t srcLength) const
{ return doCompareCodePointOrder(0, length(), srcChars, 0, srcLength); }
@ -4137,7 +4137,7 @@ UnicodeString::caseCompare(int32_t start,
}
inline int8_t
UnicodeString::caseCompare(const UChar *srcChars,
UnicodeString::caseCompare(ConstChar16Ptr srcChars,
int32_t srcLength,
uint32_t options) const {
return doCaseCompare(0, length(), srcChars, 0, srcLength, options);
@ -4223,7 +4223,7 @@ UnicodeString::indexOf(const UChar *srcChars,
}
inline int32_t
UnicodeString::indexOf(const UChar *srcChars,
UnicodeString::indexOf(ConstChar16Ptr srcChars,
int32_t srcLength,
int32_t start,
int32_t _length) const
@ -4264,7 +4264,7 @@ UnicodeString::indexOf(UChar32 c,
}
inline int32_t
UnicodeString::lastIndexOf(const UChar *srcChars,
UnicodeString::lastIndexOf(ConstChar16Ptr srcChars,
int32_t srcLength,
int32_t start,
int32_t _length) const
@ -4358,7 +4358,7 @@ UnicodeString::startsWith(const UnicodeString& srcText,
{ return doCompare(0, srcLength, srcText, srcStart, srcLength) == 0; }
inline UBool
UnicodeString::startsWith(const UChar *srcChars, int32_t srcLength) const {
UnicodeString::startsWith(ConstChar16Ptr srcChars, int32_t srcLength) const {
if(srcLength < 0) {
srcLength = u_strlen(srcChars);
}
@ -4388,7 +4388,7 @@ UnicodeString::endsWith(const UnicodeString& srcText,
}
inline UBool
UnicodeString::endsWith(const UChar *srcChars,
UnicodeString::endsWith(ConstChar16Ptr srcChars,
int32_t srcLength) const {
if(srcLength < 0) {
srcLength = u_strlen(srcChars);
@ -4428,7 +4428,7 @@ UnicodeString::replace(int32_t start,
inline UnicodeString&
UnicodeString::replace(int32_t start,
int32_t _length,
const UChar *srcChars,
ConstChar16Ptr srcChars,
int32_t srcLength)
{ return doReplace(start, _length, srcChars, 0, srcLength); }
@ -4658,7 +4658,7 @@ UnicodeString::append(const UChar *srcChars,
{ return doAppend(srcChars, srcStart, srcLength); }
inline UnicodeString&
UnicodeString::append(const UChar *srcChars,
UnicodeString::append(ConstChar16Ptr srcChars,
int32_t srcLength)
{ return doAppend(srcChars, 0, srcLength); }
@ -4700,7 +4700,7 @@ UnicodeString::insert(int32_t start,
inline UnicodeString&
UnicodeString::insert(int32_t start,
const UChar *srcChars,
ConstChar16Ptr srcChars,
int32_t srcLength)
{ return doReplace(start, 0, srcChars, 0, srcLength); }

4
icu4c/source/common/utext.cpp
View file

@ -2242,13 +2242,13 @@ unistrTextCopy(UText *ut,
}
if(move) {
// move: copy to destIndex, then replace original with nothing
// move: copy to destIndex, then remove original
int32_t segLength=limit32-start32;
us->copy(start32, limit32, destIndex32);
if(destIndex32<start32) {
start32+=segLength;
}
us->replace(start32, segLength, NULL, 0);
us->remove(start32, segLength);
} else {
// copy
us->copy(start32, limit32, destIndex32);

2
icu4c/source/test/intltest/srchtest.cpp
View file

@ -644,7 +644,7 @@ void StringSearchTest::TestOpenClose()
}
delete result;
text.append(0, 0x1);
// No-op: text.append(0, 0x1); -- what was intended here?
status = U_ZERO_ERROR;
result = new StringSearch(pattern, text, NULL, NULL, status);
if (U_SUCCESS(status)) {

4
icu4c/source/test/intltest/ustrtest.cpp
View file

@ -1615,8 +1615,8 @@ UnicodeStringTest::TestBogus() {
// test that NULL primitive input string values are treated like
// empty strings, not errors (bogus)
test2.setTo((UChar32)0x10005);
if(test2.insert(1, NULL, 1).length()!=2) {
errln("UniStr.insert(...NULL...) should not modify the string but does");
if(test2.insert(1, nullptr, 1).length()!=2) {
errln("UniStr.insert(...nullptr...) should not modify the string but does");
}
UErrorCode errorCode=U_ZERO_ERROR;