Also rename source to sourceUnit (matching baseUnit).

diff --git a/icu4c/source/i18n/getunitsdata.cpp b/icu4c/source/i18n/getunitsdata.cpp
index 16041ba0df89cac0f2be4e28292d3d74d03b1241..b98d119e1719b9905583370cdc230eacb5642f4a 100644 (file)
--- a/icu4c/source/i18n/getunitsdata.cpp
+++ b/icu4c/source/i18n/getunitsdata.cpp
@@ -92,7 +92,7 @@ class ConversionRateDataSink : public ResourceSink {
         fLastBaseUnit.appendInvariantChars(baseUnit, lenBaseUnit, status);
         if (U_FAILURE(status)) return;
         for (int32_t i = 0, len = outVector.length(); i < len; i++) {
-            if (strcmp(outVector[i]->source.data(), source) == 0 &&
+            if (strcmp(outVector[i]->sourceUnit.data(), source) == 0 &&
                 strcmp(outVector[i]->baseUnit.data(), fLastBaseUnit.data()) == 0) {
                 return;
             }
@@ -105,7 +105,7 @@ class ConversionRateDataSink : public ResourceSink {
             status = U_MEMORY_ALLOCATION_ERROR;
             return;
         } else {
-            cr->source.append(source, lenSource, status);
+            cr->sourceUnit.append(source, lenSource, status);
             cr->baseUnit.append(fLastBaseUnit.data(), fLastBaseUnit.length(), status);
             cr->factor.appendInvariantChars(factor, lenFactor, status);
             if (offset != NULL) cr->offset.appendInvariantChars(offset, lenOffset, status);

diff --git a/icu4c/source/i18n/getunitsdata.h b/icu4c/source/i18n/getunitsdata.h
index b1ee1ede6db40a79cb1eecdee31d90e57d9de337..3b29885dbfb0cf375ef4f84fa610a0863feec64d 100644 (file)
--- a/icu4c/source/i18n/getunitsdata.h
+++ b/icu4c/source/i18n/getunitsdata.h
@@ -21,15 +21,15 @@ U_NAMESPACE_BEGIN
 class U_I18N_API ConversionRateInfo {
   public:
     ConversionRateInfo() {};
-    ConversionRateInfo(StringPiece source, StringPiece baseUnit, StringPiece factor, StringPiece offset,
-                       UErrorCode &status)
-        : source(), baseUnit(), factor(), offset() {
-        this->source.append(source, status);
+    ConversionRateInfo(StringPiece sourceUnit, StringPiece baseUnit, StringPiece factor,
+                       StringPiece offset, UErrorCode &status)
+        : sourceUnit(), baseUnit(), factor(), offset() {
+        this->sourceUnit.append(sourceUnit, status);
         this->baseUnit.append(baseUnit, status);
         this->factor.append(factor, status);
         this->offset.append(offset, status);
     };
-    CharString source;
+    CharString sourceUnit;
     CharString baseUnit; // FIXME/WIP: baseUnit
     CharString factor;
     CharString offset;

diff --git a/icu4c/source/i18n/unitconverter.cpp b/icu4c/source/i18n/unitconverter.cpp
index 7b61eb5a2a88802db87b0228841750ea2039e74f..36104ae5f1885ebf43d44c9ef90e6224a0c3e2ff 100644 (file)
--- a/icu4c/source/i18n/unitconverter.cpp
+++ b/icu4c/source/i18n/unitconverter.cpp
@@ -190,7 +190,7 @@ const ConversionRateInfo& extractConversionRateInfo(StringPiece source,
                                              const MaybeStackVector<ConversionRateInfo> &ratesInfo,
                                              UErrorCode &status) {
     for (int i = 0, n = ratesInfo.length(); i < n; ++i) {
-        if (ratesInfo[i]->source == source) return *ratesInfo[i];
+        if (ratesInfo[i]->sourceUnit == source) return *ratesInfo[i];
     }
 
     status = U_INTERNAL_PROGRAM_ERROR;

diff --git a/icu4c/source/test/intltest/unitstest.cpp b/icu4c/source/test/intltest/unitstest.cpp
index 1719147e8ee821ecb1d24e8533c037dd87f8b422..d53e6e8539a04878196cfe17ff3af1ce63436b22 100644 (file)
--- a/icu4c/source/test/intltest/unitstest.cpp
+++ b/icu4c/source/test/intltest/unitstest.cpp
@@ -611,9 +611,10 @@ void UnitsTest::testGetConversionRateInfo() {
             ConversionRateInfo *cri;
             cri = conversionInfo[i];
             logln("* conversionInfo %d: source=\"%s\", baseUnit=\"%s\", factor=\"%s\", offset=\"%s\"", i,
-                  cri->source.data(), cri->baseUnit.data(), cri->factor.data(), cri->offset.data());
+                  cri->sourceUnit.data(), cri->baseUnit.data(), cri->factor.data(), cri->offset.data());
             assertTrue("ConversionRateInfo has source, baseUnit, and factor",
-                       cri->source.length() > 0 && cri->baseUnit.length() > 0 && cri->factor.length() > 0);
+                       cri->sourceUnit.length() > 0 && cri->baseUnit.length() > 0 &&
+                           cri->factor.length() > 0);
         }
     }
 }
@@ -662,9 +663,10 @@ void UnitsTest::testGetUnitsData() {
             ConversionRateInfo *cri;
             cri = conversionInfo[i];
             logln("* conversionInfo %d: source=\"%s\", baseUnit=\"%s\", factor=\"%s\", offset=\"%s\"", i,
-                  cri->source.data(), cri->baseUnit.data(), cri->factor.data(), cri->offset.data());
+                  cri->sourceUnit.data(), cri->baseUnit.data(), cri->factor.data(), cri->offset.data());
             assertTrue("ConversionRateInfo has source, baseUnit, and factor",
-                       cri->source.length() > 0 && cri->baseUnit.length() > 0 && cri->factor.length() > 0);
+                       cri->sourceUnit.length() > 0 && cri->baseUnit.length() > 0 &&
+                           cri->factor.length() > 0);
         }
         assertTrue("at least one unit preference obtained", unitPreferences.length() > 0);
         for (int i = 0; i < unitPreferences.length(); i++) {