diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 23:03:46 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 23:03:46 -0300 |
| commit | 118eed485e8f928a5a0dab530ae93211afa10525 (patch) | |
| tree | 83efb5cbcebb7046e5b64dfe1712475a7d3b7f14 /platform/android | |
| parent | ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (diff) | |
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant.
All usages of "type" to refer to classes were renamed to "class"
ClassDB has been exposed to GDScript.
OBJ_TYPE() macro is now GDCLASS()
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/export/export.cpp | 2 | ||||
| -rw-r--r-- | platform/android/godot_android.cpp | 2 | ||||
| -rw-r--r-- | platform/android/java_class_wrapper.cpp | 2 | ||||
| -rw-r--r-- | platform/android/java_class_wrapper.h | 6 | ||||
| -rw-r--r-- | platform/android/java_glue.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 72e109fb5d..0bbb45b8f5 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -190,7 +190,7 @@ NULL}; class EditorExportPlatformAndroid : public EditorExportPlatform { - OBJ_TYPE( EditorExportPlatformAndroid,EditorExportPlatform ); + GDCLASS( EditorExportPlatformAndroid,EditorExportPlatform ); enum { diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp index d3683d8420..4ef6619146 100644 --- a/platform/android/godot_android.cpp +++ b/platform/android/godot_android.cpp @@ -57,7 +57,7 @@ extern "C" { class JNISingleton : public Object { - OBJ_TYPE( JNISingleton, Object ); + GDCLASS( JNISingleton, Object ); struct MethodData { diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp index 26123b10af..296ac0a831 100644 --- a/platform/android/java_class_wrapper.cpp +++ b/platform/android/java_class_wrapper.cpp @@ -562,7 +562,7 @@ JavaObject::~JavaObject(){ void JavaClassWrapper::_bind_methods() { - ObjectTypeDB::bind_method(_MD("wrap:JavaClass","name"),&JavaClassWrapper::wrap); + ClassDB::bind_method(_MD("wrap:JavaClass","name"),&JavaClassWrapper::wrap); } diff --git a/platform/android/java_class_wrapper.h b/platform/android/java_class_wrapper.h index 8165d636c7..ff213c7f33 100644 --- a/platform/android/java_class_wrapper.h +++ b/platform/android/java_class_wrapper.h @@ -37,7 +37,7 @@ class JavaObject; class JavaClass : public Reference { - OBJ_TYPE(JavaClass,Reference); + GDCLASS(JavaClass,Reference); enum ArgumentType { @@ -131,7 +131,7 @@ public: class JavaObject : public Reference { - OBJ_TYPE(JavaObject,Reference); + GDCLASS(JavaObject,Reference); Ref<JavaClass> base_class; friend class JavaClass; @@ -150,7 +150,7 @@ public: class JavaClassWrapper : public Object { - OBJ_TYPE(JavaClassWrapper,Object); + GDCLASS(JavaClassWrapper,Object); Map<String,Ref<JavaClass> > class_cache; diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 27219ac56c..c8dc3ce3c3 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -410,7 +410,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) { class JNISingleton : public Object { - OBJ_TYPE( JNISingleton, Object ); + GDCLASS( JNISingleton, Object ); struct MethodData { |