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

Commit 620ebde7 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Make members of classes that are used with std::vector const 

Change-Id: Id93fb87f5630230fc3f9cd339e12f3b0e2006ea9
parent 45783013

native/jni/src/suggest/core/dictionary/property/historical_info.h

+5 −5
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ class HistoricalInfo { 
    }



 private:

    // Default copy constructor and assign operator are used for using in std::vector.

    // Default copy constructor is used for using in std::vector.

    DISALLOW_ASSIGNMENT_OPERATOR(HistoricalInfo);



    // TODO: Make members const.

    int mTimestamp;

    int mLevel;

    int mCount;

    const int mTimestamp;

    const int mLevel;

    const int mCount;

};

} // namespace latinime

#endif /* LATINIME_HISTORICAL_INFO_H */

native/jni/src/suggest/core/dictionary/property/ngram_property.h

+5 −5
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ class NgramProperty { 
    }



 private:

    // Default copy constructor and assign operator are used for using in std::vector.

    // Default copy constructor is used for using in std::vector.

    DISALLOW_DEFAULT_CONSTRUCTOR(NgramProperty);

    DISALLOW_ASSIGNMENT_OPERATOR(NgramProperty);



    // TODO: Make members const.

    std::vector<int> mTargetCodePoints;

    int mProbability;

    HistoricalInfo mHistoricalInfo;

    const std::vector<int> mTargetCodePoints;

    const int mProbability;

    const HistoricalInfo mHistoricalInfo;

};

} // namespace latinime

#endif // LATINIME_NGRAM_PROPERTY_H

native/jni/src/suggest/core/dictionary/property/unigram_property.h

+9 −11
Original line number Diff line number Diff line
@@ -41,12 +41,11 @@ class UnigramProperty { 
        }



     private:

        // Default copy constructor and assign operator are used for using in std::vector.

        // Default copy constructor is used for using in std::vector.

        DISALLOW_DEFAULT_CONSTRUCTOR(ShortcutProperty);



        // TODO: Make members const.

        std::vector<int> mTargetCodePoints;

        int mProbability;

        const std::vector<int> mTargetCodePoints;

        const int mProbability;

    };



    UnigramProperty()
@@ -104,13 +103,12 @@ class UnigramProperty { 
    // Default copy constructor is used for using as a return value.

    DISALLOW_ASSIGNMENT_OPERATOR(UnigramProperty);



    // TODO: Make members const.

    bool mRepresentsBeginningOfSentence;

    bool mIsNotAWord;

    bool mIsBlacklisted;

    int mProbability;

    HistoricalInfo mHistoricalInfo;

    std::vector<ShortcutProperty> mShortcuts;

    const bool mRepresentsBeginningOfSentence;

    const bool mIsNotAWord;

    const bool mIsBlacklisted;

    const int mProbability;

    const HistoricalInfo mHistoricalInfo;

    const std::vector<ShortcutProperty> mShortcuts;

};

} // namespace latinime

#endif // LATINIME_UNIGRAM_PROPERTY_H