diff options
| author |   Jean-Baptiste Queru <jbq@google.com> | 2012-08-24 12:28:18 -0700 |
|---|---|---|
| committer |   android code review <noreply-gerritcodereview@google.com> | 2012-08-24 12:28:18 -0700 |
| commit | d78b9f7d81a3730671b91f247e1be3bb1f2ba202 (patch) | |
| tree | a428992729559f724a5dec8938660b973d6d8f8f | |
| parent | 38be4ee0fae07ed4abf6aab573fdc9b5955e7895 (diff) | |
| parent | be8a4cca2b021c5e8d79781f7a5d175f8b3b9976 (diff) | |
| download | latinime-d78b9f7d81a3730671b91f247e1be3bb1f2ba202.tar.gz latinime-d78b9f7d81a3730671b91f247e1be3bb1f2ba202.tar.xz latinime-d78b9f7d81a3730671b91f247e1be3bb1f2ba202.zip | |
Merge "Fixing unused private field error"
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 4 | ||||
| -rw-r--r-- | native/jni/src/proximity_info.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index 960d40119..855619dd7 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -42,8 +42,8 @@ ProximityInfo::ProximityInfo(const std::string localeStr, const int maxProximity const int32_t *keyYCoordinates, const int32_t *keyWidths, const int32_t *keyHeights, const int32_t *keyCharCodes, const float *sweetSpotCenterXs, const float *sweetSpotCenterYs, const float *sweetSpotRadii) - : MAX_PROXIMITY_CHARS_SIZE(maxProximityCharsSize), KEYBOARD_WIDTH(keyboardWidth), - KEYBOARD_HEIGHT(keyboardHeight), GRID_WIDTH(gridWidth), GRID_HEIGHT(gridHeight), + : MAX_PROXIMITY_CHARS_SIZE(maxProximityCharsSize), + GRID_WIDTH(gridWidth), GRID_HEIGHT(gridHeight), MOST_COMMON_KEY_WIDTH_SQUARE(mostCommonKeyWidth * mostCommonKeyWidth), CELL_WIDTH((keyboardWidth + gridWidth - 1) / gridWidth), CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight), diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h index feb0c9444..80d43af9d 100644 --- a/native/jni/src/proximity_info.h +++ b/native/jni/src/proximity_info.h @@ -98,8 +98,6 @@ class ProximityInfo { const int x, const int y, const int32_t primaryKey, int *inputCodes) const; const int MAX_PROXIMITY_CHARS_SIZE; - const int KEYBOARD_WIDTH; - const int KEYBOARD_HEIGHT; const int GRID_WIDTH; const int GRID_HEIGHT; const int MOST_COMMON_KEY_WIDTH_SQUARE; @@ -108,8 +106,6 @@ class ProximityInfo { const int KEY_COUNT; const bool HAS_TOUCH_POSITION_CORRECTION_DATA; const std::string mLocaleStr; - // TODO: remove this - const int *mInputCodesFromJava; int32_t *mInputCodes; const int *mInputXCoordinates; const int *mInputYCoordinates; |