am 8223086e: Merge "Variable type cleanups" into jb-mr1-dev
* commit '8223086e238e403f6ad342843583d1c89ad55c04': Variable type cleanupsmain
commit
0d2c0878d4
|
@ -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];
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue