From bc26f905817945300d397696330d1ab04a1af33c Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 11 Jan 2017 00:52:51 -0300 Subject: Type renames: Matrix32 -> Transform2D Matrix3 -> Basis AABB -> Rect3 RawArray -> PoolByteArray IntArray -> PoolIntArray FloatArray -> PoolFloatArray Vector2Array -> PoolVector2Array Vector3Array -> PoolVector3Array ColorArray -> PoolColorArray --- core/bind/core_bind.cpp | 16 ++++++++-------- core/bind/core_bind.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'core/bind') diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 4b23761e4e..8f1c1779bd 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -87,12 +87,12 @@ void _ResourceLoader::set_abort_on_missing_resources(bool p_abort) { ResourceLoader::set_abort_on_missing_resources(p_abort); } -StringArray _ResourceLoader::get_dependencies(const String& p_path) { +PoolStringArray _ResourceLoader::get_dependencies(const String& p_path) { List deps; ResourceLoader::get_dependencies(p_path, &deps); - StringArray ret; + PoolStringArray ret; for(List::Element *E=deps.front();E;E=E->next()) { ret.push_back(E->get()); } @@ -2398,12 +2398,12 @@ _Thread::~_Thread() { ///////////////////////////////////// -StringArray _ClassDB::get_class_list() const { +PoolStringArray _ClassDB::get_class_list() const { List classes; ClassDB::get_class_list(&classes); - StringArray ret; + PoolStringArray ret; ret.resize(classes.size()); int idx=0; for (List::Element *E=classes.front();E;E=E->next()) { @@ -2413,12 +2413,12 @@ StringArray _ClassDB::get_class_list() const { return ret; } -StringArray _ClassDB::get_inheriters_from_class( const StringName& p_class) const { +PoolStringArray _ClassDB::get_inheriters_from_class( const StringName& p_class) const { List classes; ClassDB::get_inheriters_from_class(p_class,&classes); - StringArray ret; + PoolStringArray ret; ret.resize(classes.size()); int idx=0; for (List::Element *E=classes.front();E;E=E->next()) { @@ -2517,12 +2517,12 @@ Array _ClassDB::get_method_list(StringName p_class,bool p_no_inheritance) const return ret; } -StringArray _ClassDB::get_integer_constant_list(const StringName& p_class, bool p_no_inheritance) const { +PoolStringArray _ClassDB::get_integer_constant_list(const StringName& p_class, bool p_no_inheritance) const { List constants; ClassDB::get_integer_constant_list(p_class,&constants,p_no_inheritance); - StringArray ret; + PoolStringArray ret; ret.resize(constants.size()); int idx=0; for (List::Element *E=constants.front();E;E=E->next()) { diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 59f243a0ee..d491483d82 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -52,7 +52,7 @@ public: RES load(const String &p_path,const String& p_type_hint="", bool p_no_cache = false); PoolVector get_recognized_extensions_for_type(const String& p_type); void set_abort_on_missing_resources(bool p_abort); - StringArray get_dependencies(const String& p_path); + PoolStringArray get_dependencies(const String& p_path); bool has(const String& p_path); Ref load_import_metadata(const String& p_path); @@ -602,8 +602,8 @@ protected: static void _bind_methods(); public: - StringArray get_class_list() const; - StringArray get_inheriters_from_class( const StringName& p_class) const; + PoolStringArray get_class_list() const; + PoolStringArray get_inheriters_from_class( const StringName& p_class) const; StringName get_parent_class(const StringName& p_class) const; bool class_exists(const StringName &p_class) const; bool is_parent_class(const StringName &p_class,const StringName& p_inherits) const; @@ -621,7 +621,7 @@ public: Array get_method_list(StringName p_class,bool p_no_inheritance=false) const; - StringArray get_integer_constant_list(const StringName& p_class, bool p_no_inheritance=false) const; + PoolStringArray get_integer_constant_list(const StringName& p_class, bool p_no_inheritance=false) const; bool has_integer_constant(const StringName& p_class, const StringName &p_name) const; int get_integer_constant(const StringName& p_class, const StringName &p_name) const; StringName get_category(const StringName& p_node) const; -- cgit v1.2.3