From 1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Fri, 3 Aug 2012 17:59:26 +0900
Subject: [PATCH] Header cleanup
Change-Id: I1aa91708d0de01ca3e84e69ec8d3a3832c386ca8
---
.../com_android_inputmethod_keyboard_ProximityInfo.cpp | 9 +++++----
.../com_android_inputmethod_latin_BinaryDictionary.cpp | 3 ++-
native/jni/jni_common.cpp | 3 ---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
index 93e19b3679..74390ccdf3 100644
--- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
+++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
@@ -16,6 +16,8 @@
#define LOG_TAG "LatinIME: jni: ProximityInfo"
+#include <string>
+
#include "com_android_inputmethod_keyboard_ProximityInfo.h"
#include "jni.h"
#include "jni_common.h"
@@ -42,10 +44,9 @@ static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jobject object,
jfloat *sweetSpotCenterYs = safeGetFloatArrayElements(env, sweetSpotCenterYArray);
jfloat *sweetSpotRadii = safeGetFloatArrayElements(env, sweetSpotRadiusArray);
ProximityInfo *proximityInfo = new ProximityInfo(
- localeStr, maxProximityCharsSize, displayWidth,
- displayHeight, gridWidth, gridHeight, mostCommonkeyWidth,
- (const int32_t*)proximityChars,
- keyCount, (const int32_t*)keyXCoordinates, (const int32_t*)keyYCoordinates,
+ localeStr, maxProximityCharsSize, displayWidth, displayHeight, gridWidth, gridHeight,
+ mostCommonkeyWidth, (const int32_t*)proximityChars, keyCount,
+ (const int32_t*)keyXCoordinates, (const int32_t*)keyYCoordinates,
(const int32_t*)keyWidths, (const int32_t*)keyHeights, (const int32_t*)keyCharCodes,
(const float*)sweetSpotCenterXs, (const float*)sweetSpotCenterYs,
(const float*)sweetSpotRadii);
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index 2d3d963099..776f5f78fa 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
@@ -25,8 +25,9 @@
#include "jni_common.h"
#ifdef USE_MMAP_FOR_DICTIONARY
-#include <sys/mman.h>
+#include <cerrno>
#include <fcntl.h>
+#include <sys/mman.h>
#else // USE_MMAP_FOR_DICTIONARY
#include <cstdlib>
#endif // USE_MMAP_FOR_DICTIONARY
diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp
index cb2351db11..105a4dc4c9 100644
--- a/native/jni/jni_common.cpp
+++ b/native/jni/jni_common.cpp
@@ -22,11 +22,8 @@
#include "defines.h"
#include "jni.h"
#include "jni_common.h"
-#include "proximity_info.h"
#include <cassert>
-#include <cerrno>
-#include <cstdio>
using namespace latinime;
--
GitLab