| commit | 8b082decfcd5c83aafc363a567d1a7b2530c0615 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Mon Aug 12 01:47:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 12 01:47:19 2013 -0700 |
| tree | b54647616ef29b1991941566209516290bbd3436 | |
| parent | fffd71fcbb80be6469eec23e146fec9c7a9be185 [diff] | |
| parent | 51f0c95f21ade98aa658d011c45ff7ab02ba763d [diff] |
am 51f0c95f: Merge "Change name of shortcut reading util class." * commit '51f0c95f21ade98aa658d011c45ff7ab02ba763d': Change name of shortcut reading util class.
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 1f86ecc..9261a9d 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk
@@ -71,7 +71,7 @@ suggest/core/session/dic_traverse_session.cpp \ $(addprefix suggest/policyimpl/dictionary/, \ bigram/bigram_list_reading_utils.cpp \ - shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp \ + shortcut/shortcut_list_reading_utils.cpp \ dictionary_structure_with_buffer_policy_factory.cpp \ dynamic_patricia_trie_node_reader.cpp \ dynamic_patricia_trie_policy.cpp \
diff --git a/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h index e7acb9d..0b112a5 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h +++ b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h
@@ -21,8 +21,7 @@ #include "defines.h" #include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" -#include \ - "suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h" +#include "suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h" namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.cpp similarity index 93% rename from native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp rename to native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.cpp index 4b619be..61c3a13 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.cpp
@@ -14,8 +14,7 @@ * limitations under the License. */ -#include \ - "suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h" +#include "suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h" #include "suggest/core/dictionary/byte_array_utils.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h rename to native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h