diff options
| author | Juan Linietsky | 2015-12-14 08:28:01 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-12-14 08:28:01 -0300 |
| commit | f2183a5e09cc55a91b550f0d8f45b45a93d82b29 (patch) | |
| tree | 49e072558a9df4c7f66e12eabdf328779716f861 /core | |
| parent | 534c8e74b9e4990ac1f63ef701330552cecfc28f (diff) | |
| download | godot-f2183a5e09cc55a91b550f0d8f45b45a93d82b29.tar.gz godot-f2183a5e09cc55a91b550f0d8f45b45a93d82b29.tar.zst godot-f2183a5e09cc55a91b550f0d8f45b45a93d82b29.zip | |
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.cpp | 2 | ||||
| -rw-r--r-- | core/io/packet_peer.cpp | 2 | ||||
| -rw-r--r-- | core/io/stream_peer.cpp | 4 | ||||
| -rw-r--r-- | core/object.cpp | 2 | ||||
| -rw-r--r-- | core/undo_redo.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 94557d149..30c90bd71 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -1977,7 +1977,7 @@ void _Thread::_bind_methods() { ObjectTypeDB::bind_method(_MD("start:Error","instance","method","userdata","priority"),&_Thread::start,DEFVAL(Variant()),DEFVAL(PRIORITY_NORMAL)); ObjectTypeDB::bind_method(_MD("get_id"),&_Thread::get_id); ObjectTypeDB::bind_method(_MD("is_active"),&_Thread::is_active); - ObjectTypeDB::bind_method(_MD("wait_to_finish:var"),&_Thread::wait_to_finish); + ObjectTypeDB::bind_method(_MD("wait_to_finish:Variant"),&_Thread::wait_to_finish); BIND_CONSTANT( PRIORITY_LOW ); BIND_CONSTANT( PRIORITY_NORMAL ); diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index f6d526b51..fc9e51f00 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -127,7 +127,7 @@ Error PacketPeer::_get_packet_error() const { void PacketPeer::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_var"),&PacketPeer::_bnd_get_var); - ObjectTypeDB::bind_method(_MD("put_var", "var:var"),&PacketPeer::put_var); + ObjectTypeDB::bind_method(_MD("put_var", "var:Variant"),&PacketPeer::put_var); ObjectTypeDB::bind_method(_MD("get_packet"),&PacketPeer::_get_packet); ObjectTypeDB::bind_method(_MD("put_packet:Error", "buffer"),&PacketPeer::_put_packet); ObjectTypeDB::bind_method(_MD("get_packet_error:Error"),&PacketPeer::_get_packet_error); diff --git a/core/io/stream_peer.cpp b/core/io/stream_peer.cpp index a76b84bed..1b39286bf 100644 --- a/core/io/stream_peer.cpp +++ b/core/io/stream_peer.cpp @@ -405,7 +405,7 @@ void StreamPeer::_bind_methods() { ObjectTypeDB::bind_method(_MD("put_float","val"),&StreamPeer::put_float); ObjectTypeDB::bind_method(_MD("put_double","val"),&StreamPeer::put_double); ObjectTypeDB::bind_method(_MD("put_utf8_string","val"),&StreamPeer::put_utf8_string); - ObjectTypeDB::bind_method(_MD("put_var","val:var"),&StreamPeer::put_var); + ObjectTypeDB::bind_method(_MD("put_var","val:Variant"),&StreamPeer::put_var); ObjectTypeDB::bind_method(_MD("get_8"),&StreamPeer::get_8); ObjectTypeDB::bind_method(_MD("get_u8"),&StreamPeer::get_u8); @@ -419,5 +419,5 @@ void StreamPeer::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_double"),&StreamPeer::get_double); ObjectTypeDB::bind_method(_MD("get_string","bytes"),&StreamPeer::get_string); ObjectTypeDB::bind_method(_MD("get_utf8_string","bytes"),&StreamPeer::get_utf8_string); - ObjectTypeDB::bind_method(_MD("get_var:var"),&StreamPeer::get_var); + ObjectTypeDB::bind_method(_MD("get_var:Variant"),&StreamPeer::get_var); } diff --git a/core/object.cpp b/core/object.cpp index f6ba76a0b..9fdd11eb2 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -1613,7 +1613,7 @@ void Object::_bind_methods() { ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"call_deferred",&Object::_call_deferred_bind,mi,defargs); } - ObjectTypeDB::bind_method(_MD("callv:var","method","arg_array"),&Object::callv); + ObjectTypeDB::bind_method(_MD("callv:Variant","method","arg_array"),&Object::callv); ObjectTypeDB::bind_method(_MD("has_method"),&Object::has_method); diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp index 85cc2bbc7..ece9a02e2 100644 --- a/core/undo_redo.cpp +++ b/core/undo_redo.cpp @@ -482,8 +482,8 @@ void UndoRedo::_bind_methods() { ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"add_undo_method",&UndoRedo::_add_undo_method,mi,defargs); } - ObjectTypeDB::bind_method(_MD("add_do_property","object", "property", "value:var"),&UndoRedo::add_do_property); - ObjectTypeDB::bind_method(_MD("add_undo_property","object", "property", "value:var"),&UndoRedo::add_undo_property); + ObjectTypeDB::bind_method(_MD("add_do_property","object", "property", "value:Variant"),&UndoRedo::add_do_property); + ObjectTypeDB::bind_method(_MD("add_undo_property","object", "property", "value:Variant"),&UndoRedo::add_undo_property); ObjectTypeDB::bind_method(_MD("add_do_reference","object"),&UndoRedo::add_do_reference); ObjectTypeDB::bind_method(_MD("add_undo_reference","object"),&UndoRedo::add_undo_reference); ObjectTypeDB::bind_method(_MD("clear_history"),&UndoRedo::clear_history); |
