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

Just cosmetic fixes 

Change-Id: I85e9454d774162df46a29791eb562d0cedaff78e
main
Ken Wakasa 2013-01-30 18:37:58 +09:00
parent e1f091c5d4
commit a47c699faa
2 changed files with 17 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/jni/src/dic_traverse_wrapper.h
View File

@ -31,8 +31,8 @@ class DicTraverseWrapper {
} }
return 0; return 0;
} }
static void initDicTraverseSession(void *traverseSession, static void initDicTraverseSession(void *traverseSession, const Dictionary *const dictionary,
const Dictionary *const dictionary, const int *prevWord, const int prevWordLength) { const int *prevWord, const int prevWordLength) {
if (sDicTraverseSessionInitMethod) { if (sDicTraverseSessionInitMethod) {
sDicTraverseSessionInitMethod(traverseSession, dictionary, prevWord, prevWordLength); sDicTraverseSessionInitMethod(traverseSession, dictionary, prevWord, prevWordLength);
} }
@ -42,8 +42,7 @@ class DicTraverseWrapper {
sDicTraverseSessionReleaseMethod(traverseSession); sDicTraverseSessionReleaseMethod(traverseSession);
} }
} }
static void setTraverseSessionFactoryMethod( static void setTraverseSessionFactoryMethod(void *(*factoryMethod)(JNIEnv *, jstring)) {
void *(*factoryMethod)(JNIEnv *, jstring)) {
sDicTraverseSessionFactoryMethod = factoryMethod; sDicTraverseSessionFactoryMethod = factoryMethod;
} }
static void setTraverseSessionInitMethod( static void setTraverseSessionInitMethod(
@ -53,6 +52,7 @@ class DicTraverseWrapper {
static void setTraverseSessionReleaseMethod(void (*releaseMethod)(void *)) { static void setTraverseSessionReleaseMethod(void (*releaseMethod)(void *)) {
sDicTraverseSessionReleaseMethod = releaseMethod; sDicTraverseSessionReleaseMethod = releaseMethod;
} }
private: private:
DISALLOW_IMPLICIT_CONSTRUCTORS(DicTraverseWrapper); DISALLOW_IMPLICIT_CONSTRUCTORS(DicTraverseWrapper);
static void *(*sDicTraverseSessionFactoryMethod)(JNIEnv *, jstring); static void *(*sDicTraverseSessionFactoryMethod)(JNIEnv *, jstring);

62
native/jni/src/proximity_info.h
View File

@ -47,57 +47,21 @@ class ProximityInfo {
// the radius of the key is assigned to zero. // the radius of the key is assigned to zero.
return mSweetSpotRadii[keyIndex] > 0.0f; return mSweetSpotRadii[keyIndex] > 0.0f;
} }
float getSweetSpotRadiiAt(int keyIndex) const { float getSweetSpotRadiiAt(int keyIndex) const { return mSweetSpotRadii[keyIndex]; }
return mSweetSpotRadii[keyIndex]; float getSweetSpotCenterXAt(int keyIndex) const { return mSweetSpotCenterXs[keyIndex]; }
} float getSweetSpotCenterYAt(int keyIndex) const { return mSweetSpotCenterYs[keyIndex]; }
float getSweetSpotCenterXAt(int keyIndex) const {
return mSweetSpotCenterXs[keyIndex];
}
float getSweetSpotCenterYAt(int keyIndex) const {
return mSweetSpotCenterYs[keyIndex];
}
void calculateNearbyKeyCodes( void calculateNearbyKeyCodes(
const int x, const int y, const int primaryKey, int *inputCodes) const; const int x, const int y, const int primaryKey, int *inputCodes) const;
bool hasTouchPositionCorrectionData() const { return HAS_TOUCH_POSITION_CORRECTION_DATA; }
bool hasTouchPositionCorrectionData() const { int getMostCommonKeyWidth() const { return MOST_COMMON_KEY_WIDTH; }
return HAS_TOUCH_POSITION_CORRECTION_DATA; int getMostCommonKeyWidthSquare() const { return MOST_COMMON_KEY_WIDTH_SQUARE; }
} int getKeyCount() const { return KEY_COUNT; }
int getCellHeight() const { return CELL_HEIGHT; }
int getMostCommonKeyWidth() const { int getCellWidth() const { return CELL_WIDTH; }
return MOST_COMMON_KEY_WIDTH; int getGridWidth() const { return GRID_WIDTH; }
} int getGridHeight() const { return GRID_HEIGHT; }
int getKeyboardWidth() const { return KEYBOARD_WIDTH; }
int getMostCommonKeyWidthSquare() const { int getKeyboardHeight() const { return KEYBOARD_HEIGHT; }
return MOST_COMMON_KEY_WIDTH_SQUARE;
}
int getKeyCount() const {
return KEY_COUNT;
}
int getCellHeight() const {
return CELL_HEIGHT;
}
int getCellWidth() const {
return CELL_WIDTH;
}
int getGridWidth() const {
return GRID_WIDTH;
}
int getGridHeight() const {
return GRID_HEIGHT;
}
int getKeyboardWidth() const {
return KEYBOARD_WIDTH;
}
int getKeyboardHeight() const {
return KEYBOARD_HEIGHT;
}
int getKeyCenterXOfCodePointG(int charCode) const; int getKeyCenterXOfCodePointG(int charCode) const;
int getKeyCenterYOfCodePointG(int charCode) const; int getKeyCenterYOfCodePointG(int charCode) const;