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

Commit 5747c745 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Remove isUpdatable from constructors of dict contents."

parents 9e38fbaa b22f95ec

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h

+2 −3
Original line number Diff line number Diff line
@@ -30,9 +30,8 @@ namespace latinime { 


class BigramDictContent : public SparseTableDictContent {

 public:

    BigramDictContent(uint8_t *const *buffers, const int *bufferSizes, const bool hasHistoricalInfo,

            const bool isUpdatable)

            : SparseTableDictContent(buffers, bufferSizes, isUpdatable,

    BigramDictContent(uint8_t *const *buffers, const int *bufferSizes, const bool hasHistoricalInfo)

            : SparseTableDictContent(buffers, bufferSizes,

                      Ver4DictConstants::BIGRAM_ADDRESS_TABLE_BLOCK_SIZE,

                      Ver4DictConstants::BIGRAM_ADDRESS_TABLE_DATA_SIZE),

              mHasHistoricalInfo(hasHistoricalInfo) {}

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_dict_content.h

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ class ProbabilityEntry; 
class ProbabilityDictContent : public SingleDictContent {

 public:

    ProbabilityDictContent(uint8_t *const buffer, const int bufferSize,

            const bool hasHistoricalInfo, const bool isUpdatable)

            : SingleDictContent(buffer, bufferSize, isUpdatable),

            const bool hasHistoricalInfo)

            : SingleDictContent(buffer, bufferSize),

              mHasHistoricalInfo(hasHistoricalInfo),

              mSize(getBuffer()->getTailPosition() / getEntrySize()) {}

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ namespace latinime { 


class ShortcutDictContent : public SparseTableDictContent {

 public:

    ShortcutDictContent(uint8_t *const *buffers, const int *bufferSizes, const bool isUpdatable)

            : SparseTableDictContent(buffers, bufferSizes, isUpdatable,

    ShortcutDictContent(uint8_t *const *buffers, const int *bufferSizes)

            : SparseTableDictContent(buffers, bufferSizes,

                      Ver4DictConstants::SHORTCUT_ADDRESS_TABLE_BLOCK_SIZE,

                      Ver4DictConstants::SHORTCUT_ADDRESS_TABLE_DATA_SIZE) {}

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace latinime { 


class SingleDictContent : public DictContent {

 public:

    SingleDictContent(uint8_t *const buffer, const int bufferSize, const bool isUpdatable)

    SingleDictContent(uint8_t *const buffer, const int bufferSize)

            : mExpandableContentBuffer(buffer, bufferSize,

                      BufferWithExtendableBuffer::DEFAULT_MAX_ADDITIONAL_BUFFER_SIZE) {}

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ namespace latinime { 
class SparseTableDictContent : public DictContent {

 public:

    AK_FORCE_INLINE SparseTableDictContent(uint8_t *const *buffers, const int *bufferSizes,

            const bool isUpdatable, const int sparseTableBlockSize, const int sparseTableDataSize)

            const int sparseTableBlockSize, const int sparseTableDataSize)

            : mExpandableLookupTableBuffer(buffers[LOOKUP_TABLE_BUFFER_INDEX],

                      bufferSizes[LOOKUP_TABLE_BUFFER_INDEX],

                      BufferWithExtendableBuffer::DEFAULT_MAX_ADDITIONAL_BUFFER_SIZE),