From 825d741f4e0dca15ce2c63d010d96c9cf2b4590d Mon Sep 17 00:00:00 2001
From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com>
Date: Sat, 28 Mar 2020 18:42:57 +0100
Subject: [PATCH] Rename getunitsdata.{cpp,h} to unitsdata.{cpp,h}

---
 icu4c/source/i18n/Makefile.in                         | 2 +-
 icu4c/source/i18n/complexunitsconverter.cpp           | 3 +--
 icu4c/source/i18n/complexunitsconverter.h             | 4 ++--
 icu4c/source/i18n/i18n.vcxproj                        | 4 ++--
 icu4c/source/i18n/i18n.vcxproj.filters                | 6 +++---
 icu4c/source/i18n/i18n_uwp.vcxproj                    | 6 +++---
 icu4c/source/i18n/unitconverter.cpp                   | 3 +--
 icu4c/source/i18n/unitconverter.h                     | 2 +-
 icu4c/source/i18n/{getunitsdata.cpp => unitsdata.cpp} | 2 +-
 icu4c/source/i18n/{getunitsdata.h => unitsdata.h}     | 0
 icu4c/source/i18n/unitsrouter.cpp                     | 1 -
 icu4c/source/i18n/unitsrouter.h                       | 2 +-
 icu4c/source/test/intltest/unitstest.cpp              | 2 +-
 13 files changed, 17 insertions(+), 20 deletions(-)
 rename icu4c/source/i18n/{getunitsdata.cpp => unitsdata.cpp} (99%)
 rename icu4c/source/i18n/{getunitsdata.h => unitsdata.h} (100%)

diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in
index 013f5ba1891..10f35a866af 100644
--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@@ -115,7 +115,7 @@ numparse_affixes.o numparse_compositions.o numparse_validators.o \
 numrange_fluent.o numrange_impl.o \
 erarules.o \
 formattedvalue.o formattedval_iterimpl.o formattedval_sbimpl.o formatted_string_builder.o \
-unitconverter.o unitsrouter.o complexunitsconverter.o getunitsdata.o
+unitconverter.o unitsrouter.o complexunitsconverter.o unitsdata.o
 
 ## Header files to install
 HEADERS = $(srcdir)/unicode/*.h
diff --git a/icu4c/source/i18n/complexunitsconverter.cpp b/icu4c/source/i18n/complexunitsconverter.cpp
index e9dae22388d..1b6389b5953 100644
--- a/icu4c/source/i18n/complexunitsconverter.cpp
+++ b/icu4c/source/i18n/complexunitsconverter.cpp
@@ -11,7 +11,6 @@
 #include "uassert.h"
 #include "unicode/fmtable.h"
 #include "unitconverter.h"
-#include "getunitsdata.h"
 
 U_NAMESPACE_BEGIN
 
@@ -93,4 +92,4 @@ MaybeStackVector<Measure> ComplexUnitsConverter::convert(double quantity, UError
 
 U_NAMESPACE_END
 
-#endif /* #if !UCONFIG_NO_FORMATTING */
\ No newline at end of file
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/complexunitsconverter.h b/icu4c/source/i18n/complexunitsconverter.h
index e0bd4476504..d021ed9cc3a 100644
--- a/icu4c/source/i18n/complexunitsconverter.h
+++ b/icu4c/source/i18n/complexunitsconverter.h
@@ -8,11 +8,11 @@
 #define __COMPLEXUNITSCONVERTER_H__
 
 #include "cmemory.h"
-#include "unitconverter.h"
-#include "getunitsdata.h"
 #include "unicode/errorcode.h"
 #include "unicode/measunit.h"
 #include "unicode/measure.h"
+#include "unitconverter.h"
+#include "unitsdata.h"
 
 U_NAMESPACE_BEGIN
 
diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index c124d8fce45..cb26ceca327 100644
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -269,7 +269,7 @@
     <ClCompile Include="unitconverter.cpp" />
     <ClCompile Include="complexunitsconverter.cpp" />
     <ClCompile Include="unitsrouter.cpp" />
-    <ClCompile Include="getunitsdata.cpp" />
+    <ClCompile Include="unitsdata.cpp" />
     <ClCompile Include="unum.cpp" />
     <ClCompile Include="unumsys.cpp" />
     <ClCompile Include="upluralrules.cpp" />
@@ -507,7 +507,7 @@
     <ClInclude Include="unitconverter.h" />
     <ClInclude Include="complexunitsconverter.h" />
     <ClInclude Include="unitsrouter.h" />
-    <ClInclude Include="getunitsdata.h" />
+    <ClInclude Include="unitsdata.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="i18n.rc" />
diff --git a/icu4c/source/i18n/i18n.vcxproj.filters b/icu4c/source/i18n/i18n.vcxproj.filters
index c1ce5b76c5a..d78f8f80d43 100644
--- a/icu4c/source/i18n/i18n.vcxproj.filters
+++ b/icu4c/source/i18n/i18n.vcxproj.filters
@@ -660,7 +660,7 @@
     <ClCompile Include="unitsrouter.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
-    <ClCompile Include="getunitsdata.cpp">
+    <ClCompile Include="unitsdata.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
   </ItemGroup>
@@ -1016,7 +1016,7 @@
     <ClInclude Include="unitsrouter.h">
       <Filter>formatting</Filter>
     </ClInclude>
-    <ClInclude Include="getunitsdata.h">
+    <ClInclude Include="unitsdata.h">
       <Filter>formatting</Filter>
     </ClInclude>
     <ClInclude Include="vzone.h">
@@ -1259,4 +1259,4 @@
       <Filter>misc</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj
index c8bdb9309a4..590473b1a3d 100644
--- a/icu4c/source/i18n/i18n_uwp.vcxproj
+++ b/icu4c/source/i18n/i18n_uwp.vcxproj
@@ -488,7 +488,7 @@
     <ClCompile Include="unitconverter.cpp" />
     <ClCompile Include="complexunitsconverter.cpp" />
     <ClCompile Include="unitsrouter.cpp" />
-    <ClCompile Include="getunitsdata.cpp" />
+    <ClCompile Include="unitsdata.cpp" />
     <ClCompile Include="unum.cpp" />
     <ClCompile Include="unumsys.cpp" />
     <ClCompile Include="upluralrules.cpp" />
@@ -726,7 +726,7 @@
     <ClInclude Include="unitconverter.h" />
     <ClInclude Include="complexunitsconverter.h" />
     <ClInclude Include="unitsrouter.h" />
-    <ClInclude Include="getunitsdata.h" />
+    <ClInclude Include="unitsdata.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="i18n.rc" />
@@ -737,4 +737,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(SkipUWP)'!='true'" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/icu4c/source/i18n/unitconverter.cpp b/icu4c/source/i18n/unitconverter.cpp
index 36104ae5f18..c5e673b8dc1 100644
--- a/icu4c/source/i18n/unitconverter.cpp
+++ b/icu4c/source/i18n/unitconverter.cpp
@@ -9,7 +9,6 @@
 
 #include "charstr.h"
 #include "double-conversion.h"
-#include "getunitsdata.h"
 #include "measunit_impl.h"
 #include "resource.h"
 #include "uassert.h"
@@ -502,4 +501,4 @@ double UnitConverter::convert(double inputValue) const {
 
 U_NAMESPACE_END
 
-#endif /* #if !UCONFIG_NO_FORMATTING */
\ No newline at end of file
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/unitconverter.h b/icu4c/source/i18n/unitconverter.h
index 0963b1ec9d6..e33ed0920dc 100644
--- a/icu4c/source/i18n/unitconverter.h
+++ b/icu4c/source/i18n/unitconverter.h
@@ -8,11 +8,11 @@
 #define __UNITCONVERTER_H__
 
 #include "cmemory.h"
-#include "getunitsdata.h"
 #include "unicode/errorcode.h"
 #include "unicode/measunit.h"
 #include "unicode/measure.h"
 #include "unicode/stringpiece.h"
+#include "unitsdata.h"
 
 U_NAMESPACE_BEGIN
 // Data Skeleton.
diff --git a/icu4c/source/i18n/getunitsdata.cpp b/icu4c/source/i18n/unitsdata.cpp
similarity index 99%
rename from icu4c/source/i18n/getunitsdata.cpp
rename to icu4c/source/i18n/unitsdata.cpp
index 38740c64555..2f751562122 100644
--- a/icu4c/source/i18n/getunitsdata.cpp
+++ b/icu4c/source/i18n/unitsdata.cpp
@@ -9,9 +9,9 @@
 
 #include "cmemory.h"
 #include "cstring.h"
-#include "getunitsdata.h"
 #include "number_decimalquantity.h"
 #include "resource.h"
+#include "unitsdata.h"
 #include "uresimp.h"
 
 U_NAMESPACE_BEGIN
diff --git a/icu4c/source/i18n/getunitsdata.h b/icu4c/source/i18n/unitsdata.h
similarity index 100%
rename from icu4c/source/i18n/getunitsdata.h
rename to icu4c/source/i18n/unitsdata.h
diff --git a/icu4c/source/i18n/unitsrouter.cpp b/icu4c/source/i18n/unitsrouter.cpp
index db6018c9f47..b5464b81691 100644
--- a/icu4c/source/i18n/unitsrouter.cpp
+++ b/icu4c/source/i18n/unitsrouter.cpp
@@ -9,7 +9,6 @@
 
 #include "cmemory.h"
 #include "cstring.h"
-#include "getunitsdata.h"
 #include "number_decimalquantity.h"
 #include "resource.h"
 #include "unitsrouter.h"
diff --git a/icu4c/source/i18n/unitsrouter.h b/icu4c/source/i18n/unitsrouter.h
index 8fe7bb463b7..0b25c63c119 100644
--- a/icu4c/source/i18n/unitsrouter.h
+++ b/icu4c/source/i18n/unitsrouter.h
@@ -10,11 +10,11 @@
 #include "charstr.h" // CharString
 #include "cmemory.h"
 #include "complexunitsconverter.h"
-#include "getunitsdata.h"
 #include "unicode/errorcode.h"
 #include "unicode/measunit.h"
 #include "unicode/measure.h"
 #include "unicode/stringpiece.h"
+#include "unitsdata.h"
 
 U_NAMESPACE_BEGIN
 
diff --git a/icu4c/source/test/intltest/unitstest.cpp b/icu4c/source/test/intltest/unitstest.cpp
index d6268ea3f11..a130e38dc0c 100644
--- a/icu4c/source/test/intltest/unitstest.cpp
+++ b/icu4c/source/test/intltest/unitstest.cpp
@@ -9,7 +9,6 @@
 
 #include "charstr.h"
 #include "filestrm.h"
-#include "getunitsdata.h"
 #include "intltest.h"
 #include "number_decimalquantity.h"
 #include "unicode/ctest.h"
@@ -17,6 +16,7 @@
 #include "unicode/unistr.h"
 #include "unicode/unum.h"
 #include "unitconverter.h"
+#include "unitsdata.h"
 #include "unitsrouter.h"
 #include "uparse.h"
 
-- 
2.40.0