diff --git a/icu4c/source/test/intltest/allcoll.cpp b/icu4c/source/test/intltest/allcoll.cpp index d2d24dfa09..38c6f141fc 100644 --- a/icu4c/source/test/intltest/allcoll.cpp +++ b/icu4c/source/test/intltest/allcoll.cpp @@ -97,7 +97,9 @@ const Collator::EComparisonResult CollationDummyTest::results[] = { void CollationDummyTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/currcoll.cpp b/icu4c/source/test/intltest/currcoll.cpp index ebea01bcd5..9034ef9b86 100644 --- a/icu4c/source/test/intltest/currcoll.cpp +++ b/icu4c/source/test/intltest/currcoll.cpp @@ -96,7 +96,9 @@ void CollationCurrencyTest::currencyTest(/*char *par*/) } Collator::EComparisonResult compareResult = c->compare(source, target); - Collator::EComparisonResult incResult = c->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = c->compare(src, trg); CollationKey sourceKey, targetKey; UErrorCode status = U_ZERO_ERROR; diff --git a/icu4c/source/test/intltest/dacoll.cpp b/icu4c/source/test/intltest/dacoll.cpp index 20e322628a..d0d3d20dfd 100644 --- a/icu4c/source/test/intltest/dacoll.cpp +++ b/icu4c/source/test/intltest/dacoll.cpp @@ -188,7 +188,9 @@ const UChar CollationDanishTest::testNTList[][CollationDanishTest::MAX_TOKEN_LEN void CollationDanishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/decoll.cpp b/icu4c/source/test/intltest/decoll.cpp index 69b7ad80e7..fa302738b7 100644 --- a/icu4c/source/test/intltest/decoll.cpp +++ b/icu4c/source/test/intltest/decoll.cpp @@ -91,7 +91,9 @@ const Collator::EComparisonResult CollationGermanTest::results[][2] = void CollationGermanTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/encoll.cpp b/icu4c/source/test/intltest/encoll.cpp index 90388547d6..3740a64a43 100644 --- a/icu4c/source/test/intltest/encoll.cpp +++ b/icu4c/source/test/intltest/encoll.cpp @@ -256,7 +256,9 @@ static const UChar testMore[][CollationEnglishTest::MAX_TOKEN_LEN] = { void CollationEnglishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/escoll.cpp b/icu4c/source/test/intltest/escoll.cpp index ca53f57019..8644d893f2 100644 --- a/icu4c/source/test/intltest/escoll.cpp +++ b/icu4c/source/test/intltest/escoll.cpp @@ -79,7 +79,9 @@ const Collator::EComparisonResult CollationSpanishTest::results[] = { void CollationSpanishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/ficoll.cpp b/icu4c/source/test/intltest/ficoll.cpp index 5e26b7dea0..283593b12a 100644 --- a/icu4c/source/test/intltest/ficoll.cpp +++ b/icu4c/source/test/intltest/ficoll.cpp @@ -66,7 +66,9 @@ const Collator::EComparisonResult CollationFinnishTest::results[] = { void CollationFinnishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/frcoll.cpp b/icu4c/source/test/intltest/frcoll.cpp index 49a7a99f0b..0ad2bc9831 100644 --- a/icu4c/source/test/intltest/frcoll.cpp +++ b/icu4c/source/test/intltest/frcoll.cpp @@ -162,7 +162,9 @@ const UChar CollationFrenchTest::testBugs[][CollationFrenchTest::MAX_TOKEN_LEN] void CollationFrenchTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/g7coll.cpp b/icu4c/source/test/intltest/g7coll.cpp index 026b981034..a8b4f079b7 100644 --- a/icu4c/source/test/intltest/g7coll.cpp +++ b/icu4c/source/test/intltest/g7coll.cpp @@ -94,7 +94,9 @@ const int32_t G7CollationTest::results[G7CollationTest::TESTLOCALES][G7Collation void G7CollationTest::doTest( Collator* myCollation, UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/jacoll.cpp b/icu4c/source/test/intltest/jacoll.cpp index e62999dc5b..4a904884ab 100644 --- a/icu4c/source/test/intltest/jacoll.cpp +++ b/icu4c/source/test/intltest/jacoll.cpp @@ -1,7 +1,7 @@ /******************************************************************** * COPYRIGHT: * Copyright (c) 1997-1999, International Business Machines Corporation and - * others. All Rights Reserved. + * others. All Rights Reserved. ********************************************************************/ #ifndef _COLL #include "unicode/coll.h" @@ -83,7 +83,9 @@ const Collator::EComparisonResult CollationKanaTest::results[] = { void CollationKanaTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/mnkytst.cpp b/icu4c/source/test/intltest/mnkytst.cpp index c15987ed23..82c430309f 100644 --- a/icu4c/source/test/intltest/mnkytst.cpp +++ b/icu4c/source/test/intltest/mnkytst.cpp @@ -264,7 +264,9 @@ void CollationMonkeyTest::TestRules(/* char* par */){ void CollationMonkeyTest::doTest(RuleBasedCollator *myCollation, UnicodeString mysource, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); diff --git a/icu4c/source/test/intltest/regcoll.cpp b/icu4c/source/test/intltest/regcoll.cpp index f852b0f223..23a720c9e9 100644 --- a/icu4c/source/test/intltest/regcoll.cpp +++ b/icu4c/source/test/intltest/regcoll.cpp @@ -1119,7 +1119,9 @@ void CollationRegressionTest::compareArray(Collator &c, } Collator::EComparisonResult compareResult = c.compare(source, target); - Collator::EComparisonResult incResult = c.compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = c.compare(src, trg); CollationKey sourceKey, targetKey; UErrorCode status = U_ZERO_ERROR; diff --git a/icu4c/source/test/intltest/trcoll.cpp b/icu4c/source/test/intltest/trcoll.cpp index d8aeed8572..64655348b8 100644 --- a/icu4c/source/test/intltest/trcoll.cpp +++ b/icu4c/source/test/intltest/trcoll.cpp @@ -83,7 +83,9 @@ const Collator::EComparisonResult CollationTurkishTest::results[] = { void CollationTurkishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result) { Collator::EComparisonResult compareResult = myCollation->compare(source, target); - Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target)); + SimpleFwdCharIterator src(source); + SimpleFwdCharIterator trg(target); + Collator::EComparisonResult incResult = myCollation->compare(src, trg); CollationKey sortKey1, sortKey2; UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );