~ubuntu-branches/ubuntu/quantal/vala-0.16/quantal

« back to all changes in this revision

Viewing changes to codegen/valaccodedelegatemodule.vala

  • Committer: Package Import Robot
  • Author(s): Rico Tzschichholz
  • Date: 2012-02-28 20:20:50 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120228202050-nowzcc7uhxomtrs2
Tags: 0.15.2-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
339
339
                                var deleg_type = (DelegateType) param.variable_type;
340
340
 
341
341
                                if (deleg_type.delegate_symbol.has_target) {
342
 
                                        var ctarget = new CCodeIdentifier (get_delegate_target_cname (d_params.get (i).name));
 
342
                                        var ctarget = new CCodeIdentifier (get_ccode_delegate_target_name (d_params.get (i)));
343
343
                                        carg_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), ctarget);
344
344
                                        if (deleg_type.value_owned) {
345
345
                                                var ctarget_destroy_notify = new CCodeIdentifier (get_delegate_target_destroy_notify_cname (d_params.get (i).name));
473
473
                        generate_delegate_declaration (d, decl_space);
474
474
 
475
475
                        if (d.has_target) {
476
 
                                var cparam = new CCodeParameter (get_delegate_target_cname (get_variable_cname (param.name)), target_ctypename);
 
476
                                var cparam = new CCodeParameter (get_ccode_delegate_target_name (param), target_ctypename);
477
477
                                cparam_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), cparam);
478
478
                                if (carg_map != null) {
479
479
                                        carg_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), get_variable_cexpression (cparam.name));
487
487
                                }
488
488
                        }
489
489
                } else if (param.variable_type is MethodType) {
490
 
                        var cparam = new CCodeParameter (get_delegate_target_cname (get_variable_cname (param.name)), target_ctypename);
 
490
                        var cparam = new CCodeParameter (get_ccode_delegate_target_name (param), target_ctypename);
491
491
                        cparam_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), cparam);
492
492
                        if (carg_map != null) {
493
493
                                carg_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), get_variable_cexpression (cparam.name));