1 files changed, 65 insertions, 65 deletions

diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index f50128ee28..d38210616e 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -173,9 +173,9 @@ void CustomPropertyEditor::_menu_option(int p_which) {
 						propvalues.push_back(p);
 					}
 
-					String orig_type = res_orig->get_type();
+					String orig_type = res_orig->get_class();
 
-					Object *inst = ObjectTypeDB::instance( orig_type );
+					Object *inst = ClassDB::instance( orig_type );
 
 					Ref<Resource> res = Ref<Resource>( inst->cast_to<Resource>() );
 
@@ -228,13 +228,13 @@ void CustomPropertyEditor::_menu_option(int p_which) {
 
 					String intype=inheritors_array[p_which-TYPE_BASE_ID];
 
-					Object *obj = ObjectTypeDB::instance(intype);
+					Object *obj = ClassDB::instance(intype);
 					ERR_BREAK( !obj );
 					Resource *res=obj->cast_to<Resource>();
 					ERR_BREAK( !res );
 					if (owner && hint==PROPERTY_HINT_RESOURCE_TYPE && hint_text=="Script") {
 						//make visual script the right type
-						res->call("set_instance_base_type",owner->get_type());
+						res->call("set_instance_base_type",owner->get_class());
 					}
 
 					v=Ref<Resource>(res).get_ref_ptr();
@@ -871,7 +871,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 					Set<String> valid_inheritors;
 					valid_inheritors.insert(base);
 					List<StringName> inheritors;
-					ObjectTypeDB::get_inheriters_from(base.strip_edges(),&inheritors);
+					ClassDB::get_inheriters_from_class(base.strip_edges(),&inheritors);
 					List<StringName>::Element *E=inheritors.front();
 					while(E) {
 						valid_inheritors.insert(E->get());
@@ -880,7 +880,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 
 					for(Set<String>::Element *E=valid_inheritors.front();E;E=E->next()) {
 						String t = E->get();
-						if (!ObjectTypeDB::can_instance(t))
+						if (!ClassDB::can_instance(t))
 							continue;
 						inheritors_array.push_back(t);
 
@@ -934,7 +934,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 					paste_valid=true;
 				else
 					for (int i = 0; i < hint_text.get_slice_count(",");i++)
-						if (ObjectTypeDB::is_type(cb->get_type(),hint_text.get_slice(",",i))) {
+						if (ClassDB::is_parent_class(cb->get_class(),hint_text.get_slice(",",i))) {
 							paste_valid=true;
 							break;
 						}
@@ -1095,13 +1095,13 @@ void CustomPropertyEditor::_type_create_selected(int p_idx) {
 		ERR_FAIL_INDEX(p_idx,inheritors_array.size());
 
 		//List<String> inheritors;
-		//ObjectTypeDB::get_inheriters_from(hint_text,&inheritors);
+		//ClassDB::get_inheriters_from(hint_text,&inheritors);
 		//inheritors.push_front(hint_text);
 
 		//ERR_FAIL_INDEX( p_idx, inheritors.size() );
 		String intype=inheritors_array[p_idx];
 
-		Object *obj = ObjectTypeDB::instance(intype);
+		Object *obj = ClassDB::instance(intype);
 
 		ERR_FAIL_COND( !obj );
 
@@ -1142,9 +1142,9 @@ void CustomPropertyEditor::_node_path_selected(NodePath p_path) {
 
 		Node *node=NULL;
 
-		 if (owner->is_type("Node"))
+		 if (owner->is_class("Node"))
 			node = owner->cast_to<Node>();
-		else if (owner->is_type("ArrayPropertyEdit"))
+		else if (owner->is_class("ArrayPropertyEdit"))
 			node = owner->cast_to<ArrayPropertyEdit>()->get_node();
 
 		if (!node) {
@@ -1285,7 +1285,7 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
 
 				if (hint==PROPERTY_HINT_RESOURCE_TYPE) {
 
-					Object *obj = ObjectTypeDB::instance(intype);
+					Object *obj = ClassDB::instance(intype);
 					ERR_BREAK( !obj );
 					Resource *res=obj->cast_to<Resource>();
 					ERR_BREAK( !res );
@@ -1353,7 +1353,7 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
 					propvalues.push_back(p);
 				}
 
-				Ref<Resource> res = Ref<Resource>( ObjectTypeDB::instance( res_orig->get_type() ));
+				Ref<Resource> res = Ref<Resource>( ClassDB::instance( res_orig->get_class() ));
 
 				ERR_FAIL_COND(res.is_null());
 
@@ -1914,22 +1914,22 @@ void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns,int
 
 void CustomPropertyEditor::_bind_methods() {
 
-	ObjectTypeDB::bind_method("_focus_enter", &CustomPropertyEditor::_focus_enter);
-	ObjectTypeDB::bind_method("_focus_exit", &CustomPropertyEditor::_focus_exit);
-	ObjectTypeDB::bind_method("_modified",&CustomPropertyEditor::_modified);
-	ObjectTypeDB::bind_method("_range_modified", &CustomPropertyEditor::_range_modified);
-	ObjectTypeDB::bind_method("_scroll_modified",&CustomPropertyEditor::_scroll_modified);
-	ObjectTypeDB::bind_method("_action_pressed",&CustomPropertyEditor::_action_pressed);
-	ObjectTypeDB::bind_method("_file_selected",&CustomPropertyEditor::_file_selected);
-	ObjectTypeDB::bind_method("_type_create_selected",&CustomPropertyEditor::_type_create_selected);
-	ObjectTypeDB::bind_method("_node_path_selected",&CustomPropertyEditor::_node_path_selected);
-	ObjectTypeDB::bind_method("_color_changed",&CustomPropertyEditor::_color_changed);
-	ObjectTypeDB::bind_method("_draw_easing",&CustomPropertyEditor::_draw_easing);
-	ObjectTypeDB::bind_method("_drag_easing",&CustomPropertyEditor::_drag_easing);
-	ObjectTypeDB::bind_method( "_text_edit_changed",&CustomPropertyEditor::_text_edit_changed);
-	ObjectTypeDB::bind_method( "_menu_option",&CustomPropertyEditor::_menu_option);
-	ObjectTypeDB::bind_method( "_create_dialog_callback",&CustomPropertyEditor::_create_dialog_callback);
-	ObjectTypeDB::bind_method( "_create_selected_property",&CustomPropertyEditor::_create_selected_property);
+	ClassDB::bind_method("_focus_enter", &CustomPropertyEditor::_focus_enter);
+	ClassDB::bind_method("_focus_exit", &CustomPropertyEditor::_focus_exit);
+	ClassDB::bind_method("_modified",&CustomPropertyEditor::_modified);
+	ClassDB::bind_method("_range_modified", &CustomPropertyEditor::_range_modified);
+	ClassDB::bind_method("_scroll_modified",&CustomPropertyEditor::_scroll_modified);
+	ClassDB::bind_method("_action_pressed",&CustomPropertyEditor::_action_pressed);
+	ClassDB::bind_method("_file_selected",&CustomPropertyEditor::_file_selected);
+	ClassDB::bind_method("_type_create_selected",&CustomPropertyEditor::_type_create_selected);
+	ClassDB::bind_method("_node_path_selected",&CustomPropertyEditor::_node_path_selected);
+	ClassDB::bind_method("_color_changed",&CustomPropertyEditor::_color_changed);
+	ClassDB::bind_method("_draw_easing",&CustomPropertyEditor::_draw_easing);
+	ClassDB::bind_method("_drag_easing",&CustomPropertyEditor::_drag_easing);
+	ClassDB::bind_method( "_text_edit_changed",&CustomPropertyEditor::_text_edit_changed);
+	ClassDB::bind_method( "_menu_option",&CustomPropertyEditor::_menu_option);
+	ClassDB::bind_method( "_create_dialog_callback",&CustomPropertyEditor::_create_dialog_callback);
+	ClassDB::bind_method( "_create_selected_property",&CustomPropertyEditor::_create_selected_property);
 
 
 
@@ -2404,7 +2404,7 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p
 
 			} else {
 				RES res = obj->get( p_name ).operator RefPtr();
-				if (res->is_type("Texture")) {
+				if (res->is_class("Texture")) {
 					int tw = EditorSettings::get_singleton()->get("property_editor/texture_preview_width");
 					p_item->set_icon_max_width(1,tw);
 					p_item->set_icon(1,res);
@@ -2416,20 +2416,20 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p
 				} else if (res->get_path()!="" && !res->get_path().begins_with("local://")) {
 					p_item->set_text(1, res->get_path().get_file());
 				} else {
-					p_item->set_text(1,"<"+res->get_type()+">");
+					p_item->set_text(1,"<"+res->get_class()+">");
 				};
 
 
 				if (res.is_valid() && res->get_path().is_resource_file()) {
 					p_item->set_tooltip(1,res->get_path());
 				} else if (res.is_valid()) {
-					p_item->set_tooltip(1,res->get_name()+" ("+res->get_type()+")");
+					p_item->set_tooltip(1,res->get_name()+" ("+res->get_class()+")");
 				}
 
 
-				if (has_icon(res->get_type(),"EditorIcons")) {
+				if (has_icon(res->get_class(),"EditorIcons")) {
 
-					p_item->set_icon(0,get_icon(res->get_type(),"EditorIcons"));
+					p_item->set_icon(0,get_icon(res->get_class(),"EditorIcons"));
 				} else {
 
 					Dictionary d = p_item->get_metadata(0);
@@ -2448,7 +2448,7 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p
 					}
 				}
 
-				if (!res->is_type("Texture")) {
+				if (!res->is_class("Texture")) {
 					//texture already previews via itself
 					EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res,this,"_resource_preview_done",p_item->get_instance_ID());
 				}
@@ -2555,7 +2555,7 @@ bool PropertyEditor::_is_drop_valid(const Dictionary& p_drag_data, const Diction
 				Ref<Resource> res = drag_data["resource"];
 				for(int i=0;i<allowed_type.get_slice_count(",");i++) {
 					String at = allowed_type.get_slice(",",i).strip_edges();
-					if (res.is_valid() && ObjectTypeDB::is_type(res->get_type(),at)) {
+					if (res.is_valid() && ClassDB::is_parent_class(res->get_class(),at)) {
 						return true;
 					}
 				}
@@ -2573,7 +2573,7 @@ bool PropertyEditor::_is_drop_valid(const Dictionary& p_drag_data, const Diction
 
 						for(int i=0;i<allowed_type.get_slice_count(",");i++) {
 							String at = allowed_type.get_slice(",",i).strip_edges();
-							if (ObjectTypeDB::is_type(ftype,at)) {
+							if (ClassDB::is_parent_class(ftype,at)) {
 								return true;
 							}
 						}
@@ -3122,7 +3122,7 @@ void PropertyEditor::update_tree() {
 		if (use_doc_hints) {
 			StringName setter;
 			StringName type;
-			if (ObjectTypeDB::get_setter_and_type_for_property(obj->get_type_name(),p.name,type,setter)) {
+			if (ClassDB::get_setter_and_type_for_property(obj->get_class_name(),p.name,type,setter)) {
 
 				String descr;
 				bool found=false;
@@ -3635,7 +3635,7 @@ void PropertyEditor::update_tree() {
 				} else {
 					RES res = obj->get( p.name ).operator RefPtr();
 
-					if (res->is_type("Texture")) {
+					if (res->is_class("Texture")) {
 						int tw = EditorSettings::get_singleton()->get("property_editor/texture_preview_width");
 						item->set_icon_max_width(1,tw);
 						item->set_icon(1,res);
@@ -3648,19 +3648,19 @@ void PropertyEditor::update_tree() {
 						item->set_text(1, res->get_path().get_file());
 
 					} else {
-						item->set_text(1,"<"+res->get_type()+">");
+						item->set_text(1,"<"+res->get_class()+">");
 					}
 
-					if (has_icon(res->get_type(),"EditorIcons")) {
-						type=res->get_type();
+					if (has_icon(res->get_class(),"EditorIcons")) {
+						type=res->get_class();
 					}
 
 					if (res.is_valid() && res->get_path().is_resource_file()) {
 						item->set_tooltip(1,res->get_path());
 					} else if (res.is_valid()) {
-						item->set_tooltip(1,res->get_name()+" ("+res->get_type()+")");
+						item->set_tooltip(1,res->get_name()+" ("+res->get_class()+")");
 					}
-					if (!res->is_type("Texture")) {
+					if (!res->is_class("Texture")) {
 						//texture already previews via itself
 						EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res,this,"_resource_preview_done",item->get_instance_ID());
 					}
@@ -4214,24 +4214,24 @@ void PropertyEditor::_resource_preview_done(const String& p_path,const Ref<Textu
 }
 void PropertyEditor::_bind_methods() {
 
-	ObjectTypeDB::bind_method( "_item_edited",&PropertyEditor::_item_edited);
-	ObjectTypeDB::bind_method( "_item_selected",&PropertyEditor::_item_selected);
-	ObjectTypeDB::bind_method( "_custom_editor_request",&PropertyEditor::_custom_editor_request);
-	ObjectTypeDB::bind_method( "_custom_editor_edited",&PropertyEditor::_custom_editor_edited);
-	ObjectTypeDB::bind_method( "_resource_edit_request",&PropertyEditor::_resource_edit_request);
-	ObjectTypeDB::bind_method( "_node_removed",&PropertyEditor::_node_removed);
-	ObjectTypeDB::bind_method( "_edit_button",&PropertyEditor::_edit_button);
-	ObjectTypeDB::bind_method( "_changed_callback",&PropertyEditor::_changed_callbacks);
-	ObjectTypeDB::bind_method( "_draw_flags",&PropertyEditor::_draw_flags);
-	ObjectTypeDB::bind_method( "_set_range_def",&PropertyEditor::_set_range_def);
-	ObjectTypeDB::bind_method( "_filter_changed",&PropertyEditor::_filter_changed);
-	ObjectTypeDB::bind_method( "update_tree",&PropertyEditor::update_tree);
-	ObjectTypeDB::bind_method( "_resource_preview_done",&PropertyEditor::_resource_preview_done);
-	ObjectTypeDB::bind_method( "refresh",&PropertyEditor::refresh);
-
-	ObjectTypeDB::bind_method(_MD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw);
-	ObjectTypeDB::bind_method(_MD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw);
-	ObjectTypeDB::bind_method(_MD("drop_data_fw"), &PropertyEditor::drop_data_fw);
+	ClassDB::bind_method( "_item_edited",&PropertyEditor::_item_edited);
+	ClassDB::bind_method( "_item_selected",&PropertyEditor::_item_selected);
+	ClassDB::bind_method( "_custom_editor_request",&PropertyEditor::_custom_editor_request);
+	ClassDB::bind_method( "_custom_editor_edited",&PropertyEditor::_custom_editor_edited);
+	ClassDB::bind_method( "_resource_edit_request",&PropertyEditor::_resource_edit_request);
+	ClassDB::bind_method( "_node_removed",&PropertyEditor::_node_removed);
+	ClassDB::bind_method( "_edit_button",&PropertyEditor::_edit_button);
+	ClassDB::bind_method( "_changed_callback",&PropertyEditor::_changed_callbacks);
+	ClassDB::bind_method( "_draw_flags",&PropertyEditor::_draw_flags);
+	ClassDB::bind_method( "_set_range_def",&PropertyEditor::_set_range_def);
+	ClassDB::bind_method( "_filter_changed",&PropertyEditor::_filter_changed);
+	ClassDB::bind_method( "update_tree",&PropertyEditor::update_tree);
+	ClassDB::bind_method( "_resource_preview_done",&PropertyEditor::_resource_preview_done);
+	ClassDB::bind_method( "refresh",&PropertyEditor::refresh);
+
+	ClassDB::bind_method(_MD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw);
+	ClassDB::bind_method(_MD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw);
+	ClassDB::bind_method(_MD("drop_data_fw"), &PropertyEditor::drop_data_fw);
 
 	ADD_SIGNAL( MethodInfo("property_toggled",PropertyInfo( Variant::STRING, "property"),PropertyInfo( Variant::BOOL, "value")));
 	ADD_SIGNAL( MethodInfo("resource_selected", PropertyInfo( Variant::OBJECT, "res"),PropertyInfo( Variant::STRING, "prop") ) );
@@ -4398,7 +4398,7 @@ PropertyEditor::~PropertyEditor()
 
 class SectionedPropertyEditorFilter : public Object {
 
-	OBJ_TYPE( SectionedPropertyEditorFilter, Object );
+	GDCLASS( SectionedPropertyEditorFilter, Object );
 
 	Object *edited;
 	String section;
@@ -4482,9 +4482,9 @@ public:
 
 void SectionedPropertyEditor::_bind_methods() {
 
-	ObjectTypeDB::bind_method("_section_selected",&SectionedPropertyEditor::_section_selected);
+	ClassDB::bind_method("_section_selected",&SectionedPropertyEditor::_section_selected);
 
-	ObjectTypeDB::bind_method("update_category_list", &SectionedPropertyEditor::update_category_list);
+	ClassDB::bind_method("update_category_list", &SectionedPropertyEditor::update_category_list);
 }
 
 void SectionedPropertyEditor::_section_selected(int p_which) {