Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ddc1dab authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Small renaming for consistency 

Change-Id: I10c61d441f586e63045f8c7a606a9ee61366d870
parent 6cee61de

native/jni/src/suggest/gesture_suggest.h

+4 −4
Original line number Diff line number Diff line
@@ -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)()) {

native/jni/src/suggest/suggest_interface.h

+3 −2
Original line number Diff line number Diff line
@@ -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:

native/jni/src/suggest/typing_suggest.h

+5 −6
Original line number Diff line number Diff line
@@ -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)()) {