aboutsummaryrefslogtreecommitdiff
path: root/core/io
diff options
context:
space:
mode:
Diffstat (limited to 'core/io')
-rw-r--r--core/io/config_file.cpp18
-rw-r--r--core/io/http_client.cpp42
-rw-r--r--core/io/ip.cpp14
-rw-r--r--core/io/networked_multiplayer_peer.cpp16
-rw-r--r--core/io/packet_peer.cpp14
-rw-r--r--core/io/packet_peer_udp.cpp16
-rw-r--r--core/io/pck_packer.cpp6
-rw-r--r--core/io/resource_loader.cpp10
-rw-r--r--core/io/stream_peer.cpp80
-rw-r--r--core/io/stream_peer_ssl.cpp8
-rw-r--r--core/io/stream_peer_tcp.cpp12
-rw-r--r--core/io/tcp_server.cpp8
-rw-r--r--core/io/xml_parser.cpp34
13 files changed, 139 insertions, 139 deletions
diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp
index b944906e7..fdfcc3ae3 100644
--- a/core/io/config_file.cpp
+++ b/core/io/config_file.cpp
@@ -209,19 +209,19 @@ Error ConfigFile::load(const String& p_path) {
void ConfigFile::_bind_methods(){
- ClassDB::bind_method(_MD("set_value","section","key","value"),&ConfigFile::set_value);
- ClassDB::bind_method(_MD("get_value:Variant","section","key","default"),&ConfigFile::get_value,DEFVAL(Variant()));
+ ClassDB::bind_method(D_METHOD("set_value","section","key","value"),&ConfigFile::set_value);
+ ClassDB::bind_method(D_METHOD("get_value:Variant","section","key","default"),&ConfigFile::get_value,DEFVAL(Variant()));
- ClassDB::bind_method(_MD("has_section","section"),&ConfigFile::has_section);
- ClassDB::bind_method(_MD("has_section_key","section","key"),&ConfigFile::has_section_key);
+ ClassDB::bind_method(D_METHOD("has_section","section"),&ConfigFile::has_section);
+ ClassDB::bind_method(D_METHOD("has_section_key","section","key"),&ConfigFile::has_section_key);
- ClassDB::bind_method(_MD("get_sections"),&ConfigFile::_get_sections);
- ClassDB::bind_method(_MD("get_section_keys","section"),&ConfigFile::_get_section_keys);
+ ClassDB::bind_method(D_METHOD("get_sections"),&ConfigFile::_get_sections);
+ ClassDB::bind_method(D_METHOD("get_section_keys","section"),&ConfigFile::_get_section_keys);
- ClassDB::bind_method(_MD("erase_section","section"),&ConfigFile::erase_section);
+ ClassDB::bind_method(D_METHOD("erase_section","section"),&ConfigFile::erase_section);
- ClassDB::bind_method(_MD("load:Error","path"),&ConfigFile::load);
- ClassDB::bind_method(_MD("save:Error","path"),&ConfigFile::save);
+ ClassDB::bind_method(D_METHOD("load:Error","path"),&ConfigFile::load);
+ ClassDB::bind_method(D_METHOD("save:Error","path"),&ConfigFile::save);
}
diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp
index 750c458da..5c54f16f1 100644
--- a/core/io/http_client.cpp
+++ b/core/io/http_client.cpp
@@ -636,31 +636,31 @@ Error HTTPClient::_get_http_data(uint8_t* p_buffer, int p_bytes,int &r_received)
void HTTPClient::_bind_methods() {
- ClassDB::bind_method(_MD("connect_to_host:Error","host","port","use_ssl","verify_host"),&HTTPClient::connect_to_host,DEFVAL(false),DEFVAL(true));
- ClassDB::bind_method(_MD("set_connection","connection:StreamPeer"),&HTTPClient::set_connection);
- ClassDB::bind_method(_MD("get_connection:StreamPeer"),&HTTPClient::get_connection);
- ClassDB::bind_method(_MD("request_raw","method","url","headers","body"),&HTTPClient::request_raw);
- ClassDB::bind_method(_MD("request","method","url","headers","body"),&HTTPClient::request,DEFVAL(String()));
- ClassDB::bind_method(_MD("send_body_text","body"),&HTTPClient::send_body_text);
- ClassDB::bind_method(_MD("send_body_data","body"),&HTTPClient::send_body_data);
- ClassDB::bind_method(_MD("close"),&HTTPClient::close);
+ ClassDB::bind_method(D_METHOD("connect_to_host:Error","host","port","use_ssl","verify_host"),&HTTPClient::connect_to_host,DEFVAL(false),DEFVAL(true));
+ ClassDB::bind_method(D_METHOD("set_connection","connection:StreamPeer"),&HTTPClient::set_connection);
+ ClassDB::bind_method(D_METHOD("get_connection:StreamPeer"),&HTTPClient::get_connection);
+ ClassDB::bind_method(D_METHOD("request_raw","method","url","headers","body"),&HTTPClient::request_raw);
+ ClassDB::bind_method(D_METHOD("request","method","url","headers","body"),&HTTPClient::request,DEFVAL(String()));
+ ClassDB::bind_method(D_METHOD("send_body_text","body"),&HTTPClient::send_body_text);
+ ClassDB::bind_method(D_METHOD("send_body_data","body"),&HTTPClient::send_body_data);
+ ClassDB::bind_method(D_METHOD("close"),&HTTPClient::close);
- ClassDB::bind_method(_MD("has_response"),&HTTPClient::has_response);
- ClassDB::bind_method(_MD("is_response_chunked"),&HTTPClient::is_response_chunked);
- ClassDB::bind_method(_MD("get_response_code"),&HTTPClient::get_response_code);
- ClassDB::bind_method(_MD("get_response_headers"),&HTTPClient::_get_response_headers);
- ClassDB::bind_method(_MD("get_response_headers_as_dictionary"),&HTTPClient::_get_response_headers_as_dictionary);
- ClassDB::bind_method(_MD("get_response_body_length"),&HTTPClient::get_response_body_length);
- ClassDB::bind_method(_MD("read_response_body_chunk"),&HTTPClient::read_response_body_chunk);
- ClassDB::bind_method(_MD("set_read_chunk_size","bytes"),&HTTPClient::set_read_chunk_size);
+ ClassDB::bind_method(D_METHOD("has_response"),&HTTPClient::has_response);
+ ClassDB::bind_method(D_METHOD("is_response_chunked"),&HTTPClient::is_response_chunked);
+ ClassDB::bind_method(D_METHOD("get_response_code"),&HTTPClient::get_response_code);
+ ClassDB::bind_method(D_METHOD("get_response_headers"),&HTTPClient::_get_response_headers);
+ ClassDB::bind_method(D_METHOD("get_response_headers_as_dictionary"),&HTTPClient::_get_response_headers_as_dictionary);
+ ClassDB::bind_method(D_METHOD("get_response_body_length"),&HTTPClient::get_response_body_length);
+ ClassDB::bind_method(D_METHOD("read_response_body_chunk"),&HTTPClient::read_response_body_chunk);
+ ClassDB::bind_method(D_METHOD("set_read_chunk_size","bytes"),&HTTPClient::set_read_chunk_size);
- ClassDB::bind_method(_MD("set_blocking_mode","enabled"),&HTTPClient::set_blocking_mode);
- ClassDB::bind_method(_MD("is_blocking_mode_enabled"),&HTTPClient::is_blocking_mode_enabled);
+ ClassDB::bind_method(D_METHOD("set_blocking_mode","enabled"),&HTTPClient::set_blocking_mode);
+ ClassDB::bind_method(D_METHOD("is_blocking_mode_enabled"),&HTTPClient::is_blocking_mode_enabled);
- ClassDB::bind_method(_MD("get_status"),&HTTPClient::get_status);
- ClassDB::bind_method(_MD("poll:Error"),&HTTPClient::poll);
+ ClassDB::bind_method(D_METHOD("get_status"),&HTTPClient::get_status);
+ ClassDB::bind_method(D_METHOD("poll:Error"),&HTTPClient::poll);
- ClassDB::bind_method(_MD("query_string_from_dict:String","fields"),&HTTPClient::query_string_from_dict);
+ ClassDB::bind_method(D_METHOD("query_string_from_dict:String","fields"),&HTTPClient::query_string_from_dict);
BIND_CONSTANT( METHOD_GET );
diff --git a/core/io/ip.cpp b/core/io/ip.cpp
index 13e5494dd..d820273a1 100644
--- a/core/io/ip.cpp
+++ b/core/io/ip.cpp
@@ -218,13 +218,13 @@ Array IP::_get_local_addresses() const {
void IP::_bind_methods() {
- ClassDB::bind_method(_MD("resolve_hostname","host","ip_type"),&IP::resolve_hostname,DEFVAL(IP::TYPE_ANY));
- ClassDB::bind_method(_MD("resolve_hostname_queue_item","host","ip_type"),&IP::resolve_hostname_queue_item,DEFVAL(IP::TYPE_ANY));
- ClassDB::bind_method(_MD("get_resolve_item_status","id"),&IP::get_resolve_item_status);
- ClassDB::bind_method(_MD("get_resolve_item_address","id"),&IP::get_resolve_item_address);
- ClassDB::bind_method(_MD("erase_resolve_item","id"),&IP::erase_resolve_item);
- ClassDB::bind_method(_MD("get_local_addresses"),&IP::_get_local_addresses);
- ClassDB::bind_method(_MD("clear_cache"),&IP::clear_cache, DEFVAL(""));
+ ClassDB::bind_method(D_METHOD("resolve_hostname","host","ip_type"),&IP::resolve_hostname,DEFVAL(IP::TYPE_ANY));
+ ClassDB::bind_method(D_METHOD("resolve_hostname_queue_item","host","ip_type"),&IP::resolve_hostname_queue_item,DEFVAL(IP::TYPE_ANY));
+ ClassDB::bind_method(D_METHOD("get_resolve_item_status","id"),&IP::get_resolve_item_status);
+ ClassDB::bind_method(D_METHOD("get_resolve_item_address","id"),&IP::get_resolve_item_address);
+ ClassDB::bind_method(D_METHOD("erase_resolve_item","id"),&IP::erase_resolve_item);
+ ClassDB::bind_method(D_METHOD("get_local_addresses"),&IP::_get_local_addresses);
+ ClassDB::bind_method(D_METHOD("clear_cache"),&IP::clear_cache, DEFVAL(""));
BIND_CONSTANT( RESOLVER_STATUS_NONE );
BIND_CONSTANT( RESOLVER_STATUS_WAITING );
diff --git a/core/io/networked_multiplayer_peer.cpp b/core/io/networked_multiplayer_peer.cpp
index 2981307af..fb81a806e 100644
--- a/core/io/networked_multiplayer_peer.cpp
+++ b/core/io/networked_multiplayer_peer.cpp
@@ -31,18 +31,18 @@
void NetworkedMultiplayerPeer::_bind_methods() {
- ClassDB::bind_method(_MD("set_transfer_mode","mode"), &NetworkedMultiplayerPeer::set_transfer_mode );
- ClassDB::bind_method(_MD("set_target_peer","id"), &NetworkedMultiplayerPeer::set_target_peer );
+ ClassDB::bind_method(D_METHOD("set_transfer_mode","mode"), &NetworkedMultiplayerPeer::set_transfer_mode );
+ ClassDB::bind_method(D_METHOD("set_target_peer","id"), &NetworkedMultiplayerPeer::set_target_peer );
- ClassDB::bind_method(_MD("get_packet_peer"), &NetworkedMultiplayerPeer::get_packet_peer );
+ ClassDB::bind_method(D_METHOD("get_packet_peer"), &NetworkedMultiplayerPeer::get_packet_peer );
- ClassDB::bind_method(_MD("poll"), &NetworkedMultiplayerPeer::poll );
+ ClassDB::bind_method(D_METHOD("poll"), &NetworkedMultiplayerPeer::poll );
- ClassDB::bind_method(_MD("get_connection_status"), &NetworkedMultiplayerPeer::get_connection_status );
- ClassDB::bind_method(_MD("get_unique_id"), &NetworkedMultiplayerPeer::get_unique_id );
+ ClassDB::bind_method(D_METHOD("get_connection_status"), &NetworkedMultiplayerPeer::get_connection_status );
+ ClassDB::bind_method(D_METHOD("get_unique_id"), &NetworkedMultiplayerPeer::get_unique_id );
- ClassDB::bind_method(_MD("set_refuse_new_connections","enable"), &NetworkedMultiplayerPeer::set_refuse_new_connections );
- ClassDB::bind_method(_MD("is_refusing_new_connections"), &NetworkedMultiplayerPeer::is_refusing_new_connections );
+ ClassDB::bind_method(D_METHOD("set_refuse_new_connections","enable"), &NetworkedMultiplayerPeer::set_refuse_new_connections );
+ ClassDB::bind_method(D_METHOD("is_refusing_new_connections"), &NetworkedMultiplayerPeer::is_refusing_new_connections );
BIND_CONSTANT( TRANSFER_MODE_UNRELIABLE );
BIND_CONSTANT( TRANSFER_MODE_UNRELIABLE_ORDERED );
diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp
index 5ff09f9fb..aca095b6a 100644
--- a/core/io/packet_peer.cpp
+++ b/core/io/packet_peer.cpp
@@ -126,12 +126,12 @@ Error PacketPeer::_get_packet_error() const {
void PacketPeer::_bind_methods() {
- ClassDB::bind_method(_MD("get_var:Variant"),&PacketPeer::_bnd_get_var);
- ClassDB::bind_method(_MD("put_var", "var:Variant"),&PacketPeer::put_var);
- ClassDB::bind_method(_MD("get_packet"),&PacketPeer::_get_packet);
- ClassDB::bind_method(_MD("put_packet:Error", "buffer"),&PacketPeer::_put_packet);
- ClassDB::bind_method(_MD("get_packet_error:Error"),&PacketPeer::_get_packet_error);
- ClassDB::bind_method(_MD("get_available_packet_count"),&PacketPeer::get_available_packet_count);
+ ClassDB::bind_method(D_METHOD("get_var:Variant"),&PacketPeer::_bnd_get_var);
+ ClassDB::bind_method(D_METHOD("put_var", "var:Variant"),&PacketPeer::put_var);
+ ClassDB::bind_method(D_METHOD("get_packet"),&PacketPeer::_get_packet);
+ ClassDB::bind_method(D_METHOD("put_packet:Error", "buffer"),&PacketPeer::_put_packet);
+ ClassDB::bind_method(D_METHOD("get_packet_error:Error"),&PacketPeer::_get_packet_error);
+ ClassDB::bind_method(D_METHOD("get_available_packet_count"),&PacketPeer::get_available_packet_count);
};
/***************/
@@ -145,7 +145,7 @@ void PacketPeerStream::_set_stream_peer(REF p_peer) {
void PacketPeerStream::_bind_methods() {
- ClassDB::bind_method(_MD("set_stream_peer","peer:StreamPeer"),&PacketPeerStream::_set_stream_peer);
+ ClassDB::bind_method(D_METHOD("set_stream_peer","peer:StreamPeer"),&PacketPeerStream::_set_stream_peer);
}
Error PacketPeerStream::_poll_buffer() const {
diff --git a/core/io/packet_peer_udp.cpp b/core/io/packet_peer_udp.cpp
index 769a513bb..c4a6fd79a 100644
--- a/core/io/packet_peer_udp.cpp
+++ b/core/io/packet_peer_udp.cpp
@@ -53,14 +53,14 @@ Error PacketPeerUDP::_set_dest_address(const String& p_address, int p_port) {
void PacketPeerUDP::_bind_methods() {
- ClassDB::bind_method(_MD("listen:Error","port", "bind_address", "recv_buf_size"),&PacketPeerUDP::listen,DEFVAL("*"),DEFVAL(65536));
- ClassDB::bind_method(_MD("close"),&PacketPeerUDP::close);
- ClassDB::bind_method(_MD("wait:Error"),&PacketPeerUDP::wait);
- ClassDB::bind_method(_MD("is_listening"),&PacketPeerUDP::is_listening);
- ClassDB::bind_method(_MD("get_packet_ip"),&PacketPeerUDP::_get_packet_ip);
- //ClassDB::bind_method(_MD("get_packet_address"),&PacketPeerUDP::_get_packet_address);
- ClassDB::bind_method(_MD("get_packet_port"),&PacketPeerUDP::get_packet_port);
- ClassDB::bind_method(_MD("set_dest_address","host","port"),&PacketPeerUDP::_set_dest_address);
+ ClassDB::bind_method(D_METHOD("listen:Error","port", "bind_address", "recv_buf_size"),&PacketPeerUDP::listen,DEFVAL("*"),DEFVAL(65536));
+ ClassDB::bind_method(D_METHOD("close"),&PacketPeerUDP::close);
+ ClassDB::bind_method(D_METHOD("wait:Error"),&PacketPeerUDP::wait);
+ ClassDB::bind_method(D_METHOD("is_listening"),&PacketPeerUDP::is_listening);
+ ClassDB::bind_method(D_METHOD("get_packet_ip"),&PacketPeerUDP::_get_packet_ip);
+ //ClassDB::bind_method(D_METHOD("get_packet_address"),&PacketPeerUDP::_get_packet_address);
+ ClassDB::bind_method(D_METHOD("get_packet_port"),&PacketPeerUDP::get_packet_port);
+ ClassDB::bind_method(D_METHOD("set_dest_address","host","port"),&PacketPeerUDP::_set_dest_address);
}
diff --git a/core/io/pck_packer.cpp b/core/io/pck_packer.cpp
index fb5875e4c..2cd46843e 100644
--- a/core/io/pck_packer.cpp
+++ b/core/io/pck_packer.cpp
@@ -52,9 +52,9 @@ static void _pad(FileAccess* p_file, int p_bytes) {
void PCKPacker::_bind_methods() {
- ClassDB::bind_method(_MD("pck_start","pck_name","alignment"),&PCKPacker::pck_start);
- ClassDB::bind_method(_MD("add_file","pck_path","source_path"),&PCKPacker::add_file);
- ClassDB::bind_method(_MD("flush","verbose"),&PCKPacker::flush);
+ ClassDB::bind_method(D_METHOD("pck_start","pck_name","alignment"),&PCKPacker::pck_start);
+ ClassDB::bind_method(D_METHOD("add_file","pck_path","source_path"),&PCKPacker::add_file);
+ ClassDB::bind_method(D_METHOD("flush","verbose"),&PCKPacker::flush);
};
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index fbf6a2cea..3199f05ff 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -86,11 +86,11 @@ void ResourceLoader::get_recognized_extensions_for_type(const String& p_type,Lis
void ResourceInteractiveLoader::_bind_methods() {
- ClassDB::bind_method(_MD("get_resource"),&ResourceInteractiveLoader::get_resource);
- ClassDB::bind_method(_MD("poll"),&ResourceInteractiveLoader::poll);
- ClassDB::bind_method(_MD("wait"),&ResourceInteractiveLoader::wait);
- ClassDB::bind_method(_MD("get_stage"),&ResourceInteractiveLoader::get_stage);
- ClassDB::bind_method(_MD("get_stage_count"),&ResourceInteractiveLoader::get_stage_count);
+ ClassDB::bind_method(D_METHOD("get_resource"),&ResourceInteractiveLoader::get_resource);
+ ClassDB::bind_method(D_METHOD("poll"),&ResourceInteractiveLoader::poll);
+ ClassDB::bind_method(D_METHOD("wait"),&ResourceInteractiveLoader::wait);
+ ClassDB::bind_method(D_METHOD("get_stage"),&ResourceInteractiveLoader::get_stage);
+ ClassDB::bind_method(D_METHOD("get_stage_count"),&ResourceInteractiveLoader::get_stage_count);
}
class ResourceInteractiveLoaderDefault : public ResourceInteractiveLoader {
diff --git a/core/io/stream_peer.cpp b/core/io/stream_peer.cpp
index a2812edb8..a64ebf21f 100644
--- a/core/io/stream_peer.cpp
+++ b/core/io/stream_peer.cpp
@@ -389,57 +389,57 @@ Variant StreamPeer::get_var(){
void StreamPeer::_bind_methods() {
- ClassDB::bind_method(_MD("put_data","data"),&StreamPeer::_put_data);
- ClassDB::bind_method(_MD("put_partial_data","data"),&StreamPeer::_put_partial_data);
+ ClassDB::bind_method(D_METHOD("put_data","data"),&StreamPeer::_put_data);
+ ClassDB::bind_method(D_METHOD("put_partial_data","data"),&StreamPeer::_put_partial_data);
- ClassDB::bind_method(_MD("get_data","bytes"),&StreamPeer::_get_data);
- ClassDB::bind_method(_MD("get_partial_data","bytes"),&StreamPeer::_get_partial_data);
+ ClassDB::bind_method(D_METHOD("get_data","bytes"),&StreamPeer::_get_data);
+ ClassDB::bind_method(D_METHOD("get_partial_data","bytes"),&StreamPeer::_get_partial_data);
- ClassDB::bind_method(_MD("get_available_bytes"),&StreamPeer::get_available_bytes);
+ ClassDB::bind_method(D_METHOD("get_available_bytes"),&StreamPeer::get_available_bytes);
- ClassDB::bind_method(_MD("set_big_endian","enable"),&StreamPeer::set_big_endian);
- ClassDB::bind_method(_MD("is_big_endian_enabled"),&StreamPeer::is_big_endian_enabled);
+ ClassDB::bind_method(D_METHOD("set_big_endian","enable"),&StreamPeer::set_big_endian);
+ ClassDB::bind_method(D_METHOD("is_big_endian_enabled"),&StreamPeer::is_big_endian_enabled);
- ClassDB::bind_method(_MD("put_8","val"),&StreamPeer::put_8);
- ClassDB::bind_method(_MD("put_u8","val"),&StreamPeer::put_u8);
- ClassDB::bind_method(_MD("put_16","val"),&StreamPeer::put_16);
- ClassDB::bind_method(_MD("put_u16","val"),&StreamPeer::put_u16);
- ClassDB::bind_method(_MD("put_32","val"),&StreamPeer::put_32);
- ClassDB::bind_method(_MD("put_u32","val"),&StreamPeer::put_u32);
- ClassDB::bind_method(_MD("put_64","val"),&StreamPeer::put_64);
- ClassDB::bind_method(_MD("put_u64","val"),&StreamPeer::put_u64);
- ClassDB::bind_method(_MD("put_float","val"),&StreamPeer::put_float);
- ClassDB::bind_method(_MD("put_double","val"),&StreamPeer::put_double);
- ClassDB::bind_method(_MD("put_utf8_string","val"),&StreamPeer::put_utf8_string);
- ClassDB::bind_method(_MD("put_var","val:Variant"),&StreamPeer::put_var);
+ ClassDB::bind_method(D_METHOD("put_8","val"),&StreamPeer::put_8);
+ ClassDB::bind_method(D_METHOD("put_u8","val"),&StreamPeer::put_u8);
+ ClassDB::bind_method(D_METHOD("put_16","val"),&StreamPeer::put_16);
+ ClassDB::bind_method(D_METHOD("put_u16","val"),&StreamPeer::put_u16);
+ ClassDB::bind_method(D_METHOD("put_32","val"),&StreamPeer::put_32);
+ ClassDB::bind_method(D_METHOD("put_u32","val"),&StreamPeer::put_u32);
+ ClassDB::bind_method(D_METHOD("put_64","val"),&StreamPeer::put_64);
+ ClassDB::bind_method(D_METHOD("put_u64","val"),&StreamPeer::put_u64);
+ ClassDB::bind_method(D_METHOD("put_float","val"),&StreamPeer::put_float);
+ ClassDB::bind_method(D_METHOD("put_double","val"),&StreamPeer::put_double);
+ ClassDB::bind_method(D_METHOD("put_utf8_string","val"),&StreamPeer::put_utf8_string);
+ ClassDB::bind_method(D_METHOD("put_var","val:Variant"),&StreamPeer::put_var);
- ClassDB::bind_method(_MD("get_8"),&StreamPeer::get_8);
- ClassDB::bind_method(_MD("get_u8"),&StreamPeer::get_u8);
- ClassDB::bind_method(_MD("get_16"),&StreamPeer::get_16);
- ClassDB::bind_method(_MD("get_u16"),&StreamPeer::get_u16);
- ClassDB::bind_method(_MD("get_32"),&StreamPeer::get_32);
- ClassDB::bind_method(_MD("get_u32"),&StreamPeer::get_u32);
- ClassDB::bind_method(_MD("get_64"),&StreamPeer::get_64);
- ClassDB::bind_method(_MD("get_u64"),&StreamPeer::get_u64);
- ClassDB::bind_method(_MD("get_float"),&StreamPeer::get_float);
- ClassDB::bind_method(_MD("get_double"),&StreamPeer::get_double);
- ClassDB::bind_method(_MD("get_string","bytes"),&StreamPeer::get_string);
- ClassDB::bind_method(_MD("get_utf8_string","bytes"),&StreamPeer::get_utf8_string);
- ClassDB::bind_method(_MD("get_var:Variant"),&StreamPeer::get_var);
+ ClassDB::bind_method(D_METHOD("get_8"),&StreamPeer::get_8);
+ ClassDB::bind_method(D_METHOD("get_u8"),&StreamPeer::get_u8);
+ ClassDB::bind_method(D_METHOD("get_16"),&StreamPeer::get_16);
+ ClassDB::bind_method(D_METHOD("get_u16"),&StreamPeer::get_u16);
+ ClassDB::bind_method(D_METHOD("get_32"),&StreamPeer::get_32);
+ ClassDB::bind_method(D_METHOD("get_u32"),&StreamPeer::get_u32);
+ ClassDB::bind_method(D_METHOD("get_64"),&StreamPeer::get_64);
+ ClassDB::bind_method(D_METHOD("get_u64"),&StreamPeer::get_u64);
+ ClassDB::bind_method(D_METHOD("get_float"),&StreamPeer::get_float);
+ ClassDB::bind_method(D_METHOD("get_double"),&StreamPeer::get_double);
+ ClassDB::bind_method(D_METHOD("get_string","bytes"),&StreamPeer::get_string);
+ ClassDB::bind_method(D_METHOD("get_utf8_string","bytes"),&StreamPeer::get_utf8_string);
+ ClassDB::bind_method(D_METHOD("get_var:Variant"),&StreamPeer::get_var);
}
////////////////////////////////
void StreamPeerBuffer::_bind_methods() {
- ClassDB::bind_method(_MD("seek","pos"),&StreamPeerBuffer::seek);
- ClassDB::bind_method(_MD("get_size"),&StreamPeerBuffer::get_size);
- ClassDB::bind_method(_MD("get_pos"),&StreamPeerBuffer::get_pos);
- ClassDB::bind_method(_MD("resize","size"),&StreamPeerBuffer::resize);
- ClassDB::bind_method(_MD("set_data_array","data"),&StreamPeerBuffer::set_data_array);
- ClassDB::bind_method(_MD("get_data_array"),&StreamPeerBuffer::get_data_array);
- ClassDB::bind_method(_MD("clear"),&StreamPeerBuffer::clear);
- ClassDB::bind_method(_MD("duplicate:StreamPeerBuffer"),&StreamPeerBuffer::duplicate);
+ ClassDB::bind_method(D_METHOD("seek","pos"),&StreamPeerBuffer::seek);
+ ClassDB::bind_method(D_METHOD("get_size"),&StreamPeerBuffer::get_size);
+ ClassDB::bind_method(D_METHOD("get_pos"),&StreamPeerBuffer::get_pos);
+ ClassDB::bind_method(D_METHOD("resize","size"),&StreamPeerBuffer::resize);
+ ClassDB::bind_method(D_METHOD("set_data_array","data"),&StreamPeerBuffer::set_data_array);
+ ClassDB::bind_method(D_METHOD("get_data_array"),&StreamPeerBuffer::get_data_array);
+ ClassDB::bind_method(D_METHOD("clear"),&StreamPeerBuffer::clear);
+ ClassDB::bind_method(D_METHOD("duplicate:StreamPeerBuffer"),&StreamPeerBuffer::duplicate);
}
diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp
index fc535e94b..5f7247bd7 100644
--- a/core/io/stream_peer_ssl.cpp
+++ b/core/io/stream_peer_ssl.cpp
@@ -57,10 +57,10 @@ bool StreamPeerSSL::is_available() {
void StreamPeerSSL::_bind_methods() {
- ClassDB::bind_method(_MD("accept_stream:Error","stream:StreamPeer"),&StreamPeerSSL::accept_stream);
- ClassDB::bind_method(_MD("connect_to_stream:Error","stream:StreamPeer","validate_certs","for_hostname"),&StreamPeerSSL::connect_to_stream,DEFVAL(false),DEFVAL(String()));
- ClassDB::bind_method(_MD("get_status"),&StreamPeerSSL::get_status);
- ClassDB::bind_method(_MD("disconnect_from_stream"),&StreamPeerSSL::disconnect_from_stream);
+ ClassDB::bind_method(D_METHOD("accept_stream:Error","stream:StreamPeer"),&StreamPeerSSL::accept_stream);
+ ClassDB::bind_method(D_METHOD("connect_to_stream:Error","stream:StreamPeer","validate_certs","for_hostname"),&StreamPeerSSL::connect_to_stream,DEFVAL(false),DEFVAL(String()));
+ ClassDB::bind_method(D_METHOD("get_status"),&StreamPeerSSL::get_status);
+ ClassDB::bind_method(D_METHOD("disconnect_from_stream"),&StreamPeerSSL::disconnect_from_stream);
BIND_CONSTANT( STATUS_DISCONNECTED );
BIND_CONSTANT( STATUS_CONNECTED );
BIND_CONSTANT( STATUS_ERROR_NO_CERTIFICATE );
diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp
index 96594ef65..cedc33079 100644
--- a/core/io/stream_peer_tcp.cpp
+++ b/core/io/stream_peer_tcp.cpp
@@ -47,12 +47,12 @@ Error StreamPeerTCP::_connect(const String& p_address,int p_port) {
void StreamPeerTCP::_bind_methods() {
- ClassDB::bind_method(_MD("connect_to_host","host","port"),&StreamPeerTCP::_connect);
- ClassDB::bind_method(_MD("is_connected_to_host"),&StreamPeerTCP::is_connected_to_host);
- ClassDB::bind_method(_MD("get_status"),&StreamPeerTCP::get_status);
- ClassDB::bind_method(_MD("get_connected_host"),&StreamPeerTCP::get_connected_host);
- ClassDB::bind_method(_MD("get_connected_port"),&StreamPeerTCP::get_connected_port);
- ClassDB::bind_method(_MD("disconnect_from_host"),&StreamPeerTCP::disconnect_from_host);
+ ClassDB::bind_method(D_METHOD("connect_to_host","host","port"),&StreamPeerTCP::_connect);
+ ClassDB::bind_method(D_METHOD("is_connected_to_host"),&StreamPeerTCP::is_connected_to_host);
+ ClassDB::bind_method(D_METHOD("get_status"),&StreamPeerTCP::get_status);
+ ClassDB::bind_method(D_METHOD("get_connected_host"),&StreamPeerTCP::get_connected_host);
+ ClassDB::bind_method(D_METHOD("get_connected_port"),&StreamPeerTCP::get_connected_port);
+ ClassDB::bind_method(D_METHOD("disconnect_from_host"),&StreamPeerTCP::disconnect_from_host);
BIND_CONSTANT( STATUS_NONE );
BIND_CONSTANT( STATUS_CONNECTING );
diff --git a/core/io/tcp_server.cpp b/core/io/tcp_server.cpp
index cb82b3fc5..5127bd6e3 100644
--- a/core/io/tcp_server.cpp
+++ b/core/io/tcp_server.cpp
@@ -46,10 +46,10 @@ TCP_Server* TCP_Server::create() {
void TCP_Server::_bind_methods() {
- ClassDB::bind_method(_MD("listen","port","bind_address"),&TCP_Server::listen,DEFVAL("*"));
- ClassDB::bind_method(_MD("is_connection_available"),&TCP_Server::is_connection_available);
- ClassDB::bind_method(_MD("take_connection"),&TCP_Server::take_connection);
- ClassDB::bind_method(_MD("stop"),&TCP_Server::stop);
+ ClassDB::bind_method(D_METHOD("listen","port","bind_address"),&TCP_Server::listen,DEFVAL("*"));
+ ClassDB::bind_method(D_METHOD("is_connection_available"),&TCP_Server::is_connection_available);
+ ClassDB::bind_method(D_METHOD("take_connection"),&TCP_Server::take_connection);
+ ClassDB::bind_method(D_METHOD("stop"),&TCP_Server::stop);
}
diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp
index 0322f2305..1a4ff1a8d 100644
--- a/core/io/xml_parser.cpp
+++ b/core/io/xml_parser.cpp
@@ -379,23 +379,23 @@ Error XMLParser::seek(uint64_t p_pos) {
void XMLParser::_bind_methods() {
- ClassDB::bind_method(_MD("read"),&XMLParser::read);
- ClassDB::bind_method(_MD("get_node_type"),&XMLParser::get_node_type);
- ClassDB::bind_method(_MD("get_node_name"),&XMLParser::get_node_name);
- ClassDB::bind_method(_MD("get_node_data"),&XMLParser::get_node_data);
- ClassDB::bind_method(_MD("get_node_offset"),&XMLParser::get_node_offset);
- ClassDB::bind_method(_MD("get_attribute_count"),&XMLParser::get_attribute_count);
- ClassDB::bind_method(_MD("get_attribute_name","idx"),&XMLParser::get_attribute_name);
- ClassDB::bind_method(_MD("get_attribute_value","idx"),(String (XMLParser::*)(int) const) &XMLParser::get_attribute_value);
- ClassDB::bind_method(_MD("has_attribute","name"),&XMLParser::has_attribute);
- ClassDB::bind_method(_MD("get_named_attribute_value","name"), (String (XMLParser::*)(const String&) const) &XMLParser::get_attribute_value);
- ClassDB::bind_method(_MD("get_named_attribute_value_safe","name"), &XMLParser::get_attribute_value_safe);
- ClassDB::bind_method(_MD("is_empty"),&XMLParser::is_empty);
- ClassDB::bind_method(_MD("get_current_line"),&XMLParser::get_current_line);
- ClassDB::bind_method(_MD("skip_section"),&XMLParser::skip_section);
- ClassDB::bind_method(_MD("seek","pos"),&XMLParser::seek);
- ClassDB::bind_method(_MD("open","file"),&XMLParser::open);
- ClassDB::bind_method(_MD("open_buffer","buffer"),&XMLParser::open_buffer);
+ ClassDB::bind_method(D_METHOD("read"),&XMLParser::read);
+ ClassDB::bind_method(D_METHOD("get_node_type"),&XMLParser::get_node_type);
+ ClassDB::bind_method(D_METHOD("get_node_name"),&XMLParser::get_node_name);
+ ClassDB::bind_method(D_METHOD("get_node_data"),&XMLParser::get_node_data);
+ ClassDB::bind_method(D_METHOD("get_node_offset"),&XMLParser::get_node_offset);
+ ClassDB::bind_method(D_METHOD("get_attribute_count"),&XMLParser::get_attribute_count);
+ ClassDB::bind_method(D_METHOD("get_attribute_name","idx"),&XMLParser::get_attribute_name);
+ ClassDB::bind_method(D_METHOD("get_attribute_value","idx"),(String (XMLParser::*)(int) const) &XMLParser::get_attribute_value);
+ ClassDB::bind_method(D_METHOD("has_attribute","name"),&XMLParser::has_attribute);
+ ClassDB::bind_method(D_METHOD("get_named_attribute_value","name"), (String (XMLParser::*)(const String&) const) &XMLParser::get_attribute_value);
+ ClassDB::bind_method(D_METHOD("get_named_attribute_value_safe","name"), &XMLParser::get_attribute_value_safe);
+ ClassDB::bind_method(D_METHOD("is_empty"),&XMLParser::is_empty);
+ ClassDB::bind_method(D_METHOD("get_current_line"),&XMLParser::get_current_line);
+ ClassDB::bind_method(D_METHOD("skip_section"),&XMLParser::skip_section);
+ ClassDB::bind_method(D_METHOD("seek","pos"),&XMLParser::seek);
+ ClassDB::bind_method(D_METHOD("open","file"),&XMLParser::open);
+ ClassDB::bind_method(D_METHOD("open_buffer","buffer"),&XMLParser::open_buffer);
BIND_CONSTANT( NODE_NONE );
BIND_CONSTANT( NODE_ELEMENT );