diff options
| author |   satok <satok@google.com> | 2012-03-13 03:16:06 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-03-13 03:16:06 -0700 |
| commit | abaff8d023ae4fc5f5601b9f4d1e6577a9f128e7 (patch) | |
| tree | 468f5c8fcd616db686f398481d75ffdbb254d937 /native/src/additional_proximity_chars.h | |
| parent | d6662ecd306e1084af81c79df61cf52ef6da75ea (diff) | |
| parent | 5eec574cf0eb6b8ec23723b5f566563453edd42f (diff) | |
| download | latinime-abaff8d023ae4fc5f5601b9f4d1e6577a9f128e7.tar.gz latinime-abaff8d023ae4fc5f5601b9f4d1e6577a9f128e7.tar.xz latinime-abaff8d023ae4fc5f5601b9f4d1e6577a9f128e7.zip | |
Merge "Use additional proximity chars in the native code"
Diffstat (limited to 'native/src/additional_proximity_chars.h')
| -rw-r--r-- | native/src/additional_proximity_chars.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/native/src/additional_proximity_chars.h b/native/src/additional_proximity_chars.h index b76726c69..e0049d949 100644 --- a/native/src/additional_proximity_chars.h +++ b/native/src/additional_proximity_chars.h @@ -26,23 +26,23 @@ class AdditionalProximityChars { private: static const std::string LOCALE_EN_US; static const int EN_US_ADDITIONAL_A_SIZE = 4; - static const uint16_t EN_US_ADDITIONAL_A[]; + static const uint32_t EN_US_ADDITIONAL_A[]; static const int EN_US_ADDITIONAL_E_SIZE = 4; - static const uint16_t EN_US_ADDITIONAL_E[]; + static const uint32_t EN_US_ADDITIONAL_E[]; static const int EN_US_ADDITIONAL_I_SIZE = 4; - static const uint16_t EN_US_ADDITIONAL_I[]; + static const uint32_t EN_US_ADDITIONAL_I[]; static const int EN_US_ADDITIONAL_O_SIZE = 4; - static const uint16_t EN_US_ADDITIONAL_O[]; + static const uint32_t EN_US_ADDITIONAL_O[]; static const int EN_US_ADDITIONAL_U_SIZE = 4; - static const uint16_t EN_US_ADDITIONAL_U[]; + static const uint32_t EN_US_ADDITIONAL_U[]; - static bool isEnLocale(std::string* locale_str) { + static bool isEnLocale(const std::string* locale_str) { return locale_str && locale_str->size() >= LOCALE_EN_US.size() && locale_str->compare(0, LOCALE_EN_US.size(), LOCALE_EN_US); } public: - static int getAdditionalCharsSize(std::string* locale_str, uint16_t c) { + static int getAdditionalCharsSize(const std::string* locale_str, const uint16_t c) { if (!isEnLocale(locale_str)) { return 0; } @@ -62,7 +62,7 @@ class AdditionalProximityChars { } } - static const uint16_t* getAdditionalChars(std::string* locale_str, uint16_t c) { + static const uint32_t* getAdditionalChars(const std::string* locale_str, const uint32_t c) { if (!isEnLocale(locale_str)) { return 0; } @@ -82,7 +82,7 @@ class AdditionalProximityChars { } } - static bool hasAdditionalChars(std::string* locale_str, uint16_t c) { + static bool hasAdditionalChars(const std::string* locale_str, const uint32_t c) { return getAdditionalCharsSize(locale_str, c) > 0; } }; |