godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved class_name and return_val to initializer list

Browse Source
This commit is contained in:
Wilson E. Alvarez 2017-09-14 12:54:37 -04:00
parent 8c08f2380d
commit 0f4643a4f6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/object.cpp
View File

@ -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) MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name)
: name(p_name), : name(p_name),
flags(METHOD_FLAG_NORMAL), flags(METHOD_FLAG_NORMAL),
return_val(p_ret),
id(0) { id(0) {
return_val = p_ret;
} }
MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1) MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1)
: name(p_name), : name(p_name),
return_val(p_ret),
flags(METHOD_FLAG_NORMAL), flags(METHOD_FLAG_NORMAL),
id(0) { id(0) {
return_val = p_ret;
arguments.push_back(p_param1); arguments.push_back(p_param1);
} }
MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1, const PropertyInfo &p_param2) MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name, const PropertyInfo &p_param1, const PropertyInfo &p_param2)
: name(p_name), : name(p_name),
return_val(p_ret),
flags(METHOD_FLAG_NORMAL), flags(METHOD_FLAG_NORMAL),
id(0) { id(0) {
return_val = p_ret;
arguments.push_back(p_param1); arguments.push_back(p_param1);
arguments.push_back(p_param2); 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) 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), : name(p_name),
return_val(p_ret),
flags(METHOD_FLAG_NORMAL), flags(METHOD_FLAG_NORMAL),
id(0) { id(0) {
return_val = p_ret;
arguments.push_back(p_param1); arguments.push_back(p_param1);
arguments.push_back(p_param2); arguments.push_back(p_param2);
arguments.push_back(p_param3); 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) 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), : name(p_name),
return_val(p_ret),
flags(METHOD_FLAG_NORMAL), flags(METHOD_FLAG_NORMAL),
id(0) { id(0) {
return_val = p_ret;
arguments.push_back(p_param1); arguments.push_back(p_param1);
arguments.push_back(p_param2); arguments.push_back(p_param2);
arguments.push_back(p_param3); 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) 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), : name(p_name),
return_val(p_ret),
flags(METHOD_FLAG_NORMAL), flags(METHOD_FLAG_NORMAL),
id(0) { id(0) {
return_val = p_ret;
arguments.push_back(p_param1); arguments.push_back(p_param1);
arguments.push_back(p_param2); arguments.push_back(p_param2);
arguments.push_back(p_param3); arguments.push_back(p_param3);

5
core/object.h
View File

@ -148,6 +148,7 @@ struct PropertyInfo {
hint(PROPERTY_HINT_NONE), hint(PROPERTY_HINT_NONE),
usage(PROPERTY_USAGE_DEFAULT) { usage(PROPERTY_USAGE_DEFAULT) {
} }
PropertyInfo(Variant::Type p_type, const String p_name, PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = "", uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const StringName &p_class_name = StringName()) PropertyInfo(Variant::Type p_type, const String p_name, PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = "", uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const StringName &p_class_name = StringName())
: type(p_type), : type(p_type),
name(p_name), name(p_name),
@ -161,12 +162,12 @@ struct PropertyInfo {
class_name = p_class_name; class_name = p_class_name;
} }
} }
PropertyInfo(const StringName &p_class_name) PropertyInfo(const StringName &p_class_name)
: type(Variant::OBJECT), : type(Variant::OBJECT),
class_name(p_class_name),
hint(PROPERTY_HINT_NONE), hint(PROPERTY_HINT_NONE),
usage(PROPERTY_USAGE_DEFAULT) { usage(PROPERTY_USAGE_DEFAULT) {
class_name = p_class_name;
} }
bool operator<(const PropertyInfo &p_info) const { bool operator<(const PropertyInfo &p_info) const {