nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Variable type cleanups" into jb-mr1-dev

Browse source
This commit is contained in:
Ken Wakasa 2012-09-10 00:54:12 -07:00 committed by Android (Google) Code Review
commit 8223086e23
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
native/jni/src/proximity_info.cpp
View file

@ -275,22 +275,22 @@ void ProximityInfo::initializeG() {
} }
} }
float ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const { int ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const {
return getKeyCenterXOfKeyIdG(getKeyIndexOf(charCode)); return getKeyCenterXOfKeyIdG(getKeyIndexOf(charCode));
} }
float ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const { int ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const {
return getKeyCenterYOfKeyIdG(getKeyIndexOf(charCode)); return getKeyCenterYOfKeyIdG(getKeyIndexOf(charCode));
} }
float ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const { int ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const {
if (keyId >= 0) { if (keyId >= 0) {
return mCenterXsG[keyId]; return mCenterXsG[keyId];
} }
return 0; return 0;
} }
float ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const { int ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const {
if (keyId >= 0) { if (keyId >= 0) {
return mCenterYsG[keyId]; return mCenterYsG[keyId];
} }

9
native/jni/src/proximity_info.h
View file

@ -104,11 +104,10 @@ class ProximityInfo {
return KEYBOARD_HEIGHT; return KEYBOARD_HEIGHT;
} }
// TODO: These should return int. int getKeyCenterXOfCodePointG(int charCode) const;
float getKeyCenterXOfCodePointG(int charCode) const; int getKeyCenterYOfCodePointG(int charCode) const;
float getKeyCenterYOfCodePointG(int charCode) const; int getKeyCenterXOfKeyIdG(int keyId) const;
float getKeyCenterXOfKeyIdG(int keyId) const; int getKeyCenterYOfKeyIdG(int keyId) const;
float getKeyCenterYOfKeyIdG(int keyId) const;
int getKeyKeyDistanceG(int key0, int key1) const; int getKeyKeyDistanceG(int key0, int key1) const;
private: private: