[glibmm] Remove trailing whitespace.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Remove trailing whitespace.
- Date: Mon, 16 May 2016 13:27:18 +0000 (UTC)
commit 851541b4fdc016b6944bfaf27192f5bb917319f4
Author: Murray Cumming <murrayc murrayc com>
Date: Mon May 16 15:27:10 2016 +0200
Remove trailing whitespace.
build/cxx.m4 | 4 +-
build/cxx_std.m4 | 2 +-
gio/src/action.hg | 10 ++++----
gio/src/actionmap.hg | 6 ++--
gio/src/cancellable.hg | 6 ++--
gio/src/charsetconverter.hg | 2 +-
gio/src/file.hg | 4 +-
gio/src/menuitem.hg | 4 +-
gio/src/mount.hg | 2 +-
gio/src/simpleaction.hg | 12 ++++----
gio/src/tlsconnection.hg | 2 +-
gio/src/tlsinteraction.hg | 2 +-
gio/src/unixconnection.hg | 6 ++--
glib/src/datetime.hg | 8 +++---
glib/src/keyfile.hg | 12 ++++----
glib/src/optioncontext.hg | 4 +-
glib/src/template.macros.m4 | 46 +++++++++++++++++-----------------
glib/src/variant.hg | 2 +-
glib/src/variantdict.hg | 2 +-
glib/src/varianttype.hg | 6 ++--
tools/enum.pl | 6 ++--
tools/m4/base.m4 | 14 +++++-----
tools/m4/class_boxedtype.m4 | 2 +-
tools/m4/class_gobject.m4 | 4 +-
tools/m4/class_interface.m4 | 12 ++++----
tools/m4/class_opaque_copyable.m4 | 2 +-
tools/m4/class_opaque_refcounted.m4 | 2 +-
tools/pm/DocsParser.pm | 4 +-
tools/pm/GtkDefs.pm | 10 ++++----
tools/pm/Output.pm | 6 ++--
tools/pm/Util.pm | 8 +++---
tools/pm/WrapParser.pm | 30 +++++++++++-----------
32 files changed, 121 insertions(+), 121 deletions(-)
---
diff --git a/build/cxx.m4 b/build/cxx.m4
index 58e4f85..718c7c6 100644
--- a/build/cxx.m4
+++ b/build/cxx.m4
@@ -159,8 +159,8 @@ AS_VAR_IF([glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definit
## GLIBMM_CXX_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS
##
-## Check whether the compiler allows us to use a non-extern "C" function,
-## such as a static member function, to an extern "C" function pointer,
+## Check whether the compiler allows us to use a non-extern "C" function,
+## such as a static member function, to an extern "C" function pointer,
## such as a GTK+ callback.
##
AC_DEFUN([GLIBMM_CXX_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS],
diff --git a/build/cxx_std.m4 b/build/cxx_std.m4
index 6708dc5..a7bfab5 100644
--- a/build/cxx_std.m4
+++ b/build/cxx_std.m4
@@ -179,7 +179,7 @@ AC_DEFUN([GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS],
[[
#include <string>
#include <iostream>
-
+
class ustringtest
{
public:
diff --git a/gio/src/action.hg b/gio/src/action.hg
index 5f5e864..a7ce66e 100644
--- a/gio/src/action.hg
+++ b/gio/src/action.hg
@@ -103,7 +103,7 @@ public:
void get_state_hint(T_Value& value) const;
//TODO: When we can break ABI, Return a Glib::VariantContainerBase,
- // as we already do for ActionGroup::get_action_state_hint(),
+ // as we already do for ActionGroup::get_action_state_hint(),
// because that is what this returns (to specify a range).
_WRAP_METHOD(Glib::VariantBase get_state_hint_variant() const, g_action_get_state_hint)
@@ -111,13 +111,13 @@ public:
/** Request for the state of @a action to be changed to @a value,
* assuming that the action has the expected state type.
- *
+ *
* See get_state_type().
- *
+ *
* This call merely requests a change. The action may refuse to change
* its state or may change its state to something other than @a value.
* See get_state_hint().
- *
+ *
* @newin{2,38}
*
* @param value The new state.
@@ -195,7 +195,7 @@ public:
/** Formats a detailed action name from the action's action_name and @a target_value.
*
- * This function is the opposite of parse_detailed_action_name().
+ * This function is the opposite of parse_detailed_action_name().
* It will produce a string that can be parsed back to the @a action_name
* and @a target_value by that function.
*
diff --git a/gio/src/actionmap.hg b/gio/src/actionmap.hg
index 6bbc46d..22241f1 100644
--- a/gio/src/actionmap.hg
+++ b/gio/src/actionmap.hg
@@ -119,7 +119,7 @@ public:
*/
Glib::RefPtr<SimpleAction> add_action_bool(const Glib::ustring& name, const ActivateSlot& slot, bool state
= false);
-
+
//TODO: Docs: Add hints about how to specify the various possible states in the GtkBuilder XML.
/** A convenience method for creating a string-based radio SimpleAction instance
* and adding it to the ActionMap.
@@ -137,7 +137,7 @@ public:
* void on_slot_activated(const Glib::VariantBase& parameter);
*/
using ActivateWithStringParameterSlot = sigc::slot<void, const Glib::ustring&>;
-
+
//TODO: Docs: Add hints about how to specify the various possible states in the GtkBuilder XML.
/** A convenience method for creating a string-based radio SimpleAction instance
* and adding it to the ActionMap.
@@ -166,7 +166,7 @@ public:
* void on_slot_activated(const Glib::VariantBase& parameter);
*/
using ActivateWithIntParameterSlot = sigc::slot<void, int>;
-
+
//TODO: Docs: Add hints about how to specify the various possible states in the GtkBuilder XML.
/** A convenience method for creating an integer-based radio SimpleAction instance
* and adding it to the ActionMap.
diff --git a/gio/src/cancellable.hg b/gio/src/cancellable.hg
index 47196c0..fc8bff8 100644
--- a/gio/src/cancellable.hg
+++ b/gio/src/cancellable.hg
@@ -65,13 +65,13 @@ public:
/** Convenience function to connect to the Cancellable::signal_cancelled()
* signal. Also handles the race condition that may happen
* if the cancellable is cancelled right before connecting.
- *
+ *
* @a slot is called at most once, either directly at the
* time of the connect if @a cancellable is already cancelled,
* or when @a cancellable is cancelled in some thread.
- *
+ *
* See Cancellable::signal_cancelled() for details on how to use this.
- *
+ *
* @newin{2,22}
*
* @param slot The slot to connect.
diff --git a/gio/src/charsetconverter.hg b/gio/src/charsetconverter.hg
index d5f8d87..0d79fbb 100644
--- a/gio/src/charsetconverter.hg
+++ b/gio/src/charsetconverter.hg
@@ -41,7 +41,7 @@ protected:
public:
/** Creates a new CharsetConverter.
- *
+ *
* @newin{2,24}
*
* @param to_charset Destination charset.
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 71e1ca9..25c182f 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -133,11 +133,11 @@ public:
//Note that the implementation of equal() is already virtual via equal_vfunc().
/** Checks equality of two given Files.
- *
+ *
* Note that two Files that differ can still refer to the same
* file on the filesystem due to various forms of filename
* aliasing.
- *
+ *
* This call does no blocking I/O.
* @param other The other File.
* @return <tt>true</tt> if @a *this and @a other are equal.
diff --git a/gio/src/menuitem.hg b/gio/src/menuitem.hg
index 9c54a45..5590393 100644
--- a/gio/src/menuitem.hg
+++ b/gio/src/menuitem.hg
@@ -161,9 +161,9 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(void set_icon(const Glib::RefPtr<Icon>& icon), g_menu_item_set_icon)
/** Unset the icon on the menu item.
- *
+ *
* See set_icon().
- *
+ *
* @newin{2,38}
*/
void unset_icon();
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index 2e91bea..4ad4790 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -213,7 +213,7 @@ public:
* If any errors occurred during the operation, an exception will be thrown.
* In particular, you may get a Gio::Error::NOT_SUPPORTED if the mount
* does not support content guessing.
- *
+ *
* @newin{2,18}
*
* @param result An AsyncResult.
diff --git a/gio/src/simpleaction.hg b/gio/src/simpleaction.hg
index 9a32819..d1e6f23 100644
--- a/gio/src/simpleaction.hg
+++ b/gio/src/simpleaction.hg
@@ -83,10 +83,10 @@ public:
//TODO: Add a templated version of this to avoid the need fo Gio::Variant by the caller.
/** Creates a new stateful action.
- *
+ *
* @a state is the initial state of the action. All future state values
* must have the same VariantType as the initial state.
- *
+ *
* @newin{2,38}
*
* @param name The name of the action.
@@ -99,10 +99,10 @@ public:
//TODO: Create a derived SimpleToggleAction class for this?
//TODO: Document how the app must handle signal_activate() to call change_state().
/** Creates a new boolean stateful action.
- *
+ *
* @a state is the initial state of the action. All future state values
* must also be bool.
- *
+ *
* @newin{2,38}
*
* @param name The name of the action.
@@ -118,7 +118,7 @@ public:
//TODO: Check whether glib now has API to use enums for this: See
https://bugzilla.gnome.org/show_bug.cgi?id=705483
//TODO: Suggest other API that could be used to activate or discover the currently-select radio value.
/** Creates a new radio action with a string-based target value.
- *
+ *
* @newin{2,38}
*
* @param name The name of the action.
@@ -135,7 +135,7 @@ public:
//TODO: Suggest other API that could be used to activate or discover the currently-select radio value.
//TODO: Check that the need for type="i" in the XML is documented: See
https://bugzilla.gnome.org/show_bug.cgi?id=704392#c14
/** Creates a new radio action with an integer-based target value.
- *
+ *
* @newin{2,38}
*
* @param name The name of the action.
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg
index 7a4a044..80852f1 100644
--- a/gio/src/tlsconnection.hg
+++ b/gio/src/tlsconnection.hg
@@ -37,7 +37,7 @@ class TlsInteraction;
* TlsConnection is the base TLS connection class type, which wraps an IOStream
* and provides TLS encryption on top of it. Its subclasses,
* TlsClientConnection and TlsServerConnection, implement client-side and
- * server-side TLS, respectively.
+ * server-side TLS, respectively.
* @newin{2,36}
*/
class TlsConnection : public IOStream
diff --git a/gio/src/tlsinteraction.hg b/gio/src/tlsinteraction.hg
index 37abbbc..1f48904 100644
--- a/gio/src/tlsinteraction.hg
+++ b/gio/src/tlsinteraction.hg
@@ -51,7 +51,7 @@ class TlsPassword;
* they'd like to support by overriding those virtual methods. Any interactions
* not implemented will return Gio::TLS_INTERACTION_UNHANDLED. If a derived
* class implements an async method, it must also implement the corresponding
- * finish method.
+ * finish method.
* @newin{2,36}
*/
class TlsInteraction : public Glib::Object
diff --git a/gio/src/unixconnection.hg b/gio/src/unixconnection.hg
index 25f9c5e..8134ad6 100644
--- a/gio/src/unixconnection.hg
+++ b/gio/src/unixconnection.hg
@@ -57,7 +57,7 @@ public:
* When the operation is finished, @a slot will be called. You can then call
* receive_credentials_finish() to get the result of the operation.
*
- * @param slot A SlotAsyncReady to call when the request is satisfied.
+ * @param slot A SlotAsyncReady to call when the request is satisfied.
* @param cancellable A Cancellable object.
* @newin{2,36}
*/
@@ -79,8 +79,8 @@ public:
* When the operation is finished, @a slot will be called. You can then call
* send_credentials_finish() to get the result of the operation.
*
- * @param slot A SlotAsyncReady to call when the request is satisfied.
- * @param cancellable A Cancellable object.
+ * @param slot A SlotAsyncReady to call when the request is satisfied.
+ * @param cancellable A Cancellable object.
* @newin{2,36}
*/
void send_credentials_async(const SlotAsyncReady& slot,
diff --git a/glib/src/datetime.hg b/glib/src/datetime.hg
index 023cca3..8a4a4a8 100644
--- a/glib/src/datetime.hg
+++ b/glib/src/datetime.hg
@@ -93,7 +93,7 @@ public:
/** Calculates the difference in time between @a *this and @a other. The
* TimeSpan that is returned is effectively @a *this - @a other.
- *
+ *
* @newin{2,26}
*
* @param other The other DateTime.
@@ -105,7 +105,7 @@ public:
#m4 _CONVERSION(`const DateTime&',`gconstpointer',`static_cast<gconstpointer>($3.gobj())')
/** A comparison function for DateTimes that is suitable
* as a CompareFunc.
- *
+ *
* @newin{2,26}
*
* @param other The DateTime to compare with.
@@ -117,10 +117,10 @@ public:
_WRAP_METHOD(guint hash() const, g_date_time_hash)
/** Checks to see if @a *this and @a other are equal.
- *
+ *
* Equal here means that they represent the same moment after converting
* them to the same time zone.
- *
+ *
* @newin{2,26}
*
* @param other The DateTime to compare with.
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index f7094b6..c43ccb0 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -172,7 +172,7 @@ public:
_WRAP_METHOD(bool save_to_file(const std::string& filename), g_key_file_save_to_file, errthrow)
_WRAP_METHOD(Glib::ustring get_start_group() const, g_key_file_get_start_group)
-
+
/** Gets a list of all groups in the KeyFile
* @returns A list containing the names of the groups
*/
@@ -189,7 +189,7 @@ public:
_WRAP_METHOD(bool has_group(const Glib::ustring& group_name) const, g_key_file_has_group)
_WRAP_METHOD(bool has_key(const Glib::ustring& group_name, const Glib::ustring& key) const,
g_key_file_has_key, errthrow)
-
+
_WRAP_METHOD(Glib::ustring get_value(const Glib::ustring& group_name, const Glib::ustring& key) const,
g_key_file_get_value, errthrow)
_WRAP_METHOD(Glib::ustring get_string(const Glib::ustring& group_name, const Glib::ustring& key) const,
g_key_file_get_string, errthrow)
@@ -283,7 +283,7 @@ public:
*/
Glib::ArrayHandle<Glib::ustring> get_string_list(const Glib::ustring& group_name, const Glib::ustring&
key) const;
_IGNORE(g_key_file_get_string_list)
-
+
/** Returns the values associated with @a key under @a group_name
* translated into the current locale, if available.
* @param group_name The name of a group
@@ -345,7 +345,7 @@ public:
Glib::ustring get_comment(const Glib::ustring& group_name) const;
_WRAP_METHOD(Glib::ustring get_comment(const Glib::ustring& group_name, const Glib::ustring& key) const,
g_key_file_get_comment, errthrow)
-
+
_WRAP_METHOD(void set_list_separator(gchar separator), g_key_file_set_list_separator)
_WRAP_METHOD(void set_value(const Glib::ustring& group_name, const Glib::ustring& key, const
Glib::ustring& value), g_key_file_set_value)
_WRAP_METHOD(void set_string(const Glib::ustring& group_name, const Glib::ustring& key, const
Glib::ustring& string), g_key_file_set_string)
@@ -354,7 +354,7 @@ public:
_WRAP_METHOD(void set_integer(const Glib::ustring& group_name, const Glib::ustring& key, int value),
g_key_file_set_integer)
_WRAP_METHOD(void set_int64(const Glib::ustring& group_name, const Glib::ustring& key, gint64 value),
g_key_file_set_int64)
_WRAP_METHOD(void set_uint64(const Glib::ustring& group_name, const Glib::ustring& key, guint64 value),
g_key_file_set_uint64)
-
+
/** Sets a list of string values for @a key under @a group_name. If
* key cannot be found it is created. If @a group_name cannot be found
* it is created.
@@ -384,7 +384,7 @@ public:
*/
void set_boolean_list(const Glib::ustring& group_name, const Glib::ustring& key, const
Glib::ArrayHandle<bool>& list);
_IGNORE(g_key_file_set_boolean_list)
-
+
/** Sets a list of integers for the @a key under @a group_name.
* If either the @a key or @a group_name cannot be found they are created.
* @param group_name The name of a group
diff --git a/glib/src/optioncontext.hg b/glib/src/optioncontext.hg
index 9d0eb6c..5da87e4 100644
--- a/glib/src/optioncontext.hg
+++ b/glib/src/optioncontext.hg
@@ -62,7 +62,7 @@ _WRAP_GERROR(OptionError, GOptionError, G_OPTION_ERROR, NO_GTYPE)
* to parse(). See Gtk::Main::add_gtk_option_group(), for an example.
*
* Add options by creating OptionEntry instances and appropriately-typed variables,
- * and adding them to an OptionGroup with OptionGroup::add_entry() or
+ * and adding them to an OptionGroup with OptionGroup::add_entry() or
* OptionGroup::add_entry_filename(). The option group should then be added to
* the OptionContext with set_main_group() or add_group().
*
@@ -76,7 +76,7 @@ _WRAP_GERROR(OptionError, GOptionError, G_OPTION_ERROR, NO_GTYPE)
* Note that this only works if setlocale() has been called before
* OptionContext::parse().
*
- * OptionContext can automatically generate nicely formatted help output. Unless it is
+ * OptionContext can automatically generate nicely formatted help output. Unless it is
* explicitly turned off with set_help_enabled(), this will recognize
* the --help, -?, --help-all and --help-groupname options
* (where groupname is the name of an OptionGroup) and write suitable text to
diff --git a/glib/src/template.macros.m4 b/glib/src/template.macros.m4
index 33b8b97..1a24059 100644
--- a/glib/src/template.macros.m4
+++ b/glib/src/template.macros.m4
@@ -1,27 +1,27 @@
dnl-----------------------------------------------------------------------
-dnl
+dnl
dnl Karls M4 macros for the signal system used by gtk--
-dnl
+dnl
dnl Copyright (C) 1998-2002 The gtkmm Development Team
-dnl
+dnl
dnl Currently maintained by Tero Pulkkinen. <terop modeemi cs tut fi>
-dnl
+dnl
dnl This library is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Lesser General Public
dnl License as published by the Free Software Foundation; either
dnl version 2.1 of the License, or (at your option) any later version.
-dnl
+dnl
dnl This library is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Lesser General Public License for more details.
-dnl
+dnl
dnl You should have received a copy of the GNU Lesser General Public
dnl License along with this library; if not, write to the Free
dnl Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-dnl
+dnl
dnl-----------------------------------------------------------------------
-dnl Recursion prevention. (Don't attempt to understand why this works!)
+dnl Recursion prevention. (Don't attempt to understand why this works!)
changequote(, )dnl
changequote([, ])dnl
pushdef([DIVERSION],divnum)dnl
@@ -33,7 +33,7 @@ dnl-----------------------------------------------------------------------
dnl
-dnl M4 macros for general sanity
+dnl M4 macros for general sanity
dnl
dnl M4 Quotas are hard to work with, so use braces like autoconf
@@ -46,7 +46,7 @@ dnl M4 comments conflict with compiler directives
changecom(, )
dnl BRACE(text) => [text]
-dnl When we want something to appear with braces
+dnl When we want something to appear with braces
define([BRACE],[[[$*]]])
dnl
@@ -99,12 +99,12 @@ divert(CURRENT_DIVERSION)dnl
popdef([CURRENT_DIVERSION])dnl],[[minclude]])])
dnl
-dnl makes the current filename into a string approprate for use as
+dnl makes the current filename into a string approprate for use as
dnl C identified define. (Defaults to this library name)
dnl
-dnl example: (filename test.hh.m4)
-dnl __header__ => SIGCXX_TEST_H
-dnl __header__(MYHEAD) => MYHEAD_TEST_H
+dnl example: (filename test.hh.m4)
+dnl __header__ => SIGCXX_TEST_H
+dnl __header__(MYHEAD) => MYHEAD_TEST_H
dnl
define([__header__],[ifelse($1,,[SIGCXX],UPPER($1))[_]UPPER(patsubst(translit(BASENAME(__file__),[.-],[__]),[_m4],[]))])
define([__header__],[ifelse($1,,[_GLIBMM],UPPER($1))[_]UPPER_SAFE(M4NAME(__file__))])
@@ -113,7 +113,7 @@ dnl Set of M4 macros for variable argument template building
dnl
dnl ARGS(name,number)
-dnl Builds a comma seperated protected list of numbered names
+dnl Builds a comma seperated protected list of numbered names
dnl Use this as short hand to specify arguement names
dnl
dnl ARGS(arg,3) => ARG1,ARG2,ARG3
@@ -123,8 +123,8 @@ define([ARGS],[ifelse(eval($2>0),1,[PROT(_ARGS(UPPER([$1]),1,$2))],[PROT])])
dnl
dnl LIST(string1,string2,...)
dnl These are intended for making extended argument lists
-dnl parameters are in pairs, the first is output if the
-dnl 2nd is nonzero length, the process is then repeated
+dnl parameters are in pairs, the first is output if the
+dnl 2nd is nonzero length, the process is then repeated
dnl with the next set of arguments.
dnl
dnl Macro expansions that expand to result in commas must call
@@ -132,7 +132,7 @@ dnl PROT to prevent permature expansion. ARG* macros do
dnl this automatically. (If unsure, add braces until it stops
dnl interpreting inter macros, remove one set of braces, if
dnl still not right use PROT)
-dnl
+dnl
dnl (LIST is probably the most useful macro in the set.)
define([LIST],[ifelse($#,0,,$#,1,[$1],[$1],,[LIST(shift($@))],[__LIST($@)])])
define([__LIST],[ifelse($#,0,,$#,1,[$1],[$1[]ifelse([$2],,,[[,]])__LIST(shift($@))])])
@@ -150,7 +150,7 @@ dnl define([FOO],[foo([$1])])
dnl ARG_LOOP([FOO],[[, ]],A,B,C)
dnl
dnl Gives: foo(A), foo(B), foo(C)
-dnl
+dnl
define([_ARG_LOOP],[dnl
ifelse(NUM($*),0,,NUM($*),1,[dnl
indir(LOOP_FORMAT,[$1])],[dnl
@@ -165,7 +165,7 @@ popdef([LOOP_SEPERATOR])dnl
])
-dnl
+dnl
dnl Define some useful formats for use with ARG_LOOP.
define([FORMAT_ARG_CLASS],[class [$1]])
define([FORMAT_ARG_BOTH],[[$1] LOWER([$1])])
@@ -212,12 +212,12 @@ dnl (occasionally useful)
define([DROP],[ifelse([$1],[$2],,[$*])])
dnl
-dnl LINE(linenum)
+dnl LINE(linenum)
dnl places a #line statement if __debug__ set
-dnl Use this at top of macro template and following
+dnl Use this at top of macro template and following
dnl macros that contain newlines.
dnl
-dnl example:
+dnl example:
dnl LINE(]__line__[)dnl
define([LINE],[ifdef([__debug__],[#line $1 "]__file__["
])])
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index 7ecc0eb..f855db7 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -158,7 +158,7 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(guint hash() const, g_variant_hash)
/** Checks if @a *this and @a other have the same type and value.
- *
+ *
* @newin{2,24}
*
* @param other The Variant to compare with.
diff --git a/glib/src/variantdict.hg b/glib/src/variantdict.hg
index 296f1e2..5974953 100644
--- a/glib/src/variantdict.hg
+++ b/glib/src/variantdict.hg
@@ -84,7 +84,7 @@ public:
_WRAP_METHOD(void insert_value_variant(const Glib::ustring& key, const VariantBase& value),
g_variant_dict_insert_value)
/** Inserts (or replaces) a key in a VariantDict.
- *
+ *
* @param key The key to insert a value for.
* @param value The value to insert.
*/
diff --git a/glib/src/varianttype.hg b/glib/src/varianttype.hg
index 6093afd..19327ab 100644
--- a/glib/src/varianttype.hg
+++ b/glib/src/varianttype.hg
@@ -146,15 +146,15 @@ public:
_WRAP_METHOD(guint hash() const, g_variant_type_hash)
/** Compares @a *this and @a other for equality.
- *
+ *
* Only returns <tt>true</tt> if the types are exactly equal. Even if one type
* is an indefinite type and the other is a subtype of it, <tt>false</tt> will
* be returned if they are not exactly equal. If you want to check for
* subtypes, use is_subtype_of().
- *
+ *
* @param other The VariantType to compare with.
* @return <tt>true</tt> if @a *this and @a other are exactly equal.
- *
+ *
* @newin{2,24}
*/
_WRAP_METHOD(bool equal(const VariantType& other) const, g_variant_type_equal)
diff --git a/tools/enum.pl b/tools/enum.pl
index c8dd301..8b52d8c 100755
--- a/tools/enum.pl
+++ b/tools/enum.pl
@@ -214,15 +214,15 @@ sub process($$)
else
{
do
- {
+ {
$brackets_count += () = $lines[$iter] =~ /\(/g;
- $brackets_count -= () = $lines[$iter] =~ /\)/g;
+ $brackets_count -= () = $lines[$iter] =~ /\)/g;
$iter++;
} while ($iter < scalar @lines && $brackets_count != 0);
}
my $i = join(',', @lines[$begin..$iter-1]);
-
+
# remove leading and trailing spaces.
$i =~ s/^\s+//;
$i =~ s/\s+$//;
diff --git a/tools/m4/base.m4 b/tools/m4/base.m4
index a577075..24deb01 100644
--- a/tools/m4/base.m4
+++ b/tools/m4/base.m4
@@ -2,9 +2,9 @@ dnl $Id$
divert(-1)
dnl
-dnl The general convention is
+dnl The general convention is
dnl _* are macros
-dnl __*__ are variables
+dnl __*__ are variables
dnl
dnl rename several m4 builtins to avoid name clashes
@@ -66,7 +66,7 @@ m4_include(initialize.m4)
dnl
dnl ----------------------- Utility Macros -------------------------
-dnl
+dnl
dnl
dnl Add a comma before the arg if any, do nothing otherwise
@@ -93,7 +93,7 @@ dnl _LOWER(string)
dnl lower a string
define(`_LOWER',`m4_translit(`$*',`ABCDEFGHIJKLMNOPQRSTUVWXYZ',`abcdefghijklmnopqrstuvwxyz')')
-dnl
+dnl
dnl _QUOTE(macro)
dnl If a macro generates an output with commas we need to protect it
dnl from being broken down and interpreted
@@ -206,7 +206,7 @@ dnl _NEW_SECTION(SECTION_H_SIGNALPROXIES) dnl signal member objects
_NEW_SECTION(SECTION_CC_SIGNALPROXIES) dnl signal member objects
dnl Property Proxies:
-dnl _NEW_SECTION(SECTION_H_PROPERTYPROXIES)
+dnl _NEW_SECTION(SECTION_H_PROPERTYPROXIES)
_NEW_SECTION(SECTION_CC_PROPERTYPROXIES)
dnl Just a hack for some GError wrappers:
@@ -408,8 +408,8 @@ _POP()
define(`_PINCLUDE', defn(`_PH_INCLUDE'))
-# Put these, for instance, around gtkmmproc macros (_WRAP_SIGNAL)
-# to make the #ifndef appear around the generated code in both the .h
+# Put these, for instance, around gtkmmproc macros (_WRAP_SIGNAL)
+# to make the #ifndef appear around the generated code in both the .h
# and .cc files.
# e.g. _GTKMMPROC_H_AND_CC(#ifndef _SUN_CC_)
# e.g. _GTKMMPROC_H_AND_CC(#endif //_SUN_CC_)
diff --git a/tools/m4/class_boxedtype.m4 b/tools/m4/class_boxedtype.m4
index ed8a481..ae0a92e 100644
--- a/tools/m4/class_boxedtype.m4
+++ b/tools/m4/class_boxedtype.m4
@@ -72,7 +72,7 @@ ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl
',`dnl else
/** A Glib::wrap() method for this object.
- *
+ *
* @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a
new copy or ref.
* @result A C++ instance that wraps this C instance.
diff --git a/tools/m4/class_gobject.m4 b/tools/m4/class_gobject.m4
index 015eb28..0e0e4f6 100644
--- a/tools/m4/class_gobject.m4
+++ b/tools/m4/class_gobject.m4
@@ -87,7 +87,7 @@ _POP()
')
dnl Some gobjects actually derive from GInitiallyUnowned, which does some odd reference-counting that is
useful to C coders.
-dnl We don't want to expose that base class in our API,
+dnl We don't want to expose that base class in our API,
dnl but we do want to reverse what it does:
define(`_DERIVES_INITIALLY_UNOWNED',`dnl
_PUSH()
@@ -134,7 +134,7 @@ ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl
namespace Glib
{
/** A Glib::wrap() method for this object.
- *
+ *
* @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a
new copy or ref.
* @result A C++ instance that wraps this C instance.
diff --git a/tools/m4/class_interface.m4 b/tools/m4/class_interface.m4
index 0116045..3c0b93e 100644
--- a/tools/m4/class_interface.m4
+++ b/tools/m4/class_interface.m4
@@ -96,7 +96,7 @@ void __CPPNAME__`'_Class::iface_init_function(void* g_iface, void*)
//This is just to avoid an "unused variable" warning when there are no vfuncs or signal handlers to
connect.
//This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
- g_assert(klass != nullptr);
+ g_assert(klass != nullptr);
_IMPORT(SECTION_PCC_CLASS_INIT_VFUNCS)
@@ -128,7 +128,7 @@ ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl
namespace Glib
{
/** A Glib::wrap() method for this object.
- *
+ *
* @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a
new copy or ref.
* @result A C++ instance that wraps this C instance.
@@ -260,10 +260,10 @@ protected:
__CPPNAME__`'();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
- /** Called by constructors of derived classes. Provide the result of
- * the Class init() function to ensure that it is properly
+ /** Called by constructors of derived classes. Provide the result of
+ * the Class init() function to ensure that it is properly
* initialized.
- *
+ *
* @param interface_class The Class object for the derived type.
*/
explicit __CPPNAME__`'(const Glib::Interface_Class& interface_class);
@@ -271,7 +271,7 @@ protected:
public:
// This is public so that C++ wrapper instances can be
// created for C instances of unwrapped types.
- // For instance, if an unexpected C type implements the C interface.
+ // For instance, if an unexpected C type implements the C interface.
explicit __CPPNAME__`'(__CNAME__* castitem);
protected:
diff --git a/tools/m4/class_opaque_copyable.m4 b/tools/m4/class_opaque_copyable.m4
index 0e17919..26148e9 100644
--- a/tools/m4/class_opaque_copyable.m4
+++ b/tools/m4/class_opaque_copyable.m4
@@ -58,7 +58,7 @@ namespace Glib
{
/** A Glib::wrap() method for this object.
- *
+ *
* @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a
new copy or ref.
* @result A C++ instance that wraps this C instance.
diff --git a/tools/m4/class_opaque_refcounted.m4 b/tools/m4/class_opaque_refcounted.m4
index e8d645b..e90a1c0 100644
--- a/tools/m4/class_opaque_refcounted.m4
+++ b/tools/m4/class_opaque_refcounted.m4
@@ -31,7 +31,7 @@ namespace Glib
{
/** A Glib::wrap() method for this object.
- *
+ *
* @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a
new copy or ref.
* @result A C++ instance that wraps this C instance.
diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm
index 33d4a75..a22520d 100644
--- a/tools/pm/DocsParser.pm
+++ b/tools/pm/DocsParser.pm
@@ -238,7 +238,7 @@ sub lookup_enum_documentation($$$$$$$)
{
my ($c_enum_name, $cpp_enum_name, $indent, $ref_subst_in, $ref_subst_out,
$deprecation_docs, $newin) = @_;
-
+
my $objFunction = $DocsParser::hasharrayFunctions{$c_enum_name};
if(!$objFunction)
{
@@ -302,7 +302,7 @@ sub lookup_enum_documentation($$$$$$$)
# Escape the space after "i.e." or "e.g." in the brief description.
$docs =~ s/^([^.]*\b(?:i\.e\.|e\.g\.))\s/$1\\ /;
-
+
remove_example_code($c_enum_name, \$docs);
# Add indentation and an asterisk on all lines except the first.
diff --git a/tools/pm/GtkDefs.pm b/tools/pm/GtkDefs.pm
index f4d23be..03c1131 100644
--- a/tools/pm/GtkDefs.pm
+++ b/tools/pm/GtkDefs.pm
@@ -4,13 +4,13 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -384,7 +384,7 @@ sub get_child_properties
sub get_marked
{
no warnings;
- return grep {$$_{mark}==1} values %GtkDefs::methods;
+ return grep {$$_{mark}==1} values %GtkDefs::methods;
}
# This searches for items wrapped by this file and then tries to locate
@@ -465,7 +465,7 @@ sub lookup_object($)
if (not defined($result))
{
- # We do not print this error because it's not always an error,
+ # We do not print this error because it's not always an error,
# because the caller will often try several object names,
# while guessing an object name prefix from a function name.
#
diff --git a/tools/pm/Output.pm b/tools/pm/Output.pm
index 1485d00..6af2775 100644
--- a/tools/pm/Output.pm
+++ b/tools/pm/Output.pm
@@ -740,7 +740,7 @@ sub output_wrap_enum_docs_only($$$$$$$$$$$)
{
my ($self, $filename, $line_num, $module_canonical, $cpp_type, $c_type,
$comment, $ref_subst_in, $ref_subst_out, $deprecation_docs, $newin) = @_;
-
+
# Get the existing enum description from the parsed docs.
my $enum_docs = DocsParser::lookup_enum_documentation("$c_type", "$cpp_type",
" ", $ref_subst_in, $ref_subst_out, $deprecation_docs, $newin);
@@ -1277,11 +1277,11 @@ sub convert_args_cpp_to_c($$$$$)
my $initialization = "";
if($cOutputParamType =~ /\*$/)
{
- $initialization = " = nullptr";
+ $initialization = " = nullptr";
}
else
{
- $initialization = " = $cOutputParamType()";
+ $initialization = " = $cOutputParamType()";
}
push(@declarations, " $cOutputParamType $cOutputParamName$initialization;");
diff --git a/tools/pm/Util.pm b/tools/pm/Util.pm
index f8bc933..bf033c6 100644
--- a/tools/pm/Util.pm
+++ b/tools/pm/Util.pm
@@ -4,13 +4,13 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -18,7 +18,7 @@
#
#
# This file holds basic functions used throughout gtkmmproc modules.
-# Functions in this module are exported so there is no need to
+# Functions in this module are exported so there is no need to
# request them by module name.
#
package Util;
diff --git a/tools/pm/WrapParser.pm b/tools/pm/WrapParser.pm
index 8b05695..9a03e73 100644
--- a/tools/pm/WrapParser.pm
+++ b/tools/pm/WrapParser.pm
@@ -4,13 +4,13 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -421,7 +421,7 @@ sub on_namespace($)
my $token;
my $arg;
- # we need to peek ahead to figure out what type of namespace
+ # we need to peek ahead to figure out what type of namespace
# declaration this is.
while ( $number <= $#tokens )
{
@@ -522,7 +522,7 @@ sub on_class($$)
$$self{in_class} = $$self{level};
#Remember the type of wrapper required, so that we can append the correct _END_CLASS_* macro later.
- {
+ {
my $str = $class_command;
$str =~ s/^_CLASS_//;
$$self{type} = $str;
@@ -735,7 +735,7 @@ sub string_split_commas($;$)
# In the case of a '>' decrease the level if it is not in a {...}
# because if it is found in a {...} it is most likely indicating that
- # a parameter in a method declaration is an output param.
+ # a parameter in a method declaration is an output param.
$level-- if ($t eq ")" or ($t eq ">" && !$in_braces));
# Don't split at comma, if inside a function, e.g. void f1(int x, int y)
@@ -1177,7 +1177,7 @@ sub on_implements_interface($$)
my $interface = $args[0];
# Extra stuff needed?
- my $ifdef;
+ my $ifdef;
while($#args >= 1) # If the optional ref/err/deprecated arguments are there.
{
my $argRef = string_trim(pop @args);
@@ -1187,8 +1187,8 @@ sub on_implements_interface($$)
}
}
my $objOutputter = $$self{objOutputter};
- $objOutputter->output_implements_interface($interface, $ifdef);
-}
+ $objOutputter->output_implements_interface($interface, $ifdef);
+}
sub on_wrap_create($)
{
@@ -1539,7 +1539,7 @@ sub on_wrap_any_property($)
$argPropertyName = string_unquote($argPropertyName);
#Convert the property name to a canonical form, as it is inside gobject.
- #Otherwise, gobject might not recognise the name,
+ #Otherwise, gobject might not recognise the name,
#and we will not recognise the property name when we get notification that the value changes.
$argPropertyName =~ tr/_/-/;
@@ -1656,10 +1656,10 @@ sub output_wrap_signal($$$$$$$$$$$$$$$$$)
$objCSignal = GtkDefs::lookup_signal($$self{c_class}, $signal_name);
# Check for failed lookup.
- if($objCSignal eq 0)
+ if($objCSignal eq 0)
{
print STDERR "$signal_name\n";
- $objOutputter->output_wrap_failed($signal_name,
+ $objOutputter->output_wrap_failed($signal_name,
" signal defs lookup failed");
return;
}
@@ -1744,18 +1744,18 @@ sub output_wrap_vfunc($$$$$$$$$$$$$$$$$)
}
# give some sort of weights to sorting attibutes
-sub byattrib()
+sub byattrib()
{
my %attrib_value = (
"virtual_impl" ,1,
"virtual_decl" ,2,
# "sig_impl" ,3,
- "sig_decl" ,4,
+ "sig_decl" ,4,
"meth" ,5
);
# $a and $b are hidden parameters to a sorting function
- return $attrib_value{$b} <=> $attrib_value{$a};
+ return $attrib_value{$b} <=> $attrib_value{$a};
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
