diff options
| author | José Alburquerque <jaalburqu@svn.gnome.org> | 2012-09-30 23:18:08 -0400 |
|---|---|---|
| committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2012-09-30 23:18:08 -0400 |
| commit | d694160400455f2156f4b298c7f34bb1616ec894 (patch) | |
| tree | 1bd8cfd222f7a0dd5cda73e013b1786af0fa66ae /tools/pm | |
| parent | 2f382211f52ab2ae806eeb1a6cc5cd72047a15e4 (diff) | |
| download | glibmm-d694160400455f2156f4b298c7f34bb1616ec894.tar.gz | |
ActionGroup: Add the query_action() methods.
* tools/m4/base.m4:
* tools/m4/convert_base.m4:
* tools/m4/filelist.am:
* tools/m4/initialize.m4:
* tools/m4/initialize_base.m4:
* tools/m4/initialize_gio.m4:
* tools/m4/initialize_glib.m4:
* tools/m4/initialize_glibmm.m4: Move the _INITIALIZE macros into
their own files as is done for the _CONVERT macros so that some basic
types that are common (like initializing a bool& from a gboolean) can
be defined once and used in other circumstances.
* gio/src/dbusconnection.hg: Move an _INITIALIZATION macro to the
general files above (the gio initialize file).
* gio/src/actiongroup.hg: Add the query_action() methods (the needed
_INITIALIZATION macros are in the glib initialize file).
* tools/pm/Output.pm (convert_args_cpp_to_c): Correct the indentation
of the declarations of the C output variables and the setting of the
C++ output parameters from the C variables for methods that use the
output parameter feature of gmmproc.
Diffstat (limited to 'tools/pm')
| -rw-r--r-- | tools/pm/Output.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/pm/Output.pm b/tools/pm/Output.pm index bd8fb80e..5312218e 100644 --- a/tools/pm/Output.pm +++ b/tools/pm/Output.pm @@ -868,9 +868,9 @@ sub convert_args_cpp_to_c($$$$$) my $c_param_types = $$objCDefsFunc{param_types}; my $c_param_names = $$objCDefsFunc{param_names}; - my @conversions; - my @declarations; - my @initializations; + my @conversions = (); + my @declarations = (); + my @initializations = (); my $num_c_args_expected = scalar(@{$c_param_types}); if( !($static) ) { $num_c_args_expected--; } #The cpp method will need an Object* paramater at the start. @@ -991,7 +991,7 @@ sub convert_args_cpp_to_c($$$$$) push(@conversions, "&" . $cOutputParamName); - push(@initializations, sprintf(" _INITIALIZE(\`%s\',%s,%s,%s,%s);", + push(@initializations, sprintf("_INITIALIZE(\`%s\',%s,%s,%s,%s);", $cppParamType, $cOutputParamType, $cppParamName, @@ -1016,7 +1016,7 @@ sub convert_args_cpp_to_c($$$$$) } } - return ( join(", ", @conversions), join("\n ", @declarations), + return ( join(", ", @conversions), join("\n", @declarations), join("\n ", @initializations) ); } |