diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-09-08 14:31:41 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-09-08 14:39:10 +0200 |
| commit | 8bd7fbc9e39ca6396ee323bef420dadeeac54a7d (patch) | |
| tree | f4af86744fa9d4a7dc104ea1ce61d02a9773d745 /codegen/valagobjectmodule.vala | |
| parent | f7134476bb362eb629fcb3b9463c783ddab8d417 (diff) | |
| download | vala-8bd7fbc9e39ca6396ee323bef420dadeeac54a7d.tar.gz | |
codegen: Try to use a more unique internal define for properties
https://bugzilla.gnome.org/show_bug.cgi?id=787436
Diffstat (limited to 'codegen/valagobjectmodule.vala')
| -rw-r--r-- | codegen/valagobjectmodule.vala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/codegen/valagobjectmodule.vala b/codegen/valagobjectmodule.vala index 33bb87805..8b3e7a269 100644 --- a/codegen/valagobjectmodule.vala +++ b/codegen/valagobjectmodule.vala @@ -144,7 +144,7 @@ public class Vala.GObjectModule : GTypeModule { var cinst = new CCodeFunctionCall (new CCodeIdentifier ("g_object_class_install_property")); cinst.add_argument (ccall); - cinst.add_argument (new CCodeConstant (get_ccode_upper_case_name (prop))); + cinst.add_argument (new CCodeConstant ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)))); cinst.add_argument (get_param_spec (prop)); ccode.add_expression (cinst); @@ -228,7 +228,7 @@ public class Vala.GObjectModule : GTypeModule { cfunc = new CCodeIdentifier (get_ccode_real_name (prop.get_accessor)); } - ccode.add_case (new CCodeIdentifier (get_ccode_upper_case_name (prop))); + ccode.add_case (new CCodeIdentifier ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)))); if (prop.property_type.is_real_struct_type ()) { var st = prop.property_type.data_type as Struct; @@ -335,7 +335,7 @@ public class Vala.GObjectModule : GTypeModule { cfunc = new CCodeIdentifier (get_ccode_real_name (prop.set_accessor)); } - ccode.add_case (new CCodeIdentifier (get_ccode_upper_case_name (prop))); + ccode.add_case (new CCodeIdentifier ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)))); ccall = new CCodeFunctionCall (cfunc); ccall.add_argument (cself); if (prop.property_type is ArrayType && ((ArrayType)prop.property_type).element_type.data_type == string_type.data_type) { @@ -684,7 +684,7 @@ public class Vala.GObjectModule : GTypeModule { base.visit_property (prop); if (is_gobject_property (prop) && prop.parent_symbol is Class) { - prop_enum.add_value (new CCodeEnumValue (get_ccode_upper_case_name (prop))); + prop_enum.add_value (new CCodeEnumValue ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)))); if (prop.initializer != null && prop.set_accessor != null && !prop.set_accessor.automatic_body) { // generate a custom initializer if it couldn't be done at class_init time |