summaryrefslogtreecommitdiffstats
path: root/tools/editor/connections_dialog.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-02 23:03:46 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-02 23:03:46 -0300
commit118eed485e8f928a5a0dab530ae93211afa10525 (patch)
tree83efb5cbcebb7046e5b64dfe1712475a7d3b7f14 /tools/editor/connections_dialog.cpp
parentce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (diff)
downloadredot-engine-118eed485e8f928a5a0dab530ae93211afa10525.tar.gz
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 'tools/editor/connections_dialog.cpp')
-rw-r--r--tools/editor/connections_dialog.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/tools/editor/connections_dialog.cpp b/tools/editor/connections_dialog.cpp
index dc3d6d08f1..f60dfff49c 100644
--- a/tools/editor/connections_dialog.cpp
+++ b/tools/editor/connections_dialog.cpp
@@ -39,7 +39,7 @@
class ConnectDialogBinds : public Object {
- OBJ_TYPE( ConnectDialogBinds, Object );
+ GDCLASS( ConnectDialogBinds, Object );
public:
Vector<Variant> params;
@@ -127,7 +127,7 @@ void ConnectDialog::_tree_node_selected() {
if (E->get().name.length() && E->get().name[0]=='_')
continue; // hidden method, not show!
- if (ObjectTypeDB::has_method(node->get_type(),"Node") || ObjectTypeDB::has_method(node->get_type(),"Control",true))
+ if (ClassDB::has_method(node->get_type(),"Node") || ClassDB::has_method(node->get_type(),"Control",true))
continue; //avoid too much unnecesary stuff
String method=E->get().name+"(";
@@ -290,13 +290,13 @@ void ConnectDialog::set_dst_method(const StringName& p_method) {
void ConnectDialog::_bind_methods() {
- //ObjectTypeDB::bind_method("_ok",&ConnectDialog::_ok_pressed);
- ObjectTypeDB::bind_method("_cancel",&ConnectDialog::_cancel_pressed);
- //ObjectTypeDB::bind_method("_dst_method_list_selected",&ConnectDialog::_dst_method_list_selected);
- ObjectTypeDB::bind_method("_tree_node_selected",&ConnectDialog::_tree_node_selected);
+ //ClassDB::bind_method("_ok",&ConnectDialog::_ok_pressed);
+ ClassDB::bind_method("_cancel",&ConnectDialog::_cancel_pressed);
+ //ClassDB::bind_method("_dst_method_list_selected",&ConnectDialog::_dst_method_list_selected);
+ ClassDB::bind_method("_tree_node_selected",&ConnectDialog::_tree_node_selected);
- ObjectTypeDB::bind_method("_add_bind",&ConnectDialog::_add_bind);
- ObjectTypeDB::bind_method("_remove_bind",&ConnectDialog::_remove_bind);
+ ClassDB::bind_method("_add_bind",&ConnectDialog::_add_bind);
+ ClassDB::bind_method("_remove_bind",&ConnectDialog::_remove_bind);
ADD_SIGNAL( MethodInfo("connected") );
}
@@ -616,7 +616,7 @@ void ConnectionsDock::update_tree() {
//node_signals.sort_custom<_ConnectionsDockMethodInfoSort>();
bool did_script=false;
- StringName base = node->get_type();
+ StringName base = node->get_class();
while(base) {
@@ -632,16 +632,16 @@ void ConnectionsDock::update_tree() {
if (scr->get_path().is_resource_file())
name=scr->get_path().get_file();
else
- name=scr->get_type();
+ name=scr->get_class();
- if (has_icon(scr->get_type(),"EditorIcons")) {
- icon=get_icon(scr->get_type(),"EditorIcons");
+ if (has_icon(scr->get_class(),"EditorIcons")) {
+ icon=get_icon(scr->get_class(),"EditorIcons");
}
}
} else {
- ObjectTypeDB::get_signal_list(base,&node_signals,true);
+ ClassDB::get_signal_list(base,&node_signals,true);
if (has_icon(base,"EditorIcons")) {
icon=get_icon(base,"EditorIcons");
}
@@ -740,7 +740,7 @@ void ConnectionsDock::update_tree() {
if (!did_script) {
did_script=true;
} else {
- base=ObjectTypeDB::type_inherits_from(base);
+ base=ClassDB::get_parent_class(base);
}
}
@@ -825,12 +825,12 @@ void ConnectionsDock::_something_activated() {
void ConnectionsDock::_bind_methods() {
- ObjectTypeDB::bind_method("_connect",&ConnectionsDock::_connect);
- ObjectTypeDB::bind_method("_something_selected",&ConnectionsDock::_something_selected);
- ObjectTypeDB::bind_method("_something_activated",&ConnectionsDock::_something_activated);
- ObjectTypeDB::bind_method("_close",&ConnectionsDock::_close);
- ObjectTypeDB::bind_method("_connect_pressed",&ConnectionsDock::_connect_pressed);
- ObjectTypeDB::bind_method("update_tree",&ConnectionsDock::update_tree);
+ ClassDB::bind_method("_connect",&ConnectionsDock::_connect);
+ ClassDB::bind_method("_something_selected",&ConnectionsDock::_something_selected);
+ ClassDB::bind_method("_something_activated",&ConnectionsDock::_something_activated);
+ ClassDB::bind_method("_close",&ConnectionsDock::_close);
+ ClassDB::bind_method("_connect_pressed",&ConnectionsDock::_connect_pressed);
+ ClassDB::bind_method("update_tree",&ConnectionsDock::update_tree);
}