Fix errors caused by ICU 63

Change-Id: I4afc3db0105e25fae8f7a546f098de289f7b1fcc
Signed-off-by: Lukasz Pik <lu.pik@samsung.com>

diff --git a/src/utils_i18n_alpha_idx.cpp b/src/utils_i18n_alpha_idx.cpp
index 734225ddc354919fb35abd491ee00c5ea36a283b..f399863aef2f51089feee621bd0eea297c66e8da 100644 (file)
--- a/src/utils_i18n_alpha_idx.cpp
+++ b/src/utils_i18n_alpha_idx.cpp
@@ -22,6 +22,10 @@
 #include <unicode/locid.h>
 #include <unicode/alphaindex.h>
 
+using icu::AlphabeticIndex;
+using icu::Locale;
+using icu::UnicodeString;
+
 int i18n_alpha_idx_create(const char *language, const char *country,
                           i18n_alpha_idx_h *index)
 {

diff --git a/src/utils_i18n_date_interval.cpp b/src/utils_i18n_date_interval.cpp
index 0b18be14268ff603059ff96cd896b50fc2be0221..b1cdf507db04d9c22944bbff066925d15ad0d67b 100644 (file)
--- a/src/utils_i18n_date_interval.cpp
+++ b/src/utils_i18n_date_interval.cpp
@@ -19,6 +19,8 @@
 
 #include <unicode/dtintrv.h>
 
+using icu::DateInterval;
+
 int i18n_date_interval_create(i18n_udate from_date, i18n_udate to_date, i18n_date_interval_h *date_interval)
 {
        retv_if(date_interval == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_date_interval_format.cpp b/src/utils_i18n_date_interval_format.cpp
index a6655468de4a895f59d6c5008e3e3d065e8ecc85..35cff1c014248c2bcfdb4c1784b89e4f9892dd79 100644 (file)
--- a/src/utils_i18n_date_interval_format.cpp
+++ b/src/utils_i18n_date_interval_format.cpp
@@ -22,6 +22,14 @@
 #include <malloc.h>
 #include <unicode/dtitvfmt.h>
 
+using icu::UnicodeString;
+using icu::Locale;
+using icu::TimeZone;
+using icu::Calendar;
+using icu::FieldPosition;
+using icu::DateInterval;
+using icu::DateIntervalFormat;
+
 int i18n_date_interval_fmt_create(const char *skeleton, i18n_date_interval_fmt_h *date_interval_fmt)
 {
     retv_if(date_interval_fmt == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_field_position.cpp b/src/utils_i18n_field_position.cpp
index 8c4c9d7360d01550701639e98f4398adbb6ccbcb..704b6ba3aa41abff888ab506d0b6de36f5c04718 100644 (file)
--- a/src/utils_i18n_field_position.cpp
+++ b/src/utils_i18n_field_position.cpp
@@ -19,6 +19,8 @@
 
 #include <unicode/fieldpos.h>
 
+using icu::FieldPosition;
+
 int i18n_field_position_create(i18n_field_position_h *field_position)
 {
     retv_if(field_position == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_format.cpp b/src/utils_i18n_format.cpp
index 9953e5e3a5d19c062a7a0959371be7c77e0fc0f9..a16a4b9c237f092cba9823d8e61c6a54fa77c3d8 100644 (file)
--- a/src/utils_i18n_format.cpp
+++ b/src/utils_i18n_format.cpp
@@ -21,6 +21,13 @@
 #include <unicode/format.h>
 #include <malloc.h>
 
+using icu::UnicodeString;
+using icu::Locale;
+using icu::Formattable;
+using icu::FieldPosition;
+using icu::ParsePosition;
+using icu::Format;
+
 int i18n_format_destroy(i18n_format_h format)
 {
     retv_if(format == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_formattable.cpp b/src/utils_i18n_formattable.cpp
index 968a8e7f5c11eaa79e618febd1c0ca250b2644c6..a767c6e7784bb6f486f380e5f28dc75f6ef03244 100644 (file)
--- a/src/utils_i18n_formattable.cpp
+++ b/src/utils_i18n_formattable.cpp
@@ -21,6 +21,9 @@
 #include <unicode/fmtable.h>
 #include <unicode/ustring.h>
 
+using icu::UnicodeString;
+using icu::Formattable;
+
 int i18n_formattable_create_default(i18n_formattable_h *formattable)
 {
     retv_if(formattable == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_immutable_idx.cpp b/src/utils_i18n_immutable_idx.cpp
index 0d24e923115bd8eae4fd26fac88f15a35473841c..4ccca447bcb79186826750923e992bc763023879 100644 (file)
--- a/src/utils_i18n_immutable_idx.cpp
+++ b/src/utils_i18n_immutable_idx.cpp
@@ -21,6 +21,9 @@
 #include <string.h>
 #include <unicode/alphaindex.h>
 
+using icu::AlphabeticIndex;
+using icu::UnicodeString;
+
 int i18n_immutable_idx_create(i18n_alpha_idx_h index, i18n_immutable_idx_h *immutable_index)
 {
        retv_if(index == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_loc_disp_names.cpp b/src/utils_i18n_loc_disp_names.cpp
index f03cd2e95cf3760914d7d751115b439995a67e37..7f11c13f7a69802ae4ebf3b26f01709375fb5bfe 100644 (file)
--- a/src/utils_i18n_loc_disp_names.cpp
+++ b/src/utils_i18n_loc_disp_names.cpp
@@ -20,6 +20,10 @@
 
 #include <unicode/locdspnm.h>
 
+using icu::Locale;
+using icu::UnicodeString;
+using icu::LocaleDisplayNames;
+
 int i18n_loc_disp_names_create(const char *locale, i18n_loc_disp_names_h *loc_disp_names)
 {
        retv_if(loc_disp_names == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_measure.cpp b/src/utils_i18n_measure.cpp
index 037b864dbda5e88647fbe9ce3f7dec6a972c6604..58f95a53e09d596132b6596ed61a7331231239f4 100644 (file)
--- a/src/utils_i18n_measure.cpp
+++ b/src/utils_i18n_measure.cpp
@@ -20,6 +20,10 @@
 #include <unicode/measure.h>
 #include <unicode/measunit.h>
 
+using icu::Formattable;
+using icu::MeasureUnit;
+using icu::Measure;
+
 int i18n_measure_create(const i18n_formattable_h formattable, i18n_measure_unit_h measure_unit, i18n_measure_h *measure)
 {
     retv_if(measure == NULL || formattable == NULL || measure_unit == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_measure_format.cpp b/src/utils_i18n_measure_format.cpp
index 70cd9cb897c14c8ee0a60c5ec745a6d138317b6a..1b0e1f29f3f03b2abd0c3de669773b90ddbad00a 100644 (file)
--- a/src/utils_i18n_measure_format.cpp
+++ b/src/utils_i18n_measure_format.cpp
@@ -23,6 +23,15 @@
 #include <unicode/measfmt.h>
 #include <unicode/measure.h>
 
+using icu::Locale;
+using icu::UnicodeString;
+using icu::Measure;
+using icu::Formattable;
+using icu::FieldPosition;
+using icu::ParsePosition;
+using icu::MeasureUnit;
+using icu::MeasureFormat;
+
 int i18n_measure_format_create(const char *language,
                                                           const char *country,
                                                           i18n_umeasure_format_width_e width,

diff --git a/src/utils_i18n_measure_unit.cpp b/src/utils_i18n_measure_unit.cpp
index f316261eb7f7436f1ee9715410920c9ec8cf1830..7c26d4fccf7c8a2292d2de61a5514736b2c7aa37 100644 (file)
--- a/src/utils_i18n_measure_unit.cpp
+++ b/src/utils_i18n_measure_unit.cpp
@@ -21,6 +21,9 @@
 #include <unicode/strenum.h>
 #include <string.h>
 
+using icu::StringEnumeration;
+using icu::MeasureUnit;
+
 int i18n_measure_unit_create(i18n_measure_unit_h *measure_unit)
 {
     retv_if(measure_unit == NULL, I18N_ERROR_INVALID_PARAMETER);
@@ -1509,4 +1512,3 @@ int i18n_measure_unit_create_teaspoon(i18n_measure_unit_h *measure_unit)
 
     return _i18n_error_mapping(status);
 }
-

diff --git a/src/utils_i18n_parse_position.cpp b/src/utils_i18n_parse_position.cpp
index ef498677894c0145b9de398b7f49b7680a23181b..0bf8a332ab7ab7953db7acc5a6cccea8fe23bae2 100644 (file)
--- a/src/utils_i18n_parse_position.cpp
+++ b/src/utils_i18n_parse_position.cpp
@@ -19,6 +19,8 @@
 
 #include <unicode/parsepos.h>
 
+using icu::ParsePosition;
+
 int i18n_parse_position_create(i18n_parse_position_h *parse_position)
 {
     retv_if(parse_position == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_plural_format.cpp b/src/utils_i18n_plural_format.cpp
index c109a2d46b79d9ab665821b41e92038372662876..9515af28b8786e3e628120b45de8886335bca7ba 100644 (file)
--- a/src/utils_i18n_plural_format.cpp
+++ b/src/utils_i18n_plural_format.cpp
@@ -21,6 +21,14 @@
 #include <malloc.h>
 #include <unicode/plurfmt.h>
 
+using icu::Locale;
+using icu::UnicodeString;
+using icu::FieldPosition;
+using icu::Formattable;
+using icu::NumberFormat;
+using icu::PluralRules;
+using icu::PluralFormat;
+
 int i18n_plural_format_create(i18n_plural_format_h *plural_format)
 {
        retv_if(plural_format == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_plural_rules.cpp b/src/utils_i18n_plural_rules.cpp
index 6ce46121373d27c3e36ee77fbe609a47fd9812d3..08cee572cff093d0bf8a82a0f70c2de90fb2a5f1 100644 (file)
--- a/src/utils_i18n_plural_rules.cpp
+++ b/src/utils_i18n_plural_rules.cpp
@@ -20,6 +20,11 @@
 
 #include <unicode/plurrule.h>
 
+using icu::Locale;
+using icu::StringEnumeration;
+using icu::UnicodeString;
+using icu::PluralRules;
+
 int i18n_plural_rules_create(i18n_plural_rules_h *plural_rules)
 {
        retv_if(plural_rules == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_simple_date_format.cpp b/src/utils_i18n_simple_date_format.cpp
index 372a6d48941fbd53ffe627e9aeb1708f0969634e..ed97fb65999a133ac9170f891f1daa4e57196183 100644 (file)
--- a/src/utils_i18n_simple_date_format.cpp
+++ b/src/utils_i18n_simple_date_format.cpp
@@ -20,6 +20,12 @@
 
 #include <unicode/smpdtfmt.h>
 
+using icu::UnicodeString;
+using icu::Locale;
+using icu::Calendar;
+using icu::FieldPosition;
+using icu::ParsePosition;
+using icu::SimpleDateFormat;
 
 int i18n_simple_date_fmt_create(i18n_simple_date_fmt_h *simple_date_fmt)
 {
@@ -354,4 +360,3 @@ int i18n_simple_date_fmt_set_context(i18n_simple_date_fmt_h simple_date_fmt,
 
     return _i18n_error_mapping(status);
 }
-

diff --git a/src/utils_i18n_timezone.cpp b/src/utils_i18n_timezone.cpp
index 99f992e6108227455a9dadeef967393b83c34c7b..9242d31d9f03525ad129f5807a9ee6b80b5abf69 100755 (executable)
--- a/src/utils_i18n_timezone.cpp
+++ b/src/utils_i18n_timezone.cpp
@@ -31,6 +31,11 @@
 #include <unicode/uchar.h>
 #include <unicode/locid.h>
 
+using icu::UnicodeString;
+using icu::StringEnumeration;
+using icu::Locale;
+using icu::TimeZone;
+
 int i18n_timezone_create_unknown(i18n_timezone_h *timezone)
 {
     retv_if(timezone == NULL, I18N_ERROR_INVALID_PARAMETER);

diff --git a/src/utils_i18n_ulocale.cpp b/src/utils_i18n_ulocale.cpp
index a7fdaf2c8ae0cf102128772474380d02b990b8df..0eee1561fb34452f0c7b740e5599a53c5aa0d6c9 100644 (file)
--- a/src/utils_i18n_ulocale.cpp
+++ b/src/utils_i18n_ulocale.cpp
@@ -19,6 +19,8 @@
 #include <utils_i18n_ulocale.h>
 #include <utils_i18n_private.h>
 
+using icu::Locale;
+
 int i18n_ulocale_get_default(const char **locale)
 {
        retv_if(locale == NULL, I18N_ERROR_INVALID_PARAMETER);