From f1008c550168e50f930ea1e043000b395ce0f129 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Tue, 31 Jul 2012 17:56:40 +0900
Subject: [PATCH] Cleanup headers

Change-Id: I9124366b2000cad54966fb6936bb4691bbf115a3
---
 .../com_android_inputmethod_keyboard_ProximityInfo.cpp   | 8 ++++----
 .../com_android_inputmethod_latin_BinaryDictionary.cpp   | 8 ++++----
 native/jni/com_android_inputmethod_latin_NativeUtils.cpp | 2 +-
 native/jni/jni_common.cpp                                | 6 +++---
 native/jni/jni_common.h                                  | 2 --
 native/jni/src/bigram_dictionary.cpp                     | 2 +-
 native/jni/src/bigram_dictionary.h                       | 1 -
 native/jni/src/char_utils.cpp                            | 2 +-
 native/jni/src/correction.cpp                            | 9 ++++-----
 native/jni/src/correction.h                              | 2 +-
 native/jni/src/dictionary.cpp                            | 2 --
 native/jni/src/proximity_info.cpp                        | 6 +++---
 native/jni/src/proximity_info_state.cpp                  | 3 +--
 native/jni/src/proximity_info_state.h                    | 2 +-
 native/jni/src/unigram_dictionary.cpp                    | 4 ++--
 native/jni/src/unigram_dictionary.h                      | 9 ++++-----
 native/jni/src/words_priority_queue.h                    | 2 ++
 native/jni/src/words_priority_queue_pool.h               | 3 +--
 18 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
index 42284edd14..fb55ea76a8 100644
--- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
+++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
@@ -21,10 +21,10 @@
 #include "jni_common.h"
 #include "proximity_info.h"
 
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 
 namespace latinime {
 
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index 71bef937d1..435e8379d9 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
@@ -25,9 +25,9 @@
 #include "jni_common.h"
 #include "proximity_info.h"
 
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
 
 #ifdef USE_MMAP_FOR_DICTIONARY
 #include <sys/mman.h>
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #else // USE_MMAP_FOR_DICTIONARY
-#include <stdlib.h>
+#include <cstdlib>
 #endif // USE_MMAP_FOR_DICTIONARY
 
 namespace latinime {
diff --git a/native/jni/com_android_inputmethod_latin_NativeUtils.cpp b/native/jni/com_android_inputmethod_latin_NativeUtils.cpp
index 9aae817166..8f1afbeb6d 100644
--- a/native/jni/com_android_inputmethod_latin_NativeUtils.cpp
+++ b/native/jni/com_android_inputmethod_latin_NativeUtils.cpp
@@ -18,7 +18,7 @@
 #include "jni.h"
 #include "jni_common.h"
 
-#include <math.h>
+#include <cmath>
 
 namespace latinime {
 
diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp
index 4eeda1d4e0..94e279ff9b 100644
--- a/native/jni/jni_common.cpp
+++ b/native/jni/jni_common.cpp
@@ -23,9 +23,9 @@
 #include "jni.h"
 #include "proximity_info.h"
 
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
 
 using namespace latinime;
 
diff --git a/native/jni/jni_common.h b/native/jni/jni_common.h
index 771361d5e9..658ff18b91 100644
--- a/native/jni/jni_common.h
+++ b/native/jni/jni_common.h
@@ -17,8 +17,6 @@
 #ifndef LATINIME_JNI_COMMON_H
 #define LATINIME_JNI_COMMON_H
 
-#include <stdlib.h>
-
 #include "jni.h"
 
 namespace latinime {
diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp
index 8dc212203b..bc34e4e092 100644
--- a/native/jni/src/bigram_dictionary.cpp
+++ b/native/jni/src/bigram_dictionary.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <string.h>
+#include <cstring>
 
 #define LOG_TAG "LatinIME: bigram_dictionary.cpp"
 
diff --git a/native/jni/src/bigram_dictionary.h b/native/jni/src/bigram_dictionary.h
index f66e27b8ab..d676cca633 100644
--- a/native/jni/src/bigram_dictionary.h
+++ b/native/jni/src/bigram_dictionary.h
@@ -24,7 +24,6 @@
 
 namespace latinime {
 
-class Dictionary;
 class BigramDictionary {
  public:
     BigramDictionary(const unsigned char *dict, int maxWordLength, int maxPredictions);
diff --git a/native/jni/src/char_utils.cpp b/native/jni/src/char_utils.cpp
index 9d2bc85b33..88803cbcc9 100644
--- a/native/jni/src/char_utils.cpp
+++ b/native/jni/src/char_utils.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace latinime {
 
diff --git a/native/jni/src/correction.cpp b/native/jni/src/correction.cpp
index 74e256fe5f..921ab0a28d 100644
--- a/native/jni/src/correction.cpp
+++ b/native/jni/src/correction.cpp
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-#include <assert.h>
-#include <ctype.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cassert>
+#include <cctype>
+#include <cmath>
+#include <cstring>
 
 #define LOG_TAG "LatinIME: correction.cpp"
 
diff --git a/native/jni/src/correction.h b/native/jni/src/correction.h
index 13f951af5d..a7028acf0d 100644
--- a/native/jni/src/correction.h
+++ b/native/jni/src/correction.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_CORRECTION_H
 #define LATINIME_CORRECTION_H
 
-#include <assert.h>
+#include <cassert>
 #include <stdint.h>
 
 #include "correction_state.h"
diff --git a/native/jni/src/dictionary.cpp b/native/jni/src/dictionary.cpp
index dabd98b5f1..b9f65346e1 100644
--- a/native/jni/src/dictionary.cpp
+++ b/native/jni/src/dictionary.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
-
 #define LOG_TAG "LatinIME: dictionary.cpp"
 
 #include "binary_format.h"
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 393791f97a..53ae1ea277 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
+#include <cassert>
+#include <cmath>
+#include <cstring>
 #include <string>
 
 #define LOG_TAG "LatinIME: proximity_info.cpp"
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp
index d481a3bc7f..04a2017120 100644
--- a/native/jni/src/proximity_info_state.cpp
+++ b/native/jni/src/proximity_info_state.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <assert.h>
+#include <cassert>
 #include <stdint.h>
-#include <string>
 
 #define LOG_TAG "LatinIME: proximity_info_state.cpp"
 
diff --git a/native/jni/src/proximity_info_state.h b/native/jni/src/proximity_info_state.h
index a5fe528c19..456e3ec089 100644
--- a/native/jni/src/proximity_info_state.h
+++ b/native/jni/src/proximity_info_state.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_PROXIMITY_INFO_STATE_H
 #define LATINIME_PROXIMITY_INFO_STATE_H
 
-#include <assert.h>
+#include <cassert>
 #include <stdint.h>
 #include <string>
 
diff --git a/native/jni/src/unigram_dictionary.cpp b/native/jni/src/unigram_dictionary.cpp
index ce3108b3b0..b2fc870dd0 100644
--- a/native/jni/src/unigram_dictionary.cpp
+++ b/native/jni/src/unigram_dictionary.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 #define LOG_TAG "LatinIME: unigram_dictionary.cpp"
 
diff --git a/native/jni/src/unigram_dictionary.h b/native/jni/src/unigram_dictionary.h
index f6aef2bfdd..ac17f50ef5 100644
--- a/native/jni/src/unigram_dictionary.h
+++ b/native/jni/src/unigram_dictionary.h
@@ -19,16 +19,15 @@
 
 #include <map>
 #include <stdint.h>
-#include "correction.h"
-#include "correction_state.h"
 #include "defines.h"
-#include "proximity_info.h"
-#include "words_priority_queue.h"
-#include "words_priority_queue_pool.h"
 
 namespace latinime {
 
+class Correction;
+class ProximityInfo;
 class TerminalAttributes;
+class WordsPriorityQueuePool;
+
 class UnigramDictionary {
     typedef struct { int first; int second; int replacement; } digraph_t;
 
diff --git a/native/jni/src/words_priority_queue.h b/native/jni/src/words_priority_queue.h
index fc9c55e639..b24cf84704 100644
--- a/native/jni/src/words_priority_queue.h
+++ b/native/jni/src/words_priority_queue.h
@@ -20,6 +20,8 @@
 #include <cstring> // for memcpy()
 #include <iostream>
 #include <queue>
+
+#include "correction.h"
 #include "defines.h"
 
 namespace latinime {
diff --git a/native/jni/src/words_priority_queue_pool.h b/native/jni/src/words_priority_queue_pool.h
index aff307404d..38887291e2 100644
--- a/native/jni/src/words_priority_queue_pool.h
+++ b/native/jni/src/words_priority_queue_pool.h
@@ -17,8 +17,7 @@
 #ifndef LATINIME_WORDS_PRIORITY_QUEUE_POOL_H
 #define LATINIME_WORDS_PRIORITY_QUEUE_POOL_H
 
-#include <assert.h>
-#include <new>
+#include <cassert>
 #include "words_priority_queue.h"
 
 namespace latinime {
-- 
GitLab