diff --git a/frameworks/intl/include/index_util.h b/frameworks/intl/include/index_util.h index 5b80ddb837ff77e789daa41e86f6bb672edc8fd8..a769cb8206835a73e340e7573d61c3ab2f8bb8d6 100644 --- a/frameworks/intl/include/index_util.h +++ b/frameworks/intl/include/index_util.h @@ -31,7 +31,7 @@ public: std::string GetIndex(const std::string &String); private: - icu::AlphabeticIndex *index; + std::unique_ptr index; }; } } diff --git a/frameworks/intl/include/relative_time_format.h b/frameworks/intl/include/relative_time_format.h index e10c0b3697fe25d293b51a0a8b17253b706d1533..eab567f516f0b713991c38ffec2cab7a11aa253e 100644 --- a/frameworks/intl/include/relative_time_format.h +++ b/frameworks/intl/include/relative_time_format.h @@ -59,8 +59,8 @@ private: std::string styleString = "long"; std::string numeric = "always"; std::string numberingSystem; - LocaleInfo *localeInfo = nullptr; - icu::RelativeDateTimeFormatter *relativeTimeFormat = nullptr; + std::unique_ptr localeInfo; + std::unique_ptr relativeTimeFormat; UDateRelativeDateTimeFormatterStyle style = UDAT_STYLE_LONG; static std::unordered_map relativeUnits; static std::unordered_map relativeFormatStyle; diff --git a/frameworks/intl/src/date_time_format.cpp b/frameworks/intl/src/date_time_format.cpp index 84eeda64ecdd34207a2dfac9c894a5e941a2aab2..5213df74adaacad7618648f46f3c3bfdd9b15a8f 100755 --- a/frameworks/intl/src/date_time_format.cpp +++ b/frameworks/intl/src/date_time_format.cpp @@ -179,7 +179,7 @@ void DateTimeFormat::removeAmPmChar() if (patternString[i] != 'a') { continue; } - if ((i + 1) < patternString.length() && patternString[i+1] == 't') { + if ((i + 1) < patternString.length() && patternString[i + 1] == 't') { continue; } if (i == 0) { diff --git a/frameworks/intl/src/index_util.cpp b/frameworks/intl/src/index_util.cpp index b603171ade1c4117290f4277cbe3e61953c50d88..7b2ed0394aa83eaeefaa1a707f02a9d1fdd74431 100644 --- a/frameworks/intl/src/index_util.cpp +++ b/frameworks/intl/src/index_util.cpp @@ -23,19 +23,15 @@ IndexUtil::IndexUtil(const std::string &localeTag) UErrorCode status = U_ZERO_ERROR; if (localeTag == "") { icu::Locale locale(LocaleConfig::GetSystemLocale().c_str()); - index = new icu::AlphabeticIndex(locale, status); + index = std::make_unique(locale, status); } else { icu::Locale locale(localeTag.c_str()); - index = new icu::AlphabeticIndex(locale, status); + index = std::make_unique(locale, status); } } IndexUtil::~IndexUtil() { - if (index != nullptr) { - delete index; - index = nullptr; - } } std::vector IndexUtil::GetIndexList() diff --git a/frameworks/intl/src/preferred_language.cpp b/frameworks/intl/src/preferred_language.cpp index e69a1d1191597155fc73aba1602c2645031e7a8e..86b5eaf98a74339880c272412302de1cb4c1c307 100644 --- a/frameworks/intl/src/preferred_language.cpp +++ b/frameworks/intl/src/preferred_language.cpp @@ -39,12 +39,12 @@ bool PreferredLanguage::AddPreferredLanguageExist(std::vector &pref } if (languageIdx < index) { for (int i = languageIdx; i < index; i++) { - preferredLanguageList[i] = preferredLanguageList[i+1]; + preferredLanguageList[i] = preferredLanguageList[i + 1]; } } if (languageIdx > index) { for (int i = languageIdx; i > index; i--) { - preferredLanguageList[i] = preferredLanguageList[i-1]; + preferredLanguageList[i] = preferredLanguageList[i - 1]; } } preferredLanguageList[index] = language; @@ -173,7 +173,7 @@ std::vector PreferredLanguage::GetPreferredLanguageList() list.insert(list.begin(), systemLanguage); } else { for (size_t i = (size_t)systemLanguageIdx; i > 0; i--) { - list[i] = list[i-1]; + list[i] = list[i - 1]; } list[0] = systemLanguage; } diff --git a/frameworks/intl/src/relative_time_format.cpp b/frameworks/intl/src/relative_time_format.cpp index 2fc79965d39ffa5392736beec89b0ebae1fe412f..e59b5737c7f9645f6a6ce1e0800da17f74e040a9 100644 --- a/frameworks/intl/src/relative_time_format.cpp +++ b/frameworks/intl/src/relative_time_format.cpp @@ -46,8 +46,8 @@ std::unordered_map RelativeTimeFormat::relat { "years", UDAT_REL_UNIT_YEAR }, }; -RelativeTimeFormat::RelativeTimeFormat(const std::vector &localeTags, std::map &configs) +RelativeTimeFormat::RelativeTimeFormat(const std::vector &localeTags, + std::map &configs) { UErrorCode status = U_ZERO_ERROR; auto builder = std::make_unique(); @@ -56,19 +56,19 @@ RelativeTimeFormat::RelativeTimeFormat(const std::vector &localeTag std::string curLocale = localeTags[i]; locale = builder->setLanguageTag(icu::StringPiece(curLocale)).build(status); if (LocaleInfo::allValidLocales.count(locale.getLanguage()) > 0) { - localeInfo = new LocaleInfo(curLocale, configs); + localeInfo = std::make_unique(curLocale, configs); locale = localeInfo->GetLocale(); localeBaseName = localeInfo->GetBaseName(); - relativeTimeFormat = new icu::RelativeDateTimeFormatter(locale, nullptr, style, + relativeTimeFormat = std::make_unique(locale, nullptr, style, UDISPCTX_CAPITALIZATION_NONE, status); break; } } if (localeInfo == nullptr || relativeTimeFormat == nullptr) { - localeInfo = new LocaleInfo(LocaleConfig::GetSystemLocale(), configs); + localeInfo = std::make_unique(LocaleConfig::GetSystemLocale(), configs); locale = localeInfo->GetLocale(); localeBaseName = localeInfo->GetBaseName(); - relativeTimeFormat = new icu::RelativeDateTimeFormatter(locale, nullptr, style, + relativeTimeFormat = std::make_unique(locale, nullptr, style, UDISPCTX_CAPITALIZATION_NONE, status); } numberingSystem = localeInfo->GetNumberingSystem(); @@ -79,14 +79,6 @@ RelativeTimeFormat::RelativeTimeFormat(const std::vector &localeTag RelativeTimeFormat::~RelativeTimeFormat() { - if (localeInfo != nullptr) { - delete localeInfo; - localeInfo = nullptr; - } - if (relativeTimeFormat != nullptr) { - delete relativeTimeFormat; - relativeTimeFormat = nullptr; - } } void RelativeTimeFormat::ParseConfigs(std::map &configs) diff --git a/interfaces/js/kits/src/i18n_addon.cpp b/interfaces/js/kits/src/i18n_addon.cpp index ef9b6a1608db42b49732439086feae0924fd277f..c46ed11db527f77543dcd74f046dd25163b61e19 100644 --- a/interfaces/js/kits/src/i18n_addon.cpp +++ b/interfaces/js/kits/src/i18n_addon.cpp @@ -137,9 +137,9 @@ void I18nAddon::CreateInitProperties(napi_property_descriptor *properties) properties[19] = DECLARE_NAPI_FUNCTION("getPreferredLanguageList", GetPreferredLanguageList); // 20 is properties index properties[20] = DECLARE_NAPI_FUNCTION("getFirstPreferredLanguage", GetFirstPreferredLanguage); - // 21 is properties index + // 21 is properties index properties[21] = DECLARE_NAPI_FUNCTION("is24HourClock", Is24HourClock); - // 22 is properties index + // 22 is properties index properties[22] = DECLARE_NAPI_FUNCTION("set24HourClock", Set24HourClock); } diff --git a/interfaces/native/innerkits/preferred_language/include/preferred_language.h b/interfaces/native/innerkits/preferred_language/include/preferred_language.h index f43d2a6c0bcf23d4062d3f954ef94f6c24909fea..c6775fc001636ae861e5e69bb158a1c230f75bad 100644 --- a/interfaces/native/innerkits/preferred_language/include/preferred_language.h +++ b/interfaces/native/innerkits/preferred_language/include/preferred_language.h @@ -31,9 +31,9 @@ public: static std::string GetPreferredLocale(); private: - static bool AddPreferredLanguageNonExist(std::vector &preferredLanguageList, int index, + static bool AddPreferredLanguageNonExist(std::vector &preferredLangList, int index, const std::string& language); - static bool AddPreferredLanguageExist(std::vector &preferredLanguageList, int languageIdx, int index, + static bool AddPreferredLanguageExist(std::vector &preferredLangList, int languageIdx, int index, const std::string& language); static std::set GetResources(); static bool IsMatched(const std::string& preferred, const std::string& resource);