diff options
| author | Rémi Verschelde | 2017-09-17 12:52:46 +0200 |
|---|---|---|
| committer | GitHub | 2017-09-17 12:52:46 +0200 |
| commit | a1b4e4c607acb09c13bdf1b9609f2d45c4b01e15 (patch) | |
| tree | f69ff32b272c9688242a3213a047248b7da24e26 /core/object.cpp | |
| parent | 53990c7bb9377982a0dc5aaae7a75f046189c9bc (diff) | |
| parent | 0f4643a4f6cc36b806e867100cfb710b8c3b1d3b (diff) | |
| download | godot-a1b4e4c607acb09c13bdf1b9609f2d45c4b01e15.tar.gz godot-a1b4e4c607acb09c13bdf1b9609f2d45c4b01e15.tar.zst godot-a1b4e4c607acb09c13bdf1b9609f2d45c4b01e15.zip | |
Merge pull request #11272 from Rubonnek/move-to-initializer-list
Moved class_name and return_val to initializer list
Diffstat (limited to '')
| -rw-r--r-- | core/object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/object.cpp b/core/object.cpp index 23e32a214..b1770f1d7 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -277,32 +277,32 @@ MethodInfo::MethodInfo(Variant::Type ret, const String &p_name, const PropertyIn MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name) : name(p_name), flags(METHOD_FLAG_NORMAL), + return_val(p_ret), id(0) { - return_val = p_ret; } MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1) : name(p_name), + return_val(p_ret), flags(METHOD_FLAG_NORMAL), id(0) { - return_val = p_ret; arguments.push_back(p_param1); } MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1, const PropertyInfo &p_param2) : name(p_name), + return_val(p_ret), flags(METHOD_FLAG_NORMAL), id(0) { - return_val = p_ret; arguments.push_back(p_param1); arguments.push_back(p_param2); } MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1, const PropertyInfo &p_param2, const PropertyInfo &p_param3) : name(p_name), + return_val(p_ret), flags(METHOD_FLAG_NORMAL), id(0) { - return_val = p_ret; arguments.push_back(p_param1); arguments.push_back(p_param2); arguments.push_back(p_param3); @@ -310,9 +310,9 @@ MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const Pr MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1, const PropertyInfo &p_param2, const PropertyInfo &p_param3, const PropertyInfo &p_param4) : name(p_name), + return_val(p_ret), flags(METHOD_FLAG_NORMAL), id(0) { - return_val = p_ret; arguments.push_back(p_param1); arguments.push_back(p_param2); arguments.push_back(p_param3); @@ -321,9 +321,9 @@ MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const Pr MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1, const PropertyInfo &p_param2, const PropertyInfo &p_param3, const PropertyInfo &p_param4, const PropertyInfo &p_param5) : name(p_name), + return_val(p_ret), flags(METHOD_FLAG_NORMAL), id(0) { - return_val = p_ret; arguments.push_back(p_param1); arguments.push_back(p_param2); arguments.push_back(p_param3); |