aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-09-10 16:49:36 +0900
committerKen Wakasa <kwakasa@google.com>2012-09-10 16:49:36 +0900
commit5964d4e607008d29cca3bc07c878fbc7eb540a1b (patch)
treea2c1a2a43142c925d65b78d072bb3608a96c24c2
parent14faf7a47e7415744d628726c596b63d4228aff0 (diff)
downloadlatinime-5964d4e607008d29cca3bc07c878fbc7eb540a1b.tar.gz
latinime-5964d4e607008d29cca3bc07c878fbc7eb540a1b.tar.xz
latinime-5964d4e607008d29cca3bc07c878fbc7eb540a1b.zip
Variable type cleanups
Change-Id: I5d892494200c09f8cb8a46c327c29bbd63eab093
-rw-r--r--native/jni/src/proximity_info.cpp8
-rw-r--r--native/jni/src/proximity_info.h9
2 files changed, 8 insertions, 9 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index a8c04300f..9bb8b29ae 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -275,22 +275,22 @@ void ProximityInfo::initializeG() {
}
}
-float ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const {
+int ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const {
return getKeyCenterXOfKeyIdG(getKeyIndexOf(charCode));
}
-float ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const {
+int ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const {
return getKeyCenterYOfKeyIdG(getKeyIndexOf(charCode));
}
-float ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const {
+int ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const {
if (keyId >= 0) {
return mCenterXsG[keyId];
}
return 0;
}
-float ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const {
+int ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const {
if (keyId >= 0) {
return mCenterYsG[keyId];
}
diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h
index 7c22e108b..45df6ff6a 100644
--- a/native/jni/src/proximity_info.h
+++ b/native/jni/src/proximity_info.h
@@ -104,11 +104,10 @@ class ProximityInfo {
return KEYBOARD_HEIGHT;
}
- // TODO: These should return int.
- float getKeyCenterXOfCodePointG(int charCode) const;
- float getKeyCenterYOfCodePointG(int charCode) const;
- float getKeyCenterXOfKeyIdG(int keyId) const;
- float getKeyCenterYOfKeyIdG(int keyId) const;
+ int getKeyCenterXOfCodePointG(int charCode) const;
+ int getKeyCenterYOfCodePointG(int charCode) const;
+ int getKeyCenterXOfKeyIdG(int keyId) const;
+ int getKeyCenterYOfKeyIdG(int keyId) const;
int getKeyKeyDistanceG(int key0, int key1) const;
private: