Rename cocos_android_app_init to axmol_android_app_init and othre cod…

…e cleanup
axmolengine · Jan 29, 2024 · c06bed5 · c06bed5
1 parent 74189ff
commit c06bed5
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/core/2d/ActionCoroutine.cpp b/core/2d/ActionCoroutine.cpp
@@ -82,7 +82,7 @@ bool Coroutine::moveNext() const
 //
 ActionCoroutine* ActionCoroutine::create(const std::function<Coroutine()>& function)
 {
-    auto ret = new (std::nothrow) ActionCoroutine();
+    auto ret = new ActionCoroutine();
     if (ret && ret->initWithCoroutine(function))
     {
         ret->autorelease();

diff --git a/core/base/AutoreleasePool.cpp b/core/base/AutoreleasePool.cpp
@@ -112,7 +112,7 @@ PoolManager* PoolManager::getInstance()
     {
         s_singleInstance = new PoolManager();
         // Add the first auto release pool
-        new AutoreleasePool("cocos2d autorelease pool");
+        new AutoreleasePool("axmol autorelease pool");
     }
     return s_singleInstance;
 }

diff --git a/core/platform/android/javaactivity-android.cpp b/core/platform/android/javaactivity-android.cpp
@@ -41,7 +41,7 @@ THE SOFTWARE.
 #define LOG_TAG "main"
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 
-void cocos_android_app_init(JNIEnv* env) __attribute__((weak));
+void axmol_android_app_init(JNIEnv* env) __attribute__((weak));
 
 USING_NS_AX;
 
@@ -75,7 +75,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved)
 {
     JniHelper::setJavaVM(vm);
 
-    cocos_android_app_init(JniHelper::getEnv());
+    axmol_android_app_init(JniHelper::getEnv());
 
     return JNI_VERSION_1_4;
 }

diff --git a/templates/cpp-template-default/proj.android/app/jni/main.cpp b/templates/cpp-template-default/proj.android/app/jni/main.cpp
@@ -37,8 +37,8 @@ namespace
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env)
+void axmol_android_app_init(JNIEnv* env)
 {
-    LOGD("cocos_android_app_init");
+    LOGD("axmol_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/templates/lua-template-default/proj.android/app/jni/main.cpp b/templates/lua-template-default/proj.android/app/jni/main.cpp
@@ -37,8 +37,8 @@ namespace
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env)
+void axmol_android_app_init(JNIEnv* env)
 {
-    LOGD("cocos_android_app_init");
+    LOGD("axmol_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/cpp-tests/proj.android/app/jni/main.cpp b/tests/cpp-tests/proj.android/app/jni/main.cpp
@@ -37,8 +37,8 @@ namespace
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env)
+void axmol_android_app_init(JNIEnv* env)
 {
-    LOGD("cocos_android_app_init");
+    LOGD("axmol_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/fairygui-tests/proj.android/app/jni/main.cpp b/tests/fairygui-tests/proj.android/app/jni/main.cpp
@@ -36,7 +36,7 @@ namespace {
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env) {
-    LOGD("cocos_android_app_init");
+void axmol_android_app_init(JNIEnv* env) {
+    LOGD("axmol_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/live2d-tests/proj.android/app/jni/main.cpp b/tests/live2d-tests/proj.android/app/jni/main.cpp
@@ -38,8 +38,8 @@ namespace
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env)
+void axmol_android_app_init(JNIEnv* env)
 {
-    LOGD("cocos_android_app_init");
+    LOGD("axmol_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/lua-tests/proj.android/app/jni/main.cpp b/tests/lua-tests/proj.android/app/jni/main.cpp
@@ -37,8 +37,8 @@ namespace
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env)
+void axmol_android_app_init(JNIEnv* env)
 {
-    LOGD("cocos_android_app_init");
+    LOGD("axmol_android_app_init");
     appDelegate.reset(new AppDelegate());
 }