ICU-11929 (C) Rename MeasureUnit methods createGeneric, createRevolution

X-SVN-Rev: 38009

diff --git a/icu4c/source/i18n/measunit.cpp b/icu4c/source/i18n/measunit.cpp
index 4ec524418a76ffa52d162aac289e3b4a18a94f3a..35a56df5d7a586821c9f03452014ca7ca077e73c 100644 (file)
--- a/icu4c/source/i18n/measunit.cpp
+++ b/icu4c/source/i18n/measunit.cpp
@@ -527,7 +527,7 @@ MeasureUnit *MeasureUnit::createRadian(UErrorCode &status) {
     return MeasureUnit::create(1, 3, status);
 }
 
-MeasureUnit *MeasureUnit::createRevolution(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createRevolutionAngle(UErrorCode &status) {
     return MeasureUnit::create(1, 4, status);
 }
 
@@ -915,7 +915,7 @@ MeasureUnit *MeasureUnit::createFahrenheit(UErrorCode &status) {
     return MeasureUnit::create(17, 1, status);
 }
 
-MeasureUnit *MeasureUnit::createGeneric(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createGenericTemperature(UErrorCode &status) {
     return MeasureUnit::create(17, 2, status);
 }
 

diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h
index b32f216f6b644790bab85511d1086ba234a52c47..196832f60cfc16c5d2526d8298a48ecdcf67e1ba 100644 (file)
--- a/icu4c/source/i18n/unicode/measunit.h
+++ b/icu4c/source/i18n/unicode/measunit.h
@@ -254,7 +254,7 @@ class U_I18N_API MeasureUnit: public UObject {
      * @param status ICU error code.
      * @draft ICU 56
      */
-    static MeasureUnit *createRevolution(UErrorCode &status);
+    static MeasureUnit *createRevolutionAngle(UErrorCode &status);
 #endif  /* U_HIDE_DRAFT_API */
 
     /**
@@ -1038,9 +1038,9 @@ class U_I18N_API MeasureUnit: public UObject {
      * Returns unit of temperature: generic.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 55
+     * @draft ICU 56
      */
-    static MeasureUnit *createGeneric(UErrorCode &status);
+    static MeasureUnit *createGenericTemperature(UErrorCode &status);
 #endif  /* U_HIDE_DRAFT_API */
 
     /**

diff --git a/icu4c/source/test/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp
index d98e2b33665fa08f67340682437fbe8733886b47..f2f2d09734c8f2a0885eb6fef16d5195e0960eff 100644 (file)
--- a/icu4c/source/test/intltest/measfmttest.cpp
+++ b/icu4c/source/test/intltest/measfmttest.cpp
@@ -424,7 +424,7 @@ void MeasureFormatTest::TestCompatible55_1() {
     measureUnit.adoptInstead(MeasureUnit::createMilePerHour(status));
     measureUnit.adoptInstead(MeasureUnit::createCelsius(status));
     measureUnit.adoptInstead(MeasureUnit::createFahrenheit(status));
-    measureUnit.adoptInstead(MeasureUnit::createGeneric(status));
+    measureUnit.adoptInstead(MeasureUnit::createGenericTemperature(status));
     measureUnit.adoptInstead(MeasureUnit::createKelvin(status));
     measureUnit.adoptInstead(MeasureUnit::createAcreFoot(status));
     measureUnit.adoptInstead(MeasureUnit::createBushel(status));
@@ -460,7 +460,7 @@ void MeasureFormatTest::TestCompatible56_1() {
     measureUnit.adoptInstead(MeasureUnit::createArcSecond(status));
     measureUnit.adoptInstead(MeasureUnit::createDegree(status));
     measureUnit.adoptInstead(MeasureUnit::createRadian(status));
-    measureUnit.adoptInstead(MeasureUnit::createRevolution(status));
+    measureUnit.adoptInstead(MeasureUnit::createRevolutionAngle(status));
     measureUnit.adoptInstead(MeasureUnit::createAcre(status));
     measureUnit.adoptInstead(MeasureUnit::createHectare(status));
     measureUnit.adoptInstead(MeasureUnit::createSquareCentimeter(status));
@@ -557,7 +557,7 @@ void MeasureFormatTest::TestCompatible56_1() {
     measureUnit.adoptInstead(MeasureUnit::createMilePerHour(status));
     measureUnit.adoptInstead(MeasureUnit::createCelsius(status));
     measureUnit.adoptInstead(MeasureUnit::createFahrenheit(status));
-    measureUnit.adoptInstead(MeasureUnit::createGeneric(status));
+    measureUnit.adoptInstead(MeasureUnit::createGenericTemperature(status));
     measureUnit.adoptInstead(MeasureUnit::createKelvin(status));
     measureUnit.adoptInstead(MeasureUnit::createAcreFoot(status));
     measureUnit.adoptInstead(MeasureUnit::createBushel(status));