aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info.h
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-08-09 22:26:58 +0900
committerKen Wakasa <kwakasa@google.com>2012-08-09 22:28:57 +0900
commit9e0c711a6230af1db0753af401804c95e4bee69d (patch)
treef4cd9db5df639ea875fe13465bfe9ad698eb7ecf /native/jni/src/proximity_info.h
parent805ac949d22946e60cbe311676e32d1f4f02ced3 (diff)
downloadlatinime-9e0c711a6230af1db0753af401804c95e4bee69d.tar.gz
latinime-9e0c711a6230af1db0753af401804c95e4bee69d.tar.xz
latinime-9e0c711a6230af1db0753af401804c95e4bee69d.zip
Stop using STL string in additional_proximity_chars
Change-Id: Ic016fd5983b8855b0fd9506a17b205db86af3a2f
Diffstat (limited to 'native/jni/src/proximity_info.h')
-rw-r--r--native/jni/src/proximity_info.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h
index 7222d0d5d..d7e24c5f5 100644
--- a/native/jni/src/proximity_info.h
+++ b/native/jni/src/proximity_info.h
@@ -18,7 +18,6 @@
#define LATINIME_PROXIMITY_INFO_H
#include <stdint.h>
-#include <string>
#include "defines.h"
#include "jni.h"
@@ -75,8 +74,8 @@ class ProximityInfo {
return MOST_COMMON_KEY_WIDTH_SQUARE;
}
- std::string getLocaleStr() const {
- return *mLocaleStr;
+ const char *getLocaleStr() const {
+ return mLocaleStr;
}
int getKeyCount() const {
@@ -129,7 +128,7 @@ class ProximityInfo {
const int CELL_HEIGHT;
const int KEY_COUNT;
const bool HAS_TOUCH_POSITION_CORRECTION_DATA;
- const std::string *mLocaleStr;
+ char mLocaleStr[MAX_LOCALE_STRING_LENGTH];
int32_t *mProximityCharsArray;
int32_t mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];
int32_t mKeyYCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];