small refactoring to reduce memory usage of static data

2 files changed, 6 insertions, 6 deletions

diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 00132d7..4898e10 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -772,7 +772,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
    Instead it can return a "Windows code". This maps windows codes to ISO country names. */
 
 struct WindowsToISOListElt {
-    int windows_code;
+    ushort windows_code;
     char iso_name[6];
 };
 
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h
index 37f59a4..e0eecf3 100644
--- a/src/corelib/tools/qlocale_data_p.h
+++ b/src/corelib/tools/qlocale_data_p.h
@@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE
  */
 struct CountryLanguage
 {
-    quint32 languageId;
-    quint32 countryId;
+    quint16 languageId;
+    quint16 countryId;
 };
 static const CountryLanguage ImperialMeasurementSystems[] = {
     { 31, 225 },
@@ -83,7 +83,7 @@ static const int ImperialMeasurementSystemsCount =
 */
 
 
-static const uint locale_index[] = {
+static const quint16 locale_index[] = {
      0, // unused
      0, // C
      0, // Abkhazian
@@ -2313,7 +2313,7 @@ static const char language_name_list[] =
 "Chewa\0"
 ;
 
-static const uint language_name_index[] = {
+static const quint16 language_name_index[] = {
      0, // Unused
      8, // C
     10, // Abkhazian
@@ -2727,7 +2727,7 @@ static const char country_name_list[] =
 "SerbiaAndMontenegro\0"
 ;
 
-static const uint country_name_index[] = {
+static const quint16 country_name_index[] = {
      0, // AnyCountry
      8, // Afghanistan
     20, // Albania