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()
This commit is contained in:
Juan Linietsky 2017-01-02 23:03:46 -03:00
parent ce26eb74bc
commit 118eed485e
751 changed files with 8046 additions and 7810 deletions

View file

@ -1481,26 +1481,26 @@ RegEx::~RegEx() {
void RegExMatch::_bind_methods() {
ObjectTypeDB::bind_method(_MD("expand","template"),&RegExMatch::expand);
ObjectTypeDB::bind_method(_MD("get_group_count"),&RegExMatch::get_group_count);
ObjectTypeDB::bind_method(_MD("get_group_array"),&RegExMatch::get_group_array);
ObjectTypeDB::bind_method(_MD("get_names"),&RegExMatch::get_names);
ObjectTypeDB::bind_method(_MD("get_name_dict"),&RegExMatch::get_name_dict);
ObjectTypeDB::bind_method(_MD("get_string","name"),&RegExMatch::get_string, DEFVAL(0));
ObjectTypeDB::bind_method(_MD("get_start","name"),&RegExMatch::get_start, DEFVAL(0));
ObjectTypeDB::bind_method(_MD("get_end","name"),&RegExMatch::get_end, DEFVAL(0));
ClassDB::bind_method(_MD("expand","template"),&RegExMatch::expand);
ClassDB::bind_method(_MD("get_group_count"),&RegExMatch::get_group_count);
ClassDB::bind_method(_MD("get_group_array"),&RegExMatch::get_group_array);
ClassDB::bind_method(_MD("get_names"),&RegExMatch::get_names);
ClassDB::bind_method(_MD("get_name_dict"),&RegExMatch::get_name_dict);
ClassDB::bind_method(_MD("get_string","name"),&RegExMatch::get_string, DEFVAL(0));
ClassDB::bind_method(_MD("get_start","name"),&RegExMatch::get_start, DEFVAL(0));
ClassDB::bind_method(_MD("get_end","name"),&RegExMatch::get_end, DEFVAL(0));
}
void RegEx::_bind_methods() {
ObjectTypeDB::bind_method(_MD("clear"),&RegEx::clear);
ObjectTypeDB::bind_method(_MD("compile","pattern"),&RegEx::compile);
ObjectTypeDB::bind_method(_MD("search","text","start","end"),&RegEx::search, DEFVAL(0), DEFVAL(-1));
ObjectTypeDB::bind_method(_MD("sub","text","replacement","all","start","end"),&RegEx::sub, DEFVAL(false), DEFVAL(0), DEFVAL(-1));
ObjectTypeDB::bind_method(_MD("is_valid"),&RegEx::is_valid);
ObjectTypeDB::bind_method(_MD("get_pattern"),&RegEx::get_pattern);
ObjectTypeDB::bind_method(_MD("get_group_count"),&RegEx::get_group_count);
ObjectTypeDB::bind_method(_MD("get_names"),&RegEx::get_names);
ClassDB::bind_method(_MD("clear"),&RegEx::clear);
ClassDB::bind_method(_MD("compile","pattern"),&RegEx::compile);
ClassDB::bind_method(_MD("search","text","start","end"),&RegEx::search, DEFVAL(0), DEFVAL(-1));
ClassDB::bind_method(_MD("sub","text","replacement","all","start","end"),&RegEx::sub, DEFVAL(false), DEFVAL(0), DEFVAL(-1));
ClassDB::bind_method(_MD("is_valid"),&RegEx::is_valid);
ClassDB::bind_method(_MD("get_pattern"),&RegEx::get_pattern);
ClassDB::bind_method(_MD("get_group_count"),&RegEx::get_group_count);
ClassDB::bind_method(_MD("get_names"),&RegEx::get_names);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "pattern"), _SCS("compile"), _SCS("get_pattern"));
}

View file

@ -40,7 +40,7 @@ class RegExNode;
class RegExMatch : public Reference {
OBJ_TYPE(RegExMatch, Reference);
GDCLASS(RegExMatch, Reference);
struct Group {
Variant name;
@ -80,7 +80,7 @@ public:
class RegEx : public Resource {
OBJ_TYPE(RegEx, Resource);
GDCLASS(RegEx, Resource);
RegExNode* root;
Vector<Variant> group_names;

View file

@ -33,8 +33,8 @@
void register_regex_types() {
ObjectTypeDB::register_type<RegExMatch>();
ObjectTypeDB::register_type<RegEx>();
ClassDB::register_class<RegExMatch>();
ClassDB::register_class<RegEx>();
}
void unregister_regex_types() {