nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 229f354f: Merge "Make members of classes that are used with std::vector const" 

* commit '229f354fdc2ff98dd6b1132ef5a5bd364c065079':
  Make members of classes that are used with std::vector const
main
Keisuke Kuroyanagi 2014-10-10 06:29:29 +00:00 committed by Android Git Automerger
parent e78c86c5fb 229f354fdc
commit 8473800f40
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
native/jni/src/suggest/core/dictionary/property/historical_info.h
View File

@ -47,12 +47,12 @@ class HistoricalInfo {
} }
private: 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. const int mTimestamp;
int mTimestamp; const int mLevel;
int mLevel; const int mCount;
int mCount;
}; };
} // namespace latinime } // namespace latinime
#endif /* LATINIME_HISTORICAL_INFO_H */ #endif /* LATINIME_HISTORICAL_INFO_H */

10
native/jni/src/suggest/core/dictionary/property/ngram_property.h
View File

@ -44,13 +44,13 @@ class NgramProperty {
} }
private: 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_DEFAULT_CONSTRUCTOR(NgramProperty);
DISALLOW_ASSIGNMENT_OPERATOR(NgramProperty);
// TODO: Make members const. const std::vector<int> mTargetCodePoints;
std::vector<int> mTargetCodePoints; const int mProbability;
int mProbability; const HistoricalInfo mHistoricalInfo;
HistoricalInfo mHistoricalInfo;
}; };
} // namespace latinime } // namespace latinime
#endif // LATINIME_NGRAM_PROPERTY_H #endif // LATINIME_NGRAM_PROPERTY_H

20
native/jni/src/suggest/core/dictionary/property/unigram_property.h
View File

@ -41,12 +41,11 @@ class UnigramProperty {
} }
private: 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); DISALLOW_DEFAULT_CONSTRUCTOR(ShortcutProperty);
// TODO: Make members const. const std::vector<int> mTargetCodePoints;
std::vector<int> mTargetCodePoints; const int mProbability;
int mProbability;
}; };
UnigramProperty() UnigramProperty()
@ -104,13 +103,12 @@ class UnigramProperty {
// Default copy constructor is used for using as a return value. // Default copy constructor is used for using as a return value.
DISALLOW_ASSIGNMENT_OPERATOR(UnigramProperty); DISALLOW_ASSIGNMENT_OPERATOR(UnigramProperty);
// TODO: Make members const. const bool mRepresentsBeginningOfSentence;
bool mRepresentsBeginningOfSentence; const bool mIsNotAWord;
bool mIsNotAWord; const bool mIsBlacklisted;
bool mIsBlacklisted; const int mProbability;
int mProbability; const HistoricalInfo mHistoricalInfo;
HistoricalInfo mHistoricalInfo; const std::vector<ShortcutProperty> mShortcuts;
std::vector<ShortcutProperty> mShortcuts;
}; };
} // namespace latinime } // namespace latinime
#endif // LATINIME_UNIGRAM_PROPERTY_H #endif // LATINIME_UNIGRAM_PROPERTY_H