diff options
author | Murray Cumming <murrayc@murrayc.com> | 2016-04-29 09:19:22 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2016-04-29 09:20:42 +0200 |
commit | 4935445cde8a0d9671f37436d5e0abec29b1aa44 (patch) | |
tree | 4475bc715be8dbc4139ef590c974b48581f83504 /sigc++ | |
parent | f55bdf9b8980ef5914d7f0f939c7292cbe302495 (diff) | |
download | sigc++-4935445cde8a0d9671f37436d5e0abec29b1aa44.tar.gz |
Docs: Fix invokation->invocation typos.
Diffstat (limited to 'sigc++')
-rw-r--r-- | sigc++/adaptors/bind.h | 4 | ||||
-rw-r--r-- | sigc++/adaptors/bind_return.h | 2 | ||||
-rw-r--r-- | sigc++/adaptors/compose.h | 14 | ||||
-rw-r--r-- | sigc++/functors/mem_fun.h | 16 | ||||
-rw-r--r-- | sigc++/functors/ptr_fun.h | 2 | ||||
-rw-r--r-- | sigc++/signal.h | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/sigc++/adaptors/bind.h b/sigc++/adaptors/bind.h index 8c4857c..08e1ee7 100644 --- a/sigc++/adaptors/bind.h +++ b/sigc++/adaptors/bind.h @@ -272,7 +272,7 @@ struct visitor<bind_functor<-1, T_functor, T_type...>> * * @param func Functor that should be wrapped. * @param b Arguments to bind to @e func. - * @return Adaptor that executes @e func with the bound argument on invokation. + * @return Adaptor that executes @e func with the bound argument on invocation. * * @ingroup bind */ @@ -289,7 +289,7 @@ bind(const T_functor& func, T_bound... b) * * @param func Functor that should be wrapped. * @param b Arguments to bind to @e func. - * @return Adaptor that executes func with the bound argument on invokation. + * @return Adaptor that executes func with the bound argument on invocation. * * @ingroup bind */ diff --git a/sigc++/adaptors/bind_return.h b/sigc++/adaptors/bind_return.h index 44dcf96..0da105e 100644 --- a/sigc++/adaptors/bind_return.h +++ b/sigc++/adaptors/bind_return.h @@ -101,7 +101,7 @@ struct visitor<bind_return_functor<T_return, T_functor>> * * @param functor Functor that should be wrapped. * @param ret_value Argument to fix the return value of @e functor to. - * @return Adaptor that executes @e functor on invokation and returns @e ret_value. + * @return Adaptor that executes @e functor on invocation and returns @e ret_value. * * @ingroup bind */ diff --git a/sigc++/adaptors/compose.h b/sigc++/adaptors/compose.h index b892a39..fb4e081 100644 --- a/sigc++/adaptors/compose.h +++ b/sigc++/adaptors/compose.h @@ -25,7 +25,7 @@ namespace sigc /** @defgroup compose compose() * sigc::compose() combines two or three arbitrary functors. - * On invokation, parameters are passed on to one or two getter functor(s). + * On invocation, parameters are passed on to one or two getter functor(s). * The return value(s) are then passed on to the setter function. * * @par Examples: @@ -70,7 +70,7 @@ struct compose1_functor : public adapts<T_setter> } /** Constructs a compose1_functor object that combines the passed functors. - * @param setter Functor that receives the return values of the invokation of @e getter1 and + * @param setter Functor that receives the return values of the invocation of @e getter1 and * @e getter2. * @param getter Functor to invoke from operator()(). */ @@ -104,7 +104,7 @@ struct compose2_functor : public adapts<T_setter> } /** Constructs a compose2_functor object that combines the passed functors. - * @param setter Functor that receives the return values of the invokation of @e getter1 and + * @param setter Functor that receives the return values of the invocation of @e getter1 and * @e getter2. * @param getter1 Functor to invoke from operator()(). * @param getter2 Functor to invoke from operator()(). @@ -162,9 +162,9 @@ struct visitor<compose2_functor<T_setter, T_getter1, T_getter2>> /** Creates an adaptor of type sigc::compose1_functor which combines two functors. * - * @param setter Functor that receives the return value of the invokation of @e getter. + * @param setter Functor that receives the return value of the invocation of @e getter. * @param getter Functor to invoke from operator()(). - * @return Adaptor that executes @e setter with the value returned from invokation of @e + * @return Adaptor that executes @e setter with the value returned from invocation of @e * getter. * * @ingroup compose @@ -178,11 +178,11 @@ compose(const T_setter& setter, const T_getter& getter) /** Creates an adaptor of type sigc::compose2_functor which combines three functors. * - * @param setter Functor that receives the return values of the invokation of @e getter1 and + * @param setter Functor that receives the return values of the invocation of @e getter1 and * @e getter2. * @param getter1 Functor to invoke from operator()(). * @param getter2 Functor to invoke from operator()(). - * @return Adaptor that executes @e setter with the values return from invokation of @e + * @return Adaptor that executes @e setter with the values return from invocation of @e * getter1 and @e getter2. * * @ingroup compose diff --git a/sigc++/functors/mem_fun.h b/sigc++/functors/mem_fun.h index 6808a39..d53b967 100644 --- a/sigc++/functors/mem_fun.h +++ b/sigc++/functors/mem_fun.h @@ -183,7 +183,7 @@ struct visitor<bound_mem_functor<T_func, T_arg...>> /** Creates a functor of type sigc::mem_functor which wraps a method. * @param func Pointer to method that should be wrapped. - * @return Functor that executes func on invokation. + * @return Functor that executes func on invocation. * * @ingroup mem_fun */ @@ -196,7 +196,7 @@ mem_fun(T_return (T_obj::*func)(T_arg...)) /** Creates a functor of type sigc::const_mem_functor which wraps a const method. * @param func Pointer to method that should be wrapped. - * @return Functor that executes func on invokation. + * @return Functor that executes func on invocation. * * @ingroup mem_fun */ @@ -209,7 +209,7 @@ mem_fun(T_return (T_obj::*func)(T_arg...) const) /** Creates a functor of type sigc::volatile_mem_functor which wraps a volatile method. * @param func Pointer to method that should be wrapped. - * @return Functor that executes func on invokation. + * @return Functor that executes func on invocation. * * @ingroup mem_fun */ @@ -222,7 +222,7 @@ mem_fun(T_return (T_obj::*func)(T_arg...) volatile) /** Creates a functor of type sigc::const_volatile_mem_functor which wraps a const volatile method. * @param func Pointer to method that should be wrapped. - * @return Functor that executes func on invokation. + * @return Functor that executes func on invocation. * * @ingroup mem_fun */ @@ -237,7 +237,7 @@ mem_fun(T_return (T_obj::*func)(T_arg...) const volatile) * instance. * @param obj Reference to object instance the functor should operate on. * @param func Pointer to method that should be wrapped. - * @return Functor that executes @e func on invokation. + * @return Functor that executes @e func on invocation. * * @ingroup mem_fun */ @@ -252,7 +252,7 @@ mem_fun(/**/ T_obj& obj, T_return (T_obj2::*func)(T_arg...)) * object instance. * @param obj Reference to object instance the functor should operate on. * @param func Pointer to method that should be wrapped. - * @return Functor that executes @e func on invokation. + * @return Functor that executes @e func on invocation. * * @ingroup mem_fun */ @@ -267,7 +267,7 @@ mem_fun(/*const*/ T_obj& obj, T_return (T_obj2::*func)(T_arg...) const) * object instance. * @param obj Reference to object instance the functor should operate on. * @param func Pointer to method that should be wrapped. - * @return Functor that executes @e func on invokation. + * @return Functor that executes @e func on invocation. * * @ingroup mem_fun */ @@ -282,7 +282,7 @@ mem_fun(/**/ T_obj& obj, T_return (T_obj2::*func)(T_arg...) volatile) * an object instance. * @param obj Reference to object instance the functor should operate on. * @param func Pointer to method that should be wrapped. - * @return Functor that executes @e func on invokation. + * @return Functor that executes @e func on invocation. * * @ingroup mem_fun */ diff --git a/sigc++/functors/ptr_fun.h b/sigc++/functors/ptr_fun.h index 0bda77f..12e2015 100644 --- a/sigc++/functors/ptr_fun.h +++ b/sigc++/functors/ptr_fun.h @@ -97,7 +97,7 @@ public: /** Creates a functor of type sigc::pointer_functor which wraps an existing non-member function. * @param func Pointer to function that should be wrapped. - * @return Functor that executes @e func on invokation. + * @return Functor that executes @e func on invocation. * * @ingroup ptr_fun */ diff --git a/sigc++/signal.h b/sigc++/signal.h index a7327c7..c666617 100644 --- a/sigc++/signal.h +++ b/sigc++/signal.h @@ -552,7 +552,7 @@ public: * * An accumulator is a functor that uses a pair of special iterators * to step through a list of slots and calculate a return value - * from the results of the slot invokations. The iterators' operator*() + * from the results of the slot invocations. The iterators' operator*() * executes the slot. The return value is buffered, so that in an expression * like @code a = (*i) * (*i); @endcode the slot is executed only once. * |