Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5964d4e6 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Variable type cleanups 

Change-Id: I5d892494200c09f8cb8a46c327c29bbd63eab093
parent 14faf7a4

native/jni/src/proximity_info.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -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];

    }

    }

native/jni/src/proximity_info.h

+4 −5
Original line number Original line Diff line number Diff line
@@ -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: