diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2010-09-09 15:42:59 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2010-09-09 15:45:22 +0200 |
| commit | 994935e2af012d64fe053709fccfbbf76c090a54 (patch) | |
| tree | bcfeb3274321fe30f961c8fc4fed0aee1a16cbdf /codegen/valagobjectmodule.vala | |
| parent | 8166abea81a4767977dfa7340b5f6bcf288c1f04 (diff) | |
| download | vala-994935e2af012d64fe053709fccfbbf76c090a54.tar.gz | |
GObject: Add _vala_ suffix to get/set_property to avoid name clashes
Fixes bug 624594.
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 c2be061fb..7923fd3b5 100644 --- a/codegen/valagobjectmodule.vala +++ b/codegen/valagobjectmodule.vala @@ -51,10 +51,10 @@ public class Vala.GObjectModule : GTypeModule { var ccall = new CCodeFunctionCall (new CCodeIdentifier ("G_OBJECT_CLASS")); ccall.add_argument (new CCodeIdentifier ("klass")); if (class_has_readable_properties (cl) || cl.get_type_parameters ().size > 0) { - init_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (ccall, "get_property"), new CCodeIdentifier ("%s_get_property".printf (cl.get_lower_case_cname (null)))))); + init_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (ccall, "get_property"), new CCodeIdentifier ("_vala_%s_get_property".printf (cl.get_lower_case_cname (null)))))); } if (class_has_writable_properties (cl) || cl.get_type_parameters ().size > 0) { - init_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (ccall, "set_property"), new CCodeIdentifier ("%s_set_property".printf (cl.get_lower_case_cname (null)))))); + init_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (ccall, "set_property"), new CCodeIdentifier ("_vala_%s_set_property".printf (cl.get_lower_case_cname (null)))))); } /* set constructor */ @@ -174,7 +174,7 @@ public class Vala.GObjectModule : GTypeModule { } private void add_get_property_function (Class cl) { - var get_prop = new CCodeFunction ("%s_get_property".printf (cl.get_lower_case_cname (null)), "void"); + var get_prop = new CCodeFunction ("_vala_%s_get_property".printf (cl.get_lower_case_cname (null)), "void"); get_prop.modifiers = CCodeModifiers.STATIC; get_prop.add_parameter (new CCodeFormalParameter ("object", "GObject *")); get_prop.add_parameter (new CCodeFormalParameter ("property_id", "guint")); @@ -282,7 +282,7 @@ public class Vala.GObjectModule : GTypeModule { } private void add_set_property_function (Class cl) { - var set_prop = new CCodeFunction ("%s_set_property".printf (cl.get_lower_case_cname (null)), "void"); + var set_prop = new CCodeFunction ("_vala_%s_set_property".printf (cl.get_lower_case_cname (null)), "void"); set_prop.modifiers = CCodeModifiers.STATIC; set_prop.add_parameter (new CCodeFormalParameter ("object", "GObject *")); set_prop.add_parameter (new CCodeFormalParameter ("property_id", "guint")); |