Merge pull request #10351 from neikeq/enums-are-for-the-weak

ClassDB: Provide the enum name of integer constants

7 files changed, 101 insertions, 99 deletions

diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp
index 4d5b88cfa1..1c35c6edeb 100644
--- a/core/io/http_client.cpp
+++ b/core/io/http_client.cpp
@@ -650,84 +650,84 @@ void HTTPClient::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("query_string_from_dict", "fields"), &HTTPClient::query_string_from_dict);
 
-	BIND_CONSTANT(METHOD_GET);
-	BIND_CONSTANT(METHOD_HEAD);
-	BIND_CONSTANT(METHOD_POST);
-	BIND_CONSTANT(METHOD_PUT);
-	BIND_CONSTANT(METHOD_DELETE);
-	BIND_CONSTANT(METHOD_OPTIONS);
-	BIND_CONSTANT(METHOD_TRACE);
-	BIND_CONSTANT(METHOD_CONNECT);
-	BIND_CONSTANT(METHOD_MAX);
-
-	BIND_CONSTANT(STATUS_DISCONNECTED);
-	BIND_CONSTANT(STATUS_RESOLVING); //resolving hostname (if passed a hostname)
-	BIND_CONSTANT(STATUS_CANT_RESOLVE);
-	BIND_CONSTANT(STATUS_CONNECTING); //connecting to ip
-	BIND_CONSTANT(STATUS_CANT_CONNECT);
-	BIND_CONSTANT(STATUS_CONNECTED); //connected );  requests only accepted here
-	BIND_CONSTANT(STATUS_REQUESTING); // request in progress
-	BIND_CONSTANT(STATUS_BODY); // request resulted in body );  which must be read
-	BIND_CONSTANT(STATUS_CONNECTION_ERROR);
-	BIND_CONSTANT(STATUS_SSL_HANDSHAKE_ERROR);
-
-	BIND_CONSTANT(RESPONSE_CONTINUE);
-	BIND_CONSTANT(RESPONSE_SWITCHING_PROTOCOLS);
-	BIND_CONSTANT(RESPONSE_PROCESSING);
+	BIND_ENUM_CONSTANT(METHOD_GET);
+	BIND_ENUM_CONSTANT(METHOD_HEAD);
+	BIND_ENUM_CONSTANT(METHOD_POST);
+	BIND_ENUM_CONSTANT(METHOD_PUT);
+	BIND_ENUM_CONSTANT(METHOD_DELETE);
+	BIND_ENUM_CONSTANT(METHOD_OPTIONS);
+	BIND_ENUM_CONSTANT(METHOD_TRACE);
+	BIND_ENUM_CONSTANT(METHOD_CONNECT);
+	BIND_ENUM_CONSTANT(METHOD_MAX);
+
+	BIND_ENUM_CONSTANT(STATUS_DISCONNECTED);
+	BIND_ENUM_CONSTANT(STATUS_RESOLVING); //resolving hostname (if passed a hostname)
+	BIND_ENUM_CONSTANT(STATUS_CANT_RESOLVE);
+	BIND_ENUM_CONSTANT(STATUS_CONNECTING); //connecting to ip
+	BIND_ENUM_CONSTANT(STATUS_CANT_CONNECT);
+	BIND_ENUM_CONSTANT(STATUS_CONNECTED); //connected );  requests only accepted here
+	BIND_ENUM_CONSTANT(STATUS_REQUESTING); // request in progress
+	BIND_ENUM_CONSTANT(STATUS_BODY); // request resulted in body );  which must be read
+	BIND_ENUM_CONSTANT(STATUS_CONNECTION_ERROR);
+	BIND_ENUM_CONSTANT(STATUS_SSL_HANDSHAKE_ERROR);
+
+	BIND_ENUM_CONSTANT(RESPONSE_CONTINUE);
+	BIND_ENUM_CONSTANT(RESPONSE_SWITCHING_PROTOCOLS);
+	BIND_ENUM_CONSTANT(RESPONSE_PROCESSING);
 
 	// 2xx successful
-	BIND_CONSTANT(RESPONSE_OK);
-	BIND_CONSTANT(RESPONSE_CREATED);
-	BIND_CONSTANT(RESPONSE_ACCEPTED);
-	BIND_CONSTANT(RESPONSE_NON_AUTHORITATIVE_INFORMATION);
-	BIND_CONSTANT(RESPONSE_NO_CONTENT);
-	BIND_CONSTANT(RESPONSE_RESET_CONTENT);
-	BIND_CONSTANT(RESPONSE_PARTIAL_CONTENT);
-	BIND_CONSTANT(RESPONSE_MULTI_STATUS);
-	BIND_CONSTANT(RESPONSE_IM_USED);
+	BIND_ENUM_CONSTANT(RESPONSE_OK);
+	BIND_ENUM_CONSTANT(RESPONSE_CREATED);
+	BIND_ENUM_CONSTANT(RESPONSE_ACCEPTED);
+	BIND_ENUM_CONSTANT(RESPONSE_NON_AUTHORITATIVE_INFORMATION);
+	BIND_ENUM_CONSTANT(RESPONSE_NO_CONTENT);
+	BIND_ENUM_CONSTANT(RESPONSE_RESET_CONTENT);
+	BIND_ENUM_CONSTANT(RESPONSE_PARTIAL_CONTENT);
+	BIND_ENUM_CONSTANT(RESPONSE_MULTI_STATUS);
+	BIND_ENUM_CONSTANT(RESPONSE_IM_USED);
 
 	// 3xx redirection
-	BIND_CONSTANT(RESPONSE_MULTIPLE_CHOICES);
-	BIND_CONSTANT(RESPONSE_MOVED_PERMANENTLY);
-	BIND_CONSTANT(RESPONSE_FOUND);
-	BIND_CONSTANT(RESPONSE_SEE_OTHER);
-	BIND_CONSTANT(RESPONSE_NOT_MODIFIED);
-	BIND_CONSTANT(RESPONSE_USE_PROXY);
-	BIND_CONSTANT(RESPONSE_TEMPORARY_REDIRECT);
+	BIND_ENUM_CONSTANT(RESPONSE_MULTIPLE_CHOICES);
+	BIND_ENUM_CONSTANT(RESPONSE_MOVED_PERMANENTLY);
+	BIND_ENUM_CONSTANT(RESPONSE_FOUND);
+	BIND_ENUM_CONSTANT(RESPONSE_SEE_OTHER);
+	BIND_ENUM_CONSTANT(RESPONSE_NOT_MODIFIED);
+	BIND_ENUM_CONSTANT(RESPONSE_USE_PROXY);
+	BIND_ENUM_CONSTANT(RESPONSE_TEMPORARY_REDIRECT);
 
 	// 4xx client error
-	BIND_CONSTANT(RESPONSE_BAD_REQUEST);
-	BIND_CONSTANT(RESPONSE_UNAUTHORIZED);
-	BIND_CONSTANT(RESPONSE_PAYMENT_REQUIRED);
-	BIND_CONSTANT(RESPONSE_FORBIDDEN);
-	BIND_CONSTANT(RESPONSE_NOT_FOUND);
-	BIND_CONSTANT(RESPONSE_METHOD_NOT_ALLOWED);
-	BIND_CONSTANT(RESPONSE_NOT_ACCEPTABLE);
-	BIND_CONSTANT(RESPONSE_PROXY_AUTHENTICATION_REQUIRED);
-	BIND_CONSTANT(RESPONSE_REQUEST_TIMEOUT);
-	BIND_CONSTANT(RESPONSE_CONFLICT);
-	BIND_CONSTANT(RESPONSE_GONE);
-	BIND_CONSTANT(RESPONSE_LENGTH_REQUIRED);
-	BIND_CONSTANT(RESPONSE_PRECONDITION_FAILED);
-	BIND_CONSTANT(RESPONSE_REQUEST_ENTITY_TOO_LARGE);
-	BIND_CONSTANT(RESPONSE_REQUEST_URI_TOO_LONG);
-	BIND_CONSTANT(RESPONSE_UNSUPPORTED_MEDIA_TYPE);
-	BIND_CONSTANT(RESPONSE_REQUESTED_RANGE_NOT_SATISFIABLE);
-	BIND_CONSTANT(RESPONSE_EXPECTATION_FAILED);
-	BIND_CONSTANT(RESPONSE_UNPROCESSABLE_ENTITY);
-	BIND_CONSTANT(RESPONSE_LOCKED);
-	BIND_CONSTANT(RESPONSE_FAILED_DEPENDENCY);
-	BIND_CONSTANT(RESPONSE_UPGRADE_REQUIRED);
+	BIND_ENUM_CONSTANT(RESPONSE_BAD_REQUEST);
+	BIND_ENUM_CONSTANT(RESPONSE_UNAUTHORIZED);
+	BIND_ENUM_CONSTANT(RESPONSE_PAYMENT_REQUIRED);
+	BIND_ENUM_CONSTANT(RESPONSE_FORBIDDEN);
+	BIND_ENUM_CONSTANT(RESPONSE_NOT_FOUND);
+	BIND_ENUM_CONSTANT(RESPONSE_METHOD_NOT_ALLOWED);
+	BIND_ENUM_CONSTANT(RESPONSE_NOT_ACCEPTABLE);
+	BIND_ENUM_CONSTANT(RESPONSE_PROXY_AUTHENTICATION_REQUIRED);
+	BIND_ENUM_CONSTANT(RESPONSE_REQUEST_TIMEOUT);
+	BIND_ENUM_CONSTANT(RESPONSE_CONFLICT);
+	BIND_ENUM_CONSTANT(RESPONSE_GONE);
+	BIND_ENUM_CONSTANT(RESPONSE_LENGTH_REQUIRED);
+	BIND_ENUM_CONSTANT(RESPONSE_PRECONDITION_FAILED);
+	BIND_ENUM_CONSTANT(RESPONSE_REQUEST_ENTITY_TOO_LARGE);
+	BIND_ENUM_CONSTANT(RESPONSE_REQUEST_URI_TOO_LONG);
+	BIND_ENUM_CONSTANT(RESPONSE_UNSUPPORTED_MEDIA_TYPE);
+	BIND_ENUM_CONSTANT(RESPONSE_REQUESTED_RANGE_NOT_SATISFIABLE);
+	BIND_ENUM_CONSTANT(RESPONSE_EXPECTATION_FAILED);
+	BIND_ENUM_CONSTANT(RESPONSE_UNPROCESSABLE_ENTITY);
+	BIND_ENUM_CONSTANT(RESPONSE_LOCKED);
+	BIND_ENUM_CONSTANT(RESPONSE_FAILED_DEPENDENCY);
+	BIND_ENUM_CONSTANT(RESPONSE_UPGRADE_REQUIRED);
 
 	// 5xx server error
-	BIND_CONSTANT(RESPONSE_INTERNAL_SERVER_ERROR);
-	BIND_CONSTANT(RESPONSE_NOT_IMPLEMENTED);
-	BIND_CONSTANT(RESPONSE_BAD_GATEWAY);
-	BIND_CONSTANT(RESPONSE_SERVICE_UNAVAILABLE);
-	BIND_CONSTANT(RESPONSE_GATEWAY_TIMEOUT);
-	BIND_CONSTANT(RESPONSE_HTTP_VERSION_NOT_SUPPORTED);
-	BIND_CONSTANT(RESPONSE_INSUFFICIENT_STORAGE);
-	BIND_CONSTANT(RESPONSE_NOT_EXTENDED);
+	BIND_ENUM_CONSTANT(RESPONSE_INTERNAL_SERVER_ERROR);
+	BIND_ENUM_CONSTANT(RESPONSE_NOT_IMPLEMENTED);
+	BIND_ENUM_CONSTANT(RESPONSE_BAD_GATEWAY);
+	BIND_ENUM_CONSTANT(RESPONSE_SERVICE_UNAVAILABLE);
+	BIND_ENUM_CONSTANT(RESPONSE_GATEWAY_TIMEOUT);
+	BIND_ENUM_CONSTANT(RESPONSE_HTTP_VERSION_NOT_SUPPORTED);
+	BIND_ENUM_CONSTANT(RESPONSE_INSUFFICIENT_STORAGE);
+	BIND_ENUM_CONSTANT(RESPONSE_NOT_EXTENDED);
 }
 
 void HTTPClient::set_read_chunk_size(int p_size) {
diff --git a/core/io/http_client.h b/core/io/http_client.h
index 3cee1e0c6b..cc5f1ed935 100644
--- a/core/io/http_client.h
+++ b/core/io/http_client.h
@@ -197,6 +197,7 @@ public:
 	~HTTPClient();
 };
 
+VARIANT_ENUM_CAST(HTTPClient::ResponseCode)
 VARIANT_ENUM_CAST(HTTPClient::Method);
 VARIANT_ENUM_CAST(HTTPClient::Status);
 
diff --git a/core/io/ip.cpp b/core/io/ip.cpp
index c869bdad9b..0e2b5ed519 100644
--- a/core/io/ip.cpp
+++ b/core/io/ip.cpp
@@ -242,18 +242,18 @@ void IP::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_local_addresses"), &IP::_get_local_addresses);
 	ClassDB::bind_method(D_METHOD("clear_cache", "hostname"), &IP::clear_cache, DEFVAL(""));
 
-	BIND_CONSTANT(RESOLVER_STATUS_NONE);
-	BIND_CONSTANT(RESOLVER_STATUS_WAITING);
-	BIND_CONSTANT(RESOLVER_STATUS_DONE);
-	BIND_CONSTANT(RESOLVER_STATUS_ERROR);
+	BIND_ENUM_CONSTANT(RESOLVER_STATUS_NONE);
+	BIND_ENUM_CONSTANT(RESOLVER_STATUS_WAITING);
+	BIND_ENUM_CONSTANT(RESOLVER_STATUS_DONE);
+	BIND_ENUM_CONSTANT(RESOLVER_STATUS_ERROR);
 
 	BIND_CONSTANT(RESOLVER_MAX_QUERIES);
 	BIND_CONSTANT(RESOLVER_INVALID_ID);
 
-	BIND_CONSTANT(TYPE_NONE);
-	BIND_CONSTANT(TYPE_IPV4);
-	BIND_CONSTANT(TYPE_IPV6);
-	BIND_CONSTANT(TYPE_ANY);
+	BIND_ENUM_CONSTANT(TYPE_NONE);
+	BIND_ENUM_CONSTANT(TYPE_IPV4);
+	BIND_ENUM_CONSTANT(TYPE_IPV6);
+	BIND_ENUM_CONSTANT(TYPE_ANY);
 }
 
 IP *IP::singleton = NULL;
diff --git a/core/io/networked_multiplayer_peer.cpp b/core/io/networked_multiplayer_peer.cpp
index 105b8dce44..402526a52c 100644
--- a/core/io/networked_multiplayer_peer.cpp
+++ b/core/io/networked_multiplayer_peer.cpp
@@ -44,13 +44,13 @@ void NetworkedMultiplayerPeer::_bind_methods() {
 	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);
-	BIND_CONSTANT(TRANSFER_MODE_RELIABLE);
+	BIND_ENUM_CONSTANT(TRANSFER_MODE_UNRELIABLE);
+	BIND_ENUM_CONSTANT(TRANSFER_MODE_UNRELIABLE_ORDERED);
+	BIND_ENUM_CONSTANT(TRANSFER_MODE_RELIABLE);
 
-	BIND_CONSTANT(CONNECTION_DISCONNECTED);
-	BIND_CONSTANT(CONNECTION_CONNECTING);
-	BIND_CONSTANT(CONNECTION_CONNECTED);
+	BIND_ENUM_CONSTANT(CONNECTION_DISCONNECTED);
+	BIND_ENUM_CONSTANT(CONNECTION_CONNECTING);
+	BIND_ENUM_CONSTANT(CONNECTION_CONNECTED);
 
 	BIND_CONSTANT(TARGET_PEER_BROADCAST);
 	BIND_CONSTANT(TARGET_PEER_SERVER);
diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp
index ef3c264375..24f6473330 100644
--- a/core/io/stream_peer_ssl.cpp
+++ b/core/io/stream_peer_ssl.cpp
@@ -55,10 +55,11 @@ void StreamPeerSSL::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("connect_to_stream", "stream", "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);
-	BIND_CONSTANT(STATUS_ERROR_HOSTNAME_MISMATCH);
+
+	BIND_ENUM_CONSTANT(STATUS_DISCONNECTED);
+	BIND_ENUM_CONSTANT(STATUS_CONNECTED);
+	BIND_ENUM_CONSTANT(STATUS_ERROR_NO_CERTIFICATE);
+	BIND_ENUM_CONSTANT(STATUS_ERROR_HOSTNAME_MISMATCH);
 }
 
 StreamPeerSSL::StreamPeerSSL() {
diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp
index 5c859ea7c0..ae5603aa31 100644
--- a/core/io/stream_peer_tcp.cpp
+++ b/core/io/stream_peer_tcp.cpp
@@ -55,10 +55,10 @@ void StreamPeerTCP::_bind_methods() {
 	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);
-	BIND_CONSTANT(STATUS_CONNECTED);
-	BIND_CONSTANT(STATUS_ERROR);
+	BIND_ENUM_CONSTANT(STATUS_NONE);
+	BIND_ENUM_CONSTANT(STATUS_CONNECTING);
+	BIND_ENUM_CONSTANT(STATUS_CONNECTED);
+	BIND_ENUM_CONSTANT(STATUS_ERROR);
 }
 
 Ref<StreamPeerTCP> StreamPeerTCP::create_ref() {
diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp
index e5f4433b8f..d8b69b0951 100644
--- a/core/io/xml_parser.cpp
+++ b/core/io/xml_parser.cpp
@@ -373,13 +373,13 @@ void XMLParser::_bind_methods() {
 	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);
-	BIND_CONSTANT(NODE_ELEMENT_END);
-	BIND_CONSTANT(NODE_TEXT);
-	BIND_CONSTANT(NODE_COMMENT);
-	BIND_CONSTANT(NODE_CDATA);
-	BIND_CONSTANT(NODE_UNKNOWN);
+	BIND_ENUM_CONSTANT(NODE_NONE);
+	BIND_ENUM_CONSTANT(NODE_ELEMENT);
+	BIND_ENUM_CONSTANT(NODE_ELEMENT_END);
+	BIND_ENUM_CONSTANT(NODE_TEXT);
+	BIND_ENUM_CONSTANT(NODE_COMMENT);
+	BIND_ENUM_CONSTANT(NODE_CDATA);
+	BIND_ENUM_CONSTANT(NODE_UNKNOWN);
 };
 
 Error XMLParser::read() {