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

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

Merge "Move files for headerPolicy to policyimpl."

parents 9e0bb2f0 23d3ed96

native/jni/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ LATIN_IME_CORE_SRC_FILES := \ 
    $(addprefix suggest/core/dictionary/, \

        bigram_dictionary.cpp \

        binary_dictionary_format_utils.cpp \

        binary_dictionary_header.cpp \

        binary_dictionary_header_reading_utils.cpp \

        bloom_filter.cpp \

        byte_array_utils.cpp \

        dictionary.cpp \
@@ -71,6 +69,8 @@ LATIN_IME_CORE_SRC_FILES := \ 
    suggest/core/session/dic_traverse_session.cpp \

    $(addprefix suggest/policyimpl/dictionary/, \

        bigram/bigram_list_reading_utils.cpp \

        header/header_policy.cpp \

        header/header_reading_utils.cpp \

        shortcut/shortcut_list_reading_utils.cpp \

        dictionary_structure_with_buffer_policy_factory.cpp \

        dynamic_patricia_trie_node_reader.cpp \

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.h

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
#include <stdint.h>



#include "defines.h"

#include "suggest/core/dictionary/binary_dictionary_header.h"

#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"

#include "suggest/policyimpl/dictionary/bigram/bigram_list_policy.h"

#include "suggest/policyimpl/dictionary/header/header_policy.h"

#include "suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h"



namespace latinime {

native/jni/src/suggest/core/dictionary/binary_dictionary_header.cpp→native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "suggest/core/dictionary/binary_dictionary_header.h"

#include "suggest/policyimpl/dictionary/header/header_policy.h"



namespace latinime {

native/jni/src/suggest/core/dictionary/binary_dictionary_header.h→native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h

+1 −2
Original line number Diff line number Diff line
@@ -21,11 +21,10 @@ 


#include "defines.h"

#include "suggest/core/policy/dictionary_header_structure_policy.h"

#include "suggest/core/dictionary/binary_dictionary_header_reading_utils.h"

#include "suggest/policyimpl/dictionary/header/header_reading_utils.h"



namespace latinime {



// TODO: Move to policyimpl.

class HeaderPolicy : public DictionaryHeaderStructurePolicy {

 public:

    explicit HeaderPolicy(const uint8_t *const dictBuf)

native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.cpp→native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "suggest/core/dictionary/binary_dictionary_header_reading_utils.h"

#include "suggest/policyimpl/dictionary/header/header_reading_utils.h"



#include <cctype>

#include <cstdlib>