[glibmm] tools: Recursive whitespace cleanup in folder.
- From: José Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] tools: Recursive whitespace cleanup in folder.
- Date: Mon, 6 Jun 2011 17:47:29 +0000 (UTC)
commit 99760a5fafb3814828f1ecfb826d50e0f5aa48d6
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Sun Jun 5 15:42:39 2011 -0400
tools: Recursive whitespace cleanup in folder.
tools/enum.pl | 2 +-
tools/extra_defs_gen/generate_defs_gio.cc | 2 +-
tools/generate_wrap_init.pl.in | 2 +-
tools/gmmproc.in | 2 +-
tools/m4/base.m4 | 4 +-
tools/m4/class_interface.m4 | 2 +-
tools/m4/list.m4 | 2 +-
tools/m4/signal.m4 | 2 +-
tools/m4/vfunc.m4 | 2 +-
tools/pm/DocsParser.pm | 16 +++++++-------
tools/pm/FunctionBase.pm | 32 ++++++++++++++--------------
tools/pm/GtkDefs.pm | 8 +++---
tools/pm/Property.pm | 6 ++--
tools/pm/Util.pm | 6 ++--
tools/pm/WrapParser.pm | 14 ++++++------
15 files changed, 51 insertions(+), 51 deletions(-)
---
diff --git a/tools/enum.pl b/tools/enum.pl
index 11026bf..844b924 100755
--- a/tools/enum.pl
+++ b/tools/enum.pl
@@ -466,4 +466,4 @@ sub form_names($$)
push(@names, $_);
}
return \ names;
-}
+}
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc
index c48a17a..cdd8734 100644
--- a/tools/extra_defs_gen/generate_defs_gio.cc
+++ b/tools/extra_defs_gen/generate_defs_gio.cc
@@ -128,6 +128,6 @@ int main(int, char**)
<< get_defs(G_TYPE_DBUS_SERVER)
<< std::endl;
-
+
return 0;
}
diff --git a/tools/generate_wrap_init.pl.in b/tools/generate_wrap_init.pl.in
index ac11966..2d409c8 100644
--- a/tools/generate_wrap_init.pl.in
+++ b/tools/generate_wrap_init.pl.in
@@ -165,7 +165,7 @@ while ($ARGV[0])
{
$qualification .= "::$_";
}
-
+
my $qualified_cppname = $qualification . "::" . $cppname;
# print "debug: " . $qualified_cppname . "\n";
$exceptions{$qualified_cppname} = $cname;
diff --git a/tools/gmmproc.in b/tools/gmmproc.in
index a39ab0c..ab4ded5 100644
--- a/tools/gmmproc.in
+++ b/tools/gmmproc.in
@@ -175,7 +175,7 @@ Note: This will read srcdir/name.{hg,ccg} file and generates destdir/name.cc
sub parse_command_line_args()
{
print_usage() if ($#ARGV == -1);
-
+
while ($#ARGV != -1)
{
$_ = shift @ARGV;
diff --git a/tools/m4/base.m4 b/tools/m4/base.m4
index b230dee..a81e107 100644
--- a/tools/m4/base.m4
+++ b/tools/m4/base.m4
@@ -88,13 +88,13 @@ dnl lower a string
define(`_LOWER',`m4_translit(`$*',`ABCDEFGHIJKLMNOPQRSTUVWXYZ',`abcdefghijklmnopqrstuvwxyz')')
dnl
-dnl _QUOTE(macro)
+dnl _QUOTE(macro)
dnl If a macro generates an output with commas we need to protect it
dnl from being broken down and interpreted
define(`_QUOTE',``$*'')
dnl
-dnl _NUM(arglist)
+dnl _NUM(arglist)
dnl count number of arguments
define(`_NUM',`m4_ifelse(m4_len(`$*'),0,0,`$#')')
diff --git a/tools/m4/class_interface.m4 b/tools/m4/class_interface.m4
index c38dd55..48cfdaf 100644
--- a/tools/m4/class_interface.m4
+++ b/tools/m4/class_interface.m4
@@ -261,7 +261,7 @@ public:
///Provides access to the underlying C GObject.
__CNAME__* gobj() { return reinterpret_cast<__CNAME__*>(gobject_); }
- ///Provides access to the underlying C GObject.
+ ///Provides access to the underlying C GObject.
const __CNAME__* gobj() const { return reinterpret_cast<__CNAME__*>(gobject_); }
private:
diff --git a/tools/m4/list.m4 b/tools/m4/list.m4
index c51ab5b..954beb1 100644
--- a/tools/m4/list.m4
+++ b/tools/m4/list.m4
@@ -37,7 +37,7 @@ dnl
dnl Closes a list
define(GP_LIST_END,`dnl
_POP()
-
+
class __LISTNAME__ : public Glib::HelperList< __LISTTYPE__, __LISTELEM__, __LISTITER__ >
{
public:
diff --git a/tools/m4/signal.m4 b/tools/m4/signal.m4
index 3ca9a92..970c20d 100644
--- a/tools/m4/signal.m4
+++ b/tools/m4/signal.m4
@@ -200,7 +200,7 @@ ifelse($4,void,`dnl
#endif //GLIBMM_EXCEPTIONS_ENABLED
}
}
-
+
BaseClassType *const base = static_cast<BaseClassType*>(
ifdef(`__BOOL_IS_INTERFACE__',`dnl
_IFACE_PARENT_FROM_OBJECT($8)dnl
diff --git a/tools/m4/vfunc.m4 b/tools/m4/vfunc.m4
index 67cc2f1..93fccc1 100644
--- a/tools/m4/vfunc.m4
+++ b/tools/m4/vfunc.m4
@@ -75,7 +75,7 @@ ifelse($9,refreturn_ctype,`dnl Assume Glib::unwrap_copy() is correct if refretur
#endif //GLIBMM_EXCEPTIONS_ENABLED
}
}
-
+
BaseClassType *const base = static_cast<BaseClassType*>(
ifdef(`__BOOL_IS_INTERFACE__',`dnl
_IFACE_PARENT_FROM_OBJECT($8)dnl
diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm
index e368b5f..a041537 100644
--- a/tools/pm/DocsParser.pm
+++ b/tools/pm/DocsParser.pm
@@ -70,10 +70,10 @@ $DocsParser::commentEnd = " */";
sub read_defs($$$)
{
my ($path, $filename, $filename_override) = @_;
-
+
my $objParser = new XML::Parser(ErrorContext => 0);
$objParser->setHandlers(Start => \&parse_on_start, End => \&parse_on_end, Char => \&parse_on_cdata);
-
+
# C documentation:
$DocsParser::CurrentFile = "$path/$filename";
if ( ! -r $DocsParser::CurrentFile)
@@ -118,7 +118,7 @@ sub parse_on_start($$%)
{
$objParser->xpcroak("\nClose a function tag before you open another one.");
}
-
+
my $functionName = $attr{name};
#Reuse existing Function, if it exists:
@@ -306,7 +306,7 @@ sub append_parameter_docs($$)
if ($param ne "error" ) #We wrap GErrors as exceptions, so ignore these.
{
my $desc = $$param_descriptions->{$param};
-
+
$param =~ s/([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?/$1/g;
DocsParser::convert_docs_to_cpp($obj_function, \$desc);
if(length($desc) > 0)
@@ -444,7 +444,7 @@ sub substitute_function($$)
}
else
{
- print "Documentation: Transformed C name $name into ";
+ print "Documentation: Transformed C name $name into ";
non_object_method_name($doc_func, \$name);
print "C++ name $name\n";
}
@@ -485,9 +485,9 @@ sub non_object_method_name($$)
}
}
}
-
+
print STDERR "Documentation: Class/Namespace for $$name not found\n";
-}
+}
sub lookup_object_of_method($$)
{
@@ -525,7 +525,7 @@ sub lookup_object_of_method($$)
pop(@parts);
}
-
+
return undef;
}
diff --git a/tools/pm/FunctionBase.pm b/tools/pm/FunctionBase.pm
index f363f76..0a0ba19 100644
--- a/tools/pm/FunctionBase.pm
+++ b/tools/pm/FunctionBase.pm
@@ -50,7 +50,7 @@ sub args_types_only($)
sub args_names_only($)
{
my ($self, $index) = @_;
-
+
$index = 0 unless defined($index);
my $param_names = $$self{param_names};
@@ -58,7 +58,7 @@ sub args_names_only($)
my @out;
my @arg_indices;
-
+
if(defined($possible_args_list))
{
@arg_indices = split(" ", @$possible_args_list[$index]);
@@ -67,7 +67,7 @@ sub args_names_only($)
{
@arg_indices = (0 $param_names - 1);
}
-
+
for (my $i = 0; $i < @arg_indices; $i++)
{
push(@out, $$param_names[$arg_indices[$i]]);
@@ -82,7 +82,7 @@ sub args_names_only($)
sub args_types_and_names($)
{
my ($self, $index) = @_;
-
+
$index = 0 unless defined($index);
my $i;
@@ -99,7 +99,7 @@ sub args_types_and_names($)
#}
my @arg_indices;
-
+
if(defined($possible_args_list))
{
@arg_indices = split(" ", @$possible_args_list[$index]);
@@ -108,7 +108,7 @@ sub args_types_and_names($)
{
@arg_indices = (0 $param_names - 1);
}
-
+
for ($i = 0; $i < @arg_indices; $i++)
{
my $str = sprintf("%s %s", $$param_types[$arg_indices[$i]],
@@ -233,7 +233,7 @@ sub dump($)
sub args_types_and_names_with_default_values($)
{
my ($self, $index) = @_;
-
+
$index = 0 unless defined $index;
my $i;
@@ -243,9 +243,9 @@ sub args_types_and_names_with_default_values($)
my $param_default_values = $$self{param_default_values};
my $possible_args_list = $$self{possible_args_list};
my @out;
-
+
my @arg_indices;
-
+
if(defined($possible_args_list))
{
@arg_indices = split(" ", @$possible_args_list[$index]);
@@ -254,17 +254,17 @@ sub args_types_and_names_with_default_values($)
{
@arg_indices = (0 $param_names - 1);
}
-
+
for ($i = 0; $i < @arg_indices; $i++)
{
my $str = sprintf("%s %s", $$param_types[$arg_indices[$i]],
$$param_names[$arg_indices[$i]]);
-
+
if(defined($$param_default_values[$arg_indices[$i]]))
{
my $default_value = $$param_default_values[$arg_indices[$i]];
-
+
if($default_value ne "")
{
$str .= " = " . $default_value;
@@ -285,17 +285,17 @@ sub args_types_and_names_with_default_values($)
sub get_declaration($)
{
my ($self, $index) = @_;
-
+
$index = 0 unless defined $index;
my $out = "";
-
+
$out = "static " if($$self{static});
$out = $out . "$$self{rettype} " if($$self{rettype});
$out = $out . $$self{name} . "(" .
$self->args_types_and_names_with_default_values($index) . ")";
$out = $out . " const" if $$self{const};
$out = $out . ";";
-
+
return $out;
}
@@ -307,7 +307,7 @@ sub get_num_possible_args_list()
my ($self) = @_;
my $possible_args_list = $$self{possible_args_list};
-
+
if(defined($possible_args_list))
{
return @$possible_args_list;
diff --git a/tools/pm/GtkDefs.pm b/tools/pm/GtkDefs.pm
index 4bab8ef..2111d50 100644
--- a/tools/pm/GtkDefs.pm
+++ b/tools/pm/GtkDefs.pm
@@ -437,10 +437,10 @@ sub lookup_enum($)
sub lookup_object($)
{
no warnings;
-
+
my $c_name = $_[0];
my $result = $GtkDefs::objects{$c_name};
-
+
if (not defined($result))
{
# We do not print this error because it's not always an error,
@@ -448,7 +448,7 @@ sub lookup_object($)
# while guessing an object name prefix from a function name.
#
# print "GtkDefs:lookup_object(): can't find object with name=" . $c_name . "\n";
-
+
# debug output:
# foreach my $key (keys %GtkDefs::objects)
# {
@@ -590,7 +590,7 @@ sub new
{
#Ignore them.
}
-
+
# of-object
if ($def =~ s/\(of-object "(\S+)"\)//)
{
diff --git a/tools/pm/Property.pm b/tools/pm/Property.pm
index 80f21bb..a0e9759 100644
--- a/tools/pm/Property.pm
+++ b/tools/pm/Property.pm
@@ -47,7 +47,7 @@ sub new
$$self{writable} = ($1 eq "#t") if ($def =~ s/\(writable (\S+)\)//);
$$self{construct_only} = ($1 eq "#t") if ($def =~ s/\(construct-only (\S+)\)//);
$$self{entity_type} = 'property';
-
+
# Property documentation:
my $propertydocs = $1 if ($def =~ s/\(docs "([^"]*)"\)//);
# Add a full-stop if there is not one already:
@@ -62,9 +62,9 @@ sub new
}
}
}
-
+
$$self{docs} = $propertydocs;
-
+
$$self{name} =~ s/-/_/g; # change - to _
diff --git a/tools/pm/Util.pm b/tools/pm/Util.pm
index c3076b4..cc1ccfa 100644
--- a/tools/pm/Util.pm
+++ b/tools/pm/Util.pm
@@ -48,13 +48,13 @@ our @EXPORT_OK;
sub string_unquote($)
{
my ($str) = @_;
-
+
$str =~ s/^['`"]// ;
$str =~ s/['`"]$// ;
return $str;
}
-
+
# $ string_trim($string)
# Removes leading and trailing white space.
sub string_trim($)
@@ -76,7 +76,7 @@ sub string_canonical($)
}
#
-# Back tracing utility.
+# Back tracing utility.
# Prints the call stack.
#
# void trace()
diff --git a/tools/pm/WrapParser.pm b/tools/pm/WrapParser.pm
index 536341d..f31f16d 100644
--- a/tools/pm/WrapParser.pm
+++ b/tools/pm/WrapParser.pm
@@ -191,7 +191,7 @@ sub extract_token($)
return $_;
}
-
+
return "";
}
@@ -521,7 +521,7 @@ sub on_class($$)
my @back;
push(@back, $class_command);
push(@back, "($str)");
-
+
# When we hit _CLASS, we walk backwards through the output to find "class"
my $token;
while ( scalar(@{$$objOutputter{out}}))
@@ -624,7 +624,7 @@ sub on_end_class($)
########################################
-###
+###
# void on_end_namespace($)
sub on_end_namespace($)
{
@@ -1059,7 +1059,7 @@ sub on_wrap_ctor($)
sub on_implements_interface($$)
{
my ($self) = @_;
-
+
if( !($self->check_for_eof()) )
{
return;
@@ -1126,7 +1126,7 @@ sub on_wrap_signal($$)
my $bCustomCCallback = 0;
my $bRefreturn = 0;
my $ifdef;
-
+
while($#args >= 2) # If optional arguments are there.
{
my $argRef = string_trim(pop @args);
@@ -1149,7 +1149,7 @@ sub on_wrap_signal($$)
{
$bRefreturn = 1;
}
-
+
elsif($argRef =~ /^ifdef(.*)/) #If ifdef is at the start.
{
$ifdef = $1;
@@ -1312,7 +1312,7 @@ sub output_wrap_check($$$$$$)
sub output_wrap_signal($$$$$$$$$)
{
my ($self, $CppDecl, $signal_name, $filename, $line_num, $bCustomDefaultHandler, $bNoDefaultHandler, $bCustomCCallback, $bRefreturn, $ifdef, $merge_doxycomment_with_previous) = @_;
-
+
#Some checks:
return if ($self->output_wrap_check($CppDecl, $signal_name,
$filename, $line_num, "_WRAP_SIGNAL"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]