am 30ab10a1: Tiny cleanups

* commit '30ab10a144bb53ca9be1036d9cb7627389f263c2':
  Tiny cleanups
main
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) {
return 0;
}
return mSuggestInterface->getSuggestions(pInfo, traverseSession, inputXs,
inputYs, times, pointerIds, codes, inputSize, commitPoint, outWords, frequencies,
outputIndices, outputTypes);
return mSuggestInterface->getSuggestions(pInfo, traverseSession, inputXs, inputYs, times,
pointerIds, codes, inputSize, commitPoint, outWords, frequencies, outputIndices,
outputTypes);
}
static void setGestureSuggestFactoryMethod(SuggestInterface *(*factoryMethod)(int, int)) {
@ -50,10 +50,10 @@ class GestureSuggest : public SuggestInterface {
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(GestureSuggest);
static SuggestInterface *getGestureSuggestInstance(int maxWordLength, int maxWords) {
if (sGestureSuggestFactoryMethod) {
return sGestureSuggestFactoryMethod(maxWordLength, maxWords);
if (!sGestureSuggestFactoryMethod) {
return 0;
}
return 0;
return sGestureSuggestFactoryMethod(maxWordLength, maxWords);
}
static SuggestInterface *(*sGestureSuggestFactoryMethod)(int, int);

View File

@ -28,8 +28,8 @@ class SuggestInterface {
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;
SuggestInterface() { };
virtual ~SuggestInterface() { };
SuggestInterface() {};
virtual ~SuggestInterface() {};
private:
DISALLOW_COPY_AND_ASSIGN(SuggestInterface);
};

View File

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