From 266e4e165404d218fcf860e1a73dcfdf6f60b4e1 Mon Sep 17 00:00:00 2001
From: Jason Xu <xhcnb@qq.com>
Date: Fri, 29 Nov 2013 19:34:36 +0800
Subject: [PATCH] rename to with Jni suffex

---
 cocos/2d/platform/android/CCDevice.cpp       |  6 +++---
 cocos/2d/platform/android/nativeactivity.cpp | 12 ++++++------
 cocos/2d/platform/android/nativeactivity.h   |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cocos/2d/platform/android/CCDevice.cpp b/cocos/2d/platform/android/CCDevice.cpp
index 4d33c181d5..2915cf6994 100644
--- a/cocos/2d/platform/android/CCDevice.cpp
+++ b/cocos/2d/platform/android/CCDevice.cpp
@@ -18,17 +18,17 @@ void Device::setAccelerometerEnabled(bool isEnabled)
 {
     if (isEnabled)
     {
-        enableAccelerometer_native();
+        enableAccelerometerJni();
     }
     else
     {
-        disableAccelerometer_native();
+        disableAccelerometerJni();
     }
 }
 
 void Device::setAccelerometerInterval(float interval)
 {
-	setAccelerometerInterval_native(interval);
+	setAccelerometerIntervalJni(interval);
 }
 
 NS_CC_END
diff --git a/cocos/2d/platform/android/nativeactivity.cpp b/cocos/2d/platform/android/nativeactivity.cpp
index 5772a410ab..e7eeb1606a 100644
--- a/cocos/2d/platform/android/nativeactivity.cpp
+++ b/cocos/2d/platform/android/nativeactivity.cpp
@@ -471,8 +471,8 @@ static int32_t engine_handle_input(struct android_app* app, AInputEvent* event)
     return 0;
 }
 
-void enableAccelerometer_native(void) {
-    LOGI("enableAccelerometer_native()");
+void enableAccelerometerJni(void) {
+    LOGI("enableAccelerometerJni()");
 
     if (engine.accelerometerSensor != NULL) {
         ASensorEventQueue_enableSensor(engine.sensorEventQueue,
@@ -485,8 +485,8 @@ void enableAccelerometer_native(void) {
     }
 }
 
-void disableAccelerometer_native(void) {
-    LOGI("disableAccelerometer_native()");
+void disableAccelerometerJni(void) {
+    LOGI("disableAccelerometerJni()");
 
     if (engine.accelerometerSensor != NULL) {
         ASensorEventQueue_disableSensor(engine.sensorEventQueue,
@@ -494,8 +494,8 @@ void disableAccelerometer_native(void) {
     }
 }
 
-void setAccelerometerInterval_native(float interval) {
-    LOGI("setAccelerometerInterval_native(%f)", interval);
+void setAccelerometerIntervalJni(float interval) {
+    LOGI("setAccelerometerIntervalJni(%f)", interval);
         // We'd like to get 60 events per second (in us).
         ASensorEventQueue_setEventRate(engine.sensorEventQueue,
                                        engine.accelerometerSensor, interval * 1000000L);
diff --git a/cocos/2d/platform/android/nativeactivity.h b/cocos/2d/platform/android/nativeactivity.h
index 4d6236aca8..677fff3adf 100644
--- a/cocos/2d/platform/android/nativeactivity.h
+++ b/cocos/2d/platform/android/nativeactivity.h
@@ -5,8 +5,8 @@
  * This is the interface to the Android native activity
  */
 
-void enableAccelerometer_native(void);
-void disableAccelerometer_native(void);
-void setAccelerometerInterval_native(float interval);
+void enableAccelerometerJni(void);
+void disableAccelerometerJni(void);
+void setAccelerometerIntervalJni(float interval);
 
 #endif // __COCOSNATIVEACTIVITY_H__