am 30ab10a1: Tiny cleanups

* commit '30ab10a144bb53ca9be1036d9cb7627389f263c2':
  Tiny cleanups
This commit is contained in:
Ken Wakasa 2012-12-20 08:08:00 -08:00 committed by Android Git Automerger
commit 462e7077dc
3 changed files with 14 additions and 14 deletions

View File

@ -38,9 +38,9 @@ class GestureSuggest : public SuggestInterface {
if (!mSuggestInterface) { if (!mSuggestInterface) {
return 0; return 0;
} }
return mSuggestInterface->getSuggestions(pInfo, traverseSession, inputXs, return mSuggestInterface->getSuggestions(pInfo, traverseSession, inputXs, inputYs, times,
inputYs, times, pointerIds, codes, inputSize, commitPoint, outWords, frequencies, pointerIds, codes, inputSize, commitPoint, outWords, frequencies, outputIndices,
outputIndices, outputTypes); outputTypes);
} }
static void setGestureSuggestFactoryMethod(SuggestInterface *(*factoryMethod)(int, int)) { static void setGestureSuggestFactoryMethod(SuggestInterface *(*factoryMethod)(int, int)) {
@ -50,11 +50,11 @@ class GestureSuggest : public SuggestInterface {
private: private:
DISALLOW_IMPLICIT_CONSTRUCTORS(GestureSuggest); DISALLOW_IMPLICIT_CONSTRUCTORS(GestureSuggest);
static SuggestInterface *getGestureSuggestInstance(int maxWordLength, int maxWords) { static SuggestInterface *getGestureSuggestInstance(int maxWordLength, int maxWords) {
if (sGestureSuggestFactoryMethod) { if (!sGestureSuggestFactoryMethod) {
return sGestureSuggestFactoryMethod(maxWordLength, maxWords);
}
return 0; return 0;
} }
return sGestureSuggestFactoryMethod(maxWordLength, maxWords);
}
static SuggestInterface *(*sGestureSuggestFactoryMethod)(int, int); static SuggestInterface *(*sGestureSuggestFactoryMethod)(int, int);
SuggestInterface *mSuggestInterface; SuggestInterface *mSuggestInterface;

View File

@ -38,9 +38,9 @@ class TypingSuggest : public SuggestInterface {
if (!mSuggestInterface) { if (!mSuggestInterface) {
return 0; return 0;
} }
return mSuggestInterface->getSuggestions(pInfo, traverseSession, inputXs, return mSuggestInterface->getSuggestions(pInfo, traverseSession, inputXs, inputYs, times,
inputYs, times, pointerIds, codes, inputSize, commitPoint, outWords, frequencies, pointerIds, codes, inputSize, commitPoint, outWords, frequencies, outputIndices,
outputIndices, outputTypes); outputTypes);
} }
static void setTypingSuggestFactoryMethod(SuggestInterface *(*factoryMethod)(int, int)) { static void setTypingSuggestFactoryMethod(SuggestInterface *(*factoryMethod)(int, int)) {
@ -50,11 +50,11 @@ class TypingSuggest : public SuggestInterface {
private: private:
DISALLOW_IMPLICIT_CONSTRUCTORS(TypingSuggest); DISALLOW_IMPLICIT_CONSTRUCTORS(TypingSuggest);
static SuggestInterface *getTypingSuggestInstance(int maxWordLength, int maxWords) { static SuggestInterface *getTypingSuggestInstance(int maxWordLength, int maxWords) {
if (sTypingSuggestFactoryMethod) { if (!sTypingSuggestFactoryMethod) {
return sTypingSuggestFactoryMethod(maxWordLength, maxWords);
}
return 0; return 0;
} }
return sTypingSuggestFactoryMethod(maxWordLength, maxWords);
}
static SuggestInterface *(*sTypingSuggestFactoryMethod)(int, int); static SuggestInterface *(*sTypingSuggestFactoryMethod)(int, int);
SuggestInterface *mSuggestInterface; SuggestInterface *mSuggestInterface;