aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-01-15 09:37:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-15 09:37:29 -0800
commit3feef1475d7f981887db549d4db57cb71cf7cb56 (patch)
treef5aedf5a0eb4ef5343990c23f5018d507feb58c1
parentba141504a14b9b2eda6a2a7ee6ae8220fdce0b49 (diff)
parent1ddc1dabe6b049bb76a60acf23019e1bd96674a3 (diff)
downloadlatinime-3feef1475d7f981887db549d4db57cb71cf7cb56.tar.gz
latinime-3feef1475d7f981887db549d4db57cb71cf7cb56.tar.xz
latinime-3feef1475d7f981887db549d4db57cb71cf7cb56.zip
am 1ddc1dab: Small renaming for consistency
* commit '1ddc1dabe6b049bb76a60acf23019e1bd96674a3': Small renaming for consistency
-rw-r--r--native/jni/src/suggest/gesture_suggest.h8
-rw-r--r--native/jni/src/suggest/suggest_interface.h5
-rw-r--r--native/jni/src/suggest/typing_suggest.h11
3 files changed, 12 insertions, 12 deletions
diff --git a/native/jni/src/suggest/gesture_suggest.h b/native/jni/src/suggest/gesture_suggest.h
index eff6dc963..82c3a69ad 100644
--- a/native/jni/src/suggest/gesture_suggest.h
+++ b/native/jni/src/suggest/gesture_suggest.h
@@ -31,14 +31,14 @@ class GestureSuggest : public SuggestInterface {
virtual ~GestureSuggest();
int getSuggestions(ProximityInfo *pInfo, void *traverseSession, int *inputXs, int *inputYs,
- int *times, int *pointerIds, int *codes, int inputSize, int commitPoint, int *outWords,
- int *frequencies, int *outputIndices, int *outputTypes) const {
+ int *times, int *pointerIds, int *inputCodePoints, int inputSize, int commitPoint,
+ int *outWords, int *frequencies, int *outputIndices, int *outputTypes) const {
if (!mSuggestInterface) {
return 0;
}
return mSuggestInterface->getSuggestions(pInfo, traverseSession, inputXs, inputYs, times,
- pointerIds, codes, inputSize, commitPoint, outWords, frequencies, outputIndices,
- outputTypes);
+ pointerIds, inputCodePoints, inputSize, commitPoint, outWords, frequencies,
+ outputIndices, outputTypes);
}
static void setGestureSuggestFactoryMethod(SuggestInterface *(*factoryMethod)()) {
diff --git a/native/jni/src/suggest/suggest_interface.h b/native/jni/src/suggest/suggest_interface.h
index 0fb54266c..0bb85d7e5 100644
--- a/native/jni/src/suggest/suggest_interface.h
+++ b/native/jni/src/suggest/suggest_interface.h
@@ -26,8 +26,9 @@ class ProximityInfo;
class SuggestInterface {
public:
virtual int getSuggestions(ProximityInfo *pInfo, void *traverseSession, int *inputXs,
- int *inputYs, int *times, int *pointerIds, int *codes, int inputSize, int commitPoint,
- int *outWords, int *frequencies, int *outputIndices, int *outputTypes) const = 0;
+ int *inputYs, int *times, int *pointerIds, int *inputCodePoints, int inputSize,
+ int commitPoint, int *outWords, int *frequencies, int *outputIndices,
+ int *outputTypes) const = 0;
SuggestInterface() {}
virtual ~SuggestInterface() {}
private:
diff --git a/native/jni/src/suggest/typing_suggest.h b/native/jni/src/suggest/typing_suggest.h
index 1e944cbc2..678037aa2 100644
--- a/native/jni/src/suggest/typing_suggest.h
+++ b/native/jni/src/suggest/typing_suggest.h
@@ -26,20 +26,19 @@ class ProximityInfo;
class TypingSuggest : public SuggestInterface {
public:
- TypingSuggest() : mSuggestInterface(getTypingSuggestInstance()) {
- }
+ TypingSuggest() : mSuggestInterface(getTypingSuggestInstance()) {}
virtual ~TypingSuggest();
int getSuggestions(ProximityInfo *pInfo, void *traverseSession, int *inputXs, int *inputYs,
- int *times, int *pointerIds, int *codes, int inputSize, int commitPoint, int *outWords,
- int *frequencies, int *outputIndices, int *outputTypes) const {
+ int *times, int *pointerIds, int *inputCodePoints, int inputSize, int commitPoint,
+ int *outWords, int *frequencies, int *outputIndices, int *outputTypes) const {
if (!mSuggestInterface) {
return 0;
}
return mSuggestInterface->getSuggestions(pInfo, traverseSession, inputXs, inputYs, times,
- pointerIds, codes, inputSize, commitPoint, outWords, frequencies, outputIndices,
- outputTypes);
+ pointerIds, inputCodePoints, inputSize, commitPoint, outWords, frequencies,
+ outputIndices, outputTypes);
}
static void setTypingSuggestFactoryMethod(SuggestInterface *(*factoryMethod)()) {