summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid King <davidk@openismus.com>2010-04-23 12:36:11 +0200
committerDavid King <davidk@openismus.com>2010-04-23 12:44:02 +0200
commit2b18c258df94ca4c9fe2fae6eeac76c7cbc8b8fc (patch)
treef91ea15d730173c24b1d5cc9ca610c7670d15676
parent58582b894a83dd4e92b01ac26c9ff5255997d639 (diff)
downloadsigc++-2b18c258df94ca4c9fe2fae6eeac76c7cbc8b8fc.tar.gz
Fix the functors Doxygen group in the m4 files
* sigc++/functors/macros/functor_trait.h.m4: * sigc++/functors/macros/mem_fun.h.m4: * sigc++/functors/macros/ptr_fun.h.m4: Rename functors to sigcfunctors.
-rw-r--r--ChangeLog9
-rw-r--r--sigc++/functors/macros/functor_trait.h.m48
-rw-r--r--sigc++/functors/macros/mem_fun.h.m42
-rw-r--r--sigc++/functors/macros/ptr_fun.h.m42
4 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d166df0..800f884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-23 David King <davidk@openismus.com>
+
+ Fix the functors Doxygen group in the m4 files
+
+ * sigc++/functors/macros/functor_trait.h.m4:
+ * sigc++/functors/macros/mem_fun.h.m4:
+ * sigc++/functors/macros/ptr_fun.h.m4: Rename functors to
+ sigcfunctors.
+
2.2.6:
2010-04-16 Murray Cumming <murrayc@murrayc-desktop>
diff --git a/sigc++/functors/macros/functor_trait.h.m4 b/sigc++/functors/macros/functor_trait.h.m4
index 7aef76a..f7e56bd 100644
--- a/sigc++/functors/macros/functor_trait.h.m4
+++ b/sigc++/functors/macros/functor_trait.h.m4
@@ -87,7 +87,7 @@ namespace sigc {
struct nil;
-/** @defgroup functors Functors
+/** @defgroup sigcfunctors Functors
* Functors are copyable types that define operator()().
*
* Types that define operator()() overloads with different return types are referred to
@@ -109,7 +109,7 @@ struct nil;
/** A hint to the compiler.
* All functors which define @p result_type should publically inherit from this hint.
*
- * @ingroup functors
+ * @ingroup sigcfunctors
*/
struct functor_base {};
@@ -134,7 +134,7 @@ struct functor_trait<T_functor,true>
* namespace sigc { SIGC_FUNCTORS_HAVE_RESULT_TYPE }
* @endcode
*
- * @ingroup functors
+ * @ingroup sigcfunctors
*/
#define SIGC_FUNCTORS_HAVE_RESULT_TYPE \
template <class T_functor> \
@@ -155,7 +155,7 @@ struct functor_trait<T_functor,false> \
* }
* @endcode
*
- * @ingroup functors
+ * @ingroup sigcfunctors
*/
#define SIGC_FUNCTOR_TRAIT(T_functor,T_return) \
template <> \
diff --git a/sigc++/functors/macros/mem_fun.h.m4 b/sigc++/functors/macros/mem_fun.h.m4
index 7c60f3d..2e90425 100644
--- a/sigc++/functors/macros/mem_fun.h.m4
+++ b/sigc++/functors/macros/mem_fun.h.m4
@@ -237,7 +237,7 @@ namespace sigc {
* sigc::slot<void, int> sl = sigc::mem_fun1<int>(my_foo, &foo::bar);
* @endcode
*
- * @ingroup functors
+ * @ingroup sigcfunctors
*/
FOR(0,CALL_SIZE,[[MEMBER_FUNCTOR(%1,[],[],[])]])dnl
diff --git a/sigc++/functors/macros/ptr_fun.h.m4 b/sigc++/functors/macros/ptr_fun.h.m4
index 6f9e1e4..a9499d2 100644
--- a/sigc++/functors/macros/ptr_fun.h.m4
+++ b/sigc++/functors/macros/ptr_fun.h.m4
@@ -112,7 +112,7 @@ namespace sigc {
* sigc::slot<void, int> sl = sigc::ptr_fun(&foo::bar);
* @endcode
*
- * @ingroup functors
+ * @ingroup sigcfunctors
*/
FOR(0,CALL_SIZE,[[POINTER_FUNCTOR(%1)]])dnl