aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRémi Verschelde2017-02-13 15:46:17 +0100
committerGitHub2017-02-13 15:46:17 +0100
commitea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378 (patch)
tree65ed57ff55cadd49b881e248e2f87331ca5eee28 /platform
parentf6859fd31b5c3cc1a112b7f77b3c1783df8c8919 (diff)
parent411ee71b4d2dd4dfb3c137b057e0cfcdb55d6291 (diff)
downloadgodot-ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378.tar.gz
godot-ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378.tar.zst
godot-ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378.zip
Merge pull request #7795 from hpvb/rename-md-macro
Rename the _MD macro to D_METHOD
Diffstat (limited to 'platform')
-rw-r--r--platform/android/java_class_wrapper.cpp2
-rw-r--r--platform/bb10/payment_service.cpp8
-rw-r--r--platform/iphone/game_center.mm20
-rw-r--r--platform/iphone/icloud.mm14
-rw-r--r--platform/iphone/in_app_store.mm12
-rw-r--r--platform/iphone/ios.mm2
-rw-r--r--platform/javascript/javascript_eval.cpp2
7 files changed, 30 insertions, 30 deletions
diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp
index 9acda005f..2923ef6a9 100644
--- a/platform/android/java_class_wrapper.cpp
+++ b/platform/android/java_class_wrapper.cpp
@@ -562,7 +562,7 @@ JavaObject::~JavaObject(){
void JavaClassWrapper::_bind_methods() {
- ClassDB::bind_method(_MD("wrap:JavaClass","name"),&JavaClassWrapper::wrap);
+ ClassDB::bind_method(D_METHOD("wrap:JavaClass","name"),&JavaClassWrapper::wrap);
}
diff --git a/platform/bb10/payment_service.cpp b/platform/bb10/payment_service.cpp
index 3138dc2c1..131c9712a 100644
--- a/platform/bb10/payment_service.cpp
+++ b/platform/bb10/payment_service.cpp
@@ -38,11 +38,11 @@ extern char* launch_dir_ptr;
void PaymentService::_bind_methods() {
- ClassDB::bind_method(_MD("request_product_info"),&PaymentService::request_product_info);
- ClassDB::bind_method(_MD("purchase"),&PaymentService::purchase);
+ ClassDB::bind_method(D_METHOD("request_product_info"),&PaymentService::request_product_info);
+ ClassDB::bind_method(D_METHOD("purchase"),&PaymentService::purchase);
- ClassDB::bind_method(_MD("get_pending_event_count"),&PaymentService::get_pending_event_count);
- ClassDB::bind_method(_MD("pop_pending_event"),&PaymentService::pop_pending_event);
+ ClassDB::bind_method(D_METHOD("get_pending_event_count"),&PaymentService::get_pending_event_count);
+ ClassDB::bind_method(D_METHOD("pop_pending_event"),&PaymentService::pop_pending_event);
};
Error PaymentService::request_product_info(Variant p_params) {
diff --git a/platform/iphone/game_center.mm b/platform/iphone/game_center.mm
index de6ea73c2..4cfa64ae4 100644
--- a/platform/iphone/game_center.mm
+++ b/platform/iphone/game_center.mm
@@ -48,18 +48,18 @@ extern "C" {
GameCenter* GameCenter::instance = NULL;
void GameCenter::_bind_methods() {
- ClassDB::bind_method(_MD("connect"),&GameCenter::connect);
- ClassDB::bind_method(_MD("is_connected"),&GameCenter::is_connected);
+ ClassDB::bind_method(D_METHOD("connect"),&GameCenter::connect);
+ ClassDB::bind_method(D_METHOD("is_connected"),&GameCenter::is_connected);
- ClassDB::bind_method(_MD("post_score"),&GameCenter::post_score);
- ClassDB::bind_method(_MD("award_achievement"),&GameCenter::award_achievement);
- ClassDB::bind_method(_MD("reset_achievements"),&GameCenter::reset_achievements);
- ClassDB::bind_method(_MD("request_achievements"),&GameCenter::request_achievements);
- ClassDB::bind_method(_MD("request_achievement_descriptions"),&GameCenter::request_achievement_descriptions);
- ClassDB::bind_method(_MD("show_game_center"),&GameCenter::show_game_center);
+ ClassDB::bind_method(D_METHOD("post_score"),&GameCenter::post_score);
+ ClassDB::bind_method(D_METHOD("award_achievement"),&GameCenter::award_achievement);
+ ClassDB::bind_method(D_METHOD("reset_achievements"),&GameCenter::reset_achievements);
+ ClassDB::bind_method(D_METHOD("request_achievements"),&GameCenter::request_achievements);
+ ClassDB::bind_method(D_METHOD("request_achievement_descriptions"),&GameCenter::request_achievement_descriptions);
+ ClassDB::bind_method(D_METHOD("show_game_center"),&GameCenter::show_game_center);
- ClassDB::bind_method(_MD("get_pending_event_count"),&GameCenter::get_pending_event_count);
- ClassDB::bind_method(_MD("pop_pending_event"),&GameCenter::pop_pending_event);
+ ClassDB::bind_method(D_METHOD("get_pending_event_count"),&GameCenter::get_pending_event_count);
+ ClassDB::bind_method(D_METHOD("pop_pending_event"),&GameCenter::pop_pending_event);
};
diff --git a/platform/iphone/icloud.mm b/platform/iphone/icloud.mm
index 0d1825dd6..a9b23baae 100644
--- a/platform/iphone/icloud.mm
+++ b/platform/iphone/icloud.mm
@@ -44,14 +44,14 @@ extern "C" {
ICloud* ICloud::instance = NULL;
void ICloud::_bind_methods() {
- ClassDB::bind_method(_MD("remove_key"),&ICloud::remove_key);
- ClassDB::bind_method(_MD("set_key_values"),&ICloud::set_key_values);
- ClassDB::bind_method(_MD("get_key_value"),&ICloud::get_key_value);
- ClassDB::bind_method(_MD("synchronize_key_values"),&ICloud::synchronize_key_values);
- ClassDB::bind_method(_MD("get_all_key_values"),&ICloud::get_all_key_values);
+ ClassDB::bind_method(D_METHOD("remove_key"),&ICloud::remove_key);
+ ClassDB::bind_method(D_METHOD("set_key_values"),&ICloud::set_key_values);
+ ClassDB::bind_method(D_METHOD("get_key_value"),&ICloud::get_key_value);
+ ClassDB::bind_method(D_METHOD("synchronize_key_values"),&ICloud::synchronize_key_values);
+ ClassDB::bind_method(D_METHOD("get_all_key_values"),&ICloud::get_all_key_values);
- ClassDB::bind_method(_MD("get_pending_event_count"),&ICloud::get_pending_event_count);
- ClassDB::bind_method(_MD("pop_pending_event"),&ICloud::pop_pending_event);
+ ClassDB::bind_method(D_METHOD("get_pending_event_count"),&ICloud::get_pending_event_count);
+ ClassDB::bind_method(D_METHOD("pop_pending_event"),&ICloud::pop_pending_event);
};
int ICloud::get_pending_event_count() {
diff --git a/platform/iphone/in_app_store.mm b/platform/iphone/in_app_store.mm
index 050498c12..b63d7b42a 100644
--- a/platform/iphone/in_app_store.mm
+++ b/platform/iphone/in_app_store.mm
@@ -66,13 +66,13 @@ NSMutableDictionary* pending_transactions = [NSMutableDictionary dictionary];
InAppStore* InAppStore::instance = NULL;
void InAppStore::_bind_methods() {
- ClassDB::bind_method(_MD("request_product_info"),&InAppStore::request_product_info);
- ClassDB::bind_method(_MD("purchase"),&InAppStore::purchase);
+ ClassDB::bind_method(D_METHOD("request_product_info"),&InAppStore::request_product_info);
+ ClassDB::bind_method(D_METHOD("purchase"),&InAppStore::purchase);
- ClassDB::bind_method(_MD("get_pending_event_count"),&InAppStore::get_pending_event_count);
- ClassDB::bind_method(_MD("pop_pending_event"),&InAppStore::pop_pending_event);
- ClassDB::bind_method(_MD("finish_transaction"),&InAppStore::finish_transaction);
- ClassDB::bind_method(_MD("set_auto_finish_transaction"),&InAppStore::set_auto_finish_transaction);
+ ClassDB::bind_method(D_METHOD("get_pending_event_count"),&InAppStore::get_pending_event_count);
+ ClassDB::bind_method(D_METHOD("pop_pending_event"),&InAppStore::pop_pending_event);
+ ClassDB::bind_method(D_METHOD("finish_transaction"),&InAppStore::finish_transaction);
+ ClassDB::bind_method(D_METHOD("set_auto_finish_transaction"),&InAppStore::set_auto_finish_transaction);
};
@interface ProductsDelegate : NSObject<SKProductsRequestDelegate> {
diff --git a/platform/iphone/ios.mm b/platform/iphone/ios.mm
index a068d4aa3..4aca85daf 100644
--- a/platform/iphone/ios.mm
+++ b/platform/iphone/ios.mm
@@ -32,7 +32,7 @@
void iOS::_bind_methods() {
- ClassDB::bind_method(_MD("get_rate_url","app_id"),&iOS::get_rate_url);
+ ClassDB::bind_method(D_METHOD("get_rate_url","app_id"),&iOS::get_rate_url);
};
String iOS::get_rate_url(int p_app_id) const {
diff --git a/platform/javascript/javascript_eval.cpp b/platform/javascript/javascript_eval.cpp
index 72b7ab06c..d84c8bf04 100644
--- a/platform/javascript/javascript_eval.cpp
+++ b/platform/javascript/javascript_eval.cpp
@@ -156,7 +156,7 @@ Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) {
void JavaScript::_bind_methods() {
- ClassDB::bind_method(_MD("eval", "code", "use_global_execution_context"), &JavaScript::eval, false);
+ ClassDB::bind_method(D_METHOD("eval", "code", "use_global_execution_context"), &JavaScript::eval, false);
}
JavaScript::JavaScript() {