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

am b68e7344: Cleanup the include paths 

* commit 'b68e73448104714e8f12f89a1e00fb10b5fd14c4':
  Cleanup the include paths
main
Ken Wakasa 2013-04-08 02:51:40 -07:00 committed by Android Git Automerger
parent cd0984a4ab b68e734481
commit bc2fd24fd3
20 changed files with 69 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
native/jni/Android.mk
View File

@ -26,12 +26,7 @@ include $(CLEAR_VARS)
LATIN_IME_SRC_DIR := src LATIN_IME_SRC_DIR := src
LATIN_IME_SRC_FULLPATH_DIR := $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LATIN_IME_SRC_FULLPATH_DIR := $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR)
$(LATIN_IME_SRC_FULLPATH_DIR) \
$(LATIN_IME_SRC_FULLPATH_DIR)/suggest \
$(LATIN_IME_SRC_FULLPATH_DIR)/suggest/core \
$(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/suggest/core/, dicnode dictionary policy session) \
$(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/suggest/policyimpl/, gesture typing)
LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-align \ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-align \
-Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers
@ -65,18 +60,20 @@ LATIN_IME_CORE_SRC_FILES := \
proximity_info_state_utils.cpp \ proximity_info_state_utils.cpp \
unigram_dictionary.cpp \ unigram_dictionary.cpp \
words_priority_queue.cpp \ words_priority_queue.cpp \
suggest/core/dicnode/dic_node.cpp \ $(addprefix suggest/core/dicnode/, \
suggest/core/dicnode/dic_nodes_cache.cpp \ dic_node.cpp \
suggest/core/dicnode/dic_node_utils.cpp \ dic_node_utils.cpp \
dic_nodes_cache.cpp) \
suggest/core/suggest.cpp \
suggest/core/policy/weighting.cpp \ suggest/core/policy/weighting.cpp \
suggest/core/session/dic_traverse_session.cpp \ suggest/core/session/dic_traverse_session.cpp \
suggest/core/suggest.cpp \
suggest/policyimpl/gesture/gesture_suggest_policy_factory.cpp \ suggest/policyimpl/gesture/gesture_suggest_policy_factory.cpp \
suggest/policyimpl/typing/scoring_params.cpp \ $(addprefix suggest/policyimpl/typing/, \
suggest/policyimpl/typing/typing_scoring.cpp \ scoring_params.cpp \
suggest/policyimpl/typing/typing_suggest_policy.cpp \ typing_scoring.cpp \
suggest/policyimpl/typing/typing_traversal.cpp \ typing_suggest_policy.cpp \
suggest/policyimpl/typing/typing_weighting.cpp typing_traversal.cpp \
typing_weighting.cpp)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LATIN_IME_JNI_SRC_FILES) \ $(LATIN_IME_JNI_SRC_FILES) \

4
native/jni/jni_common.cpp
View File

@ -16,12 +16,12 @@
#define LOG_TAG "LatinIME: jni" #define LOG_TAG "LatinIME: jni"
#include "jni_common.h"
#include "com_android_inputmethod_keyboard_ProximityInfo.h" #include "com_android_inputmethod_keyboard_ProximityInfo.h"
#include "com_android_inputmethod_latin_BinaryDictionary.h" #include "com_android_inputmethod_latin_BinaryDictionary.h"
#include "com_android_inputmethod_latin_DicTraverseSession.h" #include "com_android_inputmethod_latin_DicTraverseSession.h"
#include "defines.h" #include "defines.h"
#include "jni.h"
#include "jni_common.h"
/* /*
* Returns the JNI version on success, -1 on failure. * Returns the JNI version on success, -1 on failure.

9
native/jni/src/dictionary.cpp
View File

@ -16,17 +16,18 @@
#define LOG_TAG "LatinIME: dictionary.cpp" #define LOG_TAG "LatinIME: dictionary.cpp"
#include "dictionary.h"
#include <map> // TODO: remove #include <map> // TODO: remove
#include <stdint.h> #include <stdint.h>
#include "bigram_dictionary.h" #include "bigram_dictionary.h"
#include "binary_format.h" #include "binary_format.h"
#include "defines.h" #include "defines.h"
#include "dictionary.h"
#include "dic_traverse_wrapper.h" #include "dic_traverse_wrapper.h"
#include "gesture_suggest_policy_factory.h" #include "suggest/core/suggest.h"
#include "suggest.h" #include "suggest/policyimpl/gesture/gesture_suggest_policy_factory.h"
#include "typing_suggest_policy_factory.h" #include "suggest/policyimpl/typing/typing_suggest_policy_factory.h"
#include "unigram_dictionary.h" #include "unigram_dictionary.h"
namespace latinime { namespace latinime {

2
native/jni/src/suggest/core/dictionary/shortcut_utils.h
View File

@ -18,7 +18,7 @@
#define LATINIME_SHORTCUT_UTILS #define LATINIME_SHORTCUT_UTILS
#include "defines.h" #include "defines.h"
#include "dic_node_utils.h" #include "suggest/core/dicnode/dic_node_utils.h"
#include "terminal_attributes.h" #include "terminal_attributes.h"
namespace latinime { namespace latinime {

3
native/jni/src/suggest/core/policy/traversal.h
View File

@ -20,6 +20,9 @@
#include "defines.h" #include "defines.h"
namespace latinime { namespace latinime {
class DicTraverseSession;
class Traversal { class Traversal {
public: public:
virtual int getMaxPointerCount() const = 0; virtual int getMaxPointerCount() const = 0;

11
native/jni/src/suggest/core/policy/weighting.cpp
View File

@ -14,14 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
#include "suggest/core/policy/weighting.h"
#include "char_utils.h" #include "char_utils.h"
#include "defines.h" #include "defines.h"
#include "dic_node.h"
#include "dic_node_profiler.h"
#include "dic_node_utils.h"
#include "dic_traverse_session.h"
#include "hash_map_compat.h" #include "hash_map_compat.h"
#include "weighting.h" #include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_profiler.h"
#include "suggest/core/dicnode/dic_node_utils.h"
#include "suggest/core/session/dic_traverse_session.h"
namespace latinime { namespace latinime {

1
native/jni/src/suggest/core/policy/weighting.h
View File

@ -18,6 +18,7 @@
#define LATINIME_WEIGHTING_H #define LATINIME_WEIGHTING_H
#include "defines.h" #include "defines.h"
#include "hash_map_compat.h"
namespace latinime { namespace latinime {

5
native/jni/src/suggest/core/session/dic_traverse_session.cpp
View File

@ -14,12 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
#include "suggest/core/session/dic_traverse_session.h"
#include "defines.h" #include "defines.h"
#include "dictionary.h" #include "dictionary.h"
#include "dic_node_utils.h"
#include "dic_traverse_session.h"
#include "dic_traverse_wrapper.h" #include "dic_traverse_wrapper.h"
#include "jni.h" #include "jni.h"
#include "suggest/core/dicnode/dic_node_utils.h"
namespace latinime { namespace latinime {

2
native/jni/src/suggest/core/session/dic_traverse_session.h
View File

@ -21,10 +21,10 @@
#include <vector> #include <vector>
#include "defines.h" #include "defines.h"
#include "dic_nodes_cache.h"
#include "hash_map_compat.h" #include "hash_map_compat.h"
#include "jni.h" #include "jni.h"
#include "proximity_info_state.h" #include "proximity_info_state.h"
#include "suggest/core/dicnode/dic_nodes_cache.h"
namespace latinime { namespace latinime {

18
native/jni/src/suggest/core/suggest.cpp
View File

@ -14,18 +14,20 @@
* limitations under the License. * limitations under the License.
*/ */
#include "suggest/core/suggest.h"
#include "char_utils.h" #include "char_utils.h"
#include "dictionary.h" #include "dictionary.h"
#include "dic_node_priority_queue.h"
#include "dic_node_vector.h"
#include "dic_traverse_session.h"
#include "proximity_info.h" #include "proximity_info.h"
#include "scoring.h" #include "suggest/core/dicnode/dic_node.h"
#include "shortcut_utils.h" #include "suggest/core/dicnode/dic_node_priority_queue.h"
#include "suggest.h" #include "suggest/core/dicnode/dic_node_vector.h"
#include "suggest/core/dictionary/shortcut_utils.h"
#include "suggest/core/policy/scoring.h"
#include "suggest/core/policy/traversal.h"
#include "suggest/core/policy/weighting.h"
#include "suggest/core/session/dic_traverse_session.h"
#include "terminal_attributes.h" #include "terminal_attributes.h"
#include "traversal.h"
#include "weighting.h"
namespace latinime { namespace latinime {

4
native/jni/src/suggest/core/suggest.h
View File

@ -18,8 +18,8 @@
#define LATINIME_SUGGEST_IMPL_H #define LATINIME_SUGGEST_IMPL_H
#include "defines.h" #include "defines.h"
#include "suggest_interface.h" #include "suggest/core/suggest_interface.h"
#include "suggest_policy.h" #include "suggest/core/policy/suggest_policy.h"
namespace latinime { namespace latinime {

2
native/jni/src/suggest/policyimpl/typing/scoring_params.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "scoring_params.h" #include "suggest/policyimpl/typing/scoring_params.h"
namespace latinime { namespace latinime {
// TODO: RENAME all // TODO: RENAME all

2
native/jni/src/suggest/policyimpl/typing/typing_scoring.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "typing_scoring.h" #include "suggest/policyimpl/typing/typing_scoring.h"
namespace latinime { namespace latinime {
const TypingScoring TypingScoring::sInstance; const TypingScoring TypingScoring::sInstance;

4
native/jni/src/suggest/policyimpl/typing/typing_scoring.h
View File

@ -18,8 +18,8 @@
#define LATINIME_TYPING_SCORING_H #define LATINIME_TYPING_SCORING_H
#include "defines.h" #include "defines.h"
#include "scoring.h" #include "suggest/core/policy/scoring.h"
#include "scoring_params.h" #include "suggest/policyimpl/typing/scoring_params.h"
namespace latinime { namespace latinime {

2
native/jni/src/suggest/policyimpl/typing/typing_suggest_policy.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "typing_suggest_policy.h" #include "suggest/policyimpl/typing/typing_suggest_policy.h"
namespace latinime { namespace latinime {
const TypingSuggestPolicy TypingSuggestPolicy::sInstance; const TypingSuggestPolicy TypingSuggestPolicy::sInstance;

8
native/jni/src/suggest/policyimpl/typing/typing_suggest_policy.h
View File

@ -18,10 +18,10 @@
#define LATINIME_TYPING_SUGGEST_POLICY_H #define LATINIME_TYPING_SUGGEST_POLICY_H
#include "defines.h" #include "defines.h"
#include "suggest_policy.h" #include "suggest/core/policy/suggest_policy.h"
#include "typing_scoring.h" #include "suggest/policyimpl/typing/typing_scoring.h"
#include "typing_traversal.h" #include "suggest/policyimpl/typing/typing_traversal.h"
#include "typing_weighting.h" #include "suggest/policyimpl/typing/typing_weighting.h"
namespace latinime { namespace latinime {

2
native/jni/src/suggest/policyimpl/typing/typing_traversal.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "typing_traversal.h" #include "suggest/policyimpl/typing/typing_traversal.h"
namespace latinime { namespace latinime {
const bool TypingTraversal::CORRECT_OMISSION = true; const bool TypingTraversal::CORRECT_OMISSION = true;

10
native/jni/src/suggest/policyimpl/typing/typing_traversal.h
View File

@ -21,12 +21,12 @@
#include "char_utils.h" #include "char_utils.h"
#include "defines.h" #include "defines.h"
#include "dic_node.h"
#include "dic_node_vector.h"
#include "dic_traverse_session.h"
#include "proximity_info_state.h" #include "proximity_info_state.h"
#include "scoring_params.h" #include "suggest/core/dicnode/dic_node.h"
#include "traversal.h" #include "suggest/core/dicnode/dic_node_vector.h"
#include "suggest/core/policy/traversal.h"
#include "suggest/core/session/dic_traverse_session.h"
#include "suggest/policyimpl/typing/scoring_params.h"
namespace latinime { namespace latinime {
class TypingTraversal : public Traversal { class TypingTraversal : public Traversal {

7
native/jni/src/suggest/policyimpl/typing/typing_weighting.cpp
View File

@ -14,9 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
#include "dic_node.h" #include "suggest/policyimpl/typing/typing_weighting.h"
#include "scoring_params.h"
#include "typing_weighting.h" #include "suggest/core/dicnode/dic_node.h"
#include "suggest/policyimpl/typing/scoring_params.h"
namespace latinime { namespace latinime {
const TypingWeighting TypingWeighting::sInstance; const TypingWeighting TypingWeighting::sInstance;

7
native/jni/src/suggest/policyimpl/typing/typing_weighting.h
View File

@ -18,9 +18,10 @@
#define LATINIME_TYPING_WEIGHTING_H #define LATINIME_TYPING_WEIGHTING_H
#include "defines.h" #include "defines.h"
#include "dic_node_utils.h" #include "suggest/core/dicnode/dic_node_utils.h"
#include "dic_traverse_session.h" #include "suggest/core/policy/weighting.h"
#include "weighting.h" #include "suggest/core/session/dic_traverse_session.h"
#include "suggest/policyimpl/typing/scoring_params.h"
namespace latinime { namespace latinime {