GNOME.org
 

[libsigc++2] Docs: Fix the functors group and the link from the overview.

commit 24194181050a22eb5e96fb3c9b41770329c6e60f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Apr 16 09:44:32 2010 +0200

    Docs: Fix the functors group and the link from the overview.
    
    * docs/website/doc.shtml: Revert this to point to the overview page at
        docs/indeex.html, which I have manually uploaded to the website, until
        we add this overview to the doxygen-generated documentation itself.
    * sigc++/functors/slot_base.h:
    * sigc++/visit_each.h: Rename the functors doxygen group to sigcfunctors,
        because doxygen seems to confuse it with the one in libstdc++.
    * docs/index.html: Update the links.

 ChangeLog                   |   12 ++++++++++++
 docs/index.html             |   30 +++++++++++++++---------------
 docs/website/doc.shtml      |    4 ++--
 sigc++/functors/slot_base.h |    2 +-
 sigc++/visit_each.h         |    4 ++--
 5 files changed, 32 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 312e941..8a30a32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-16  Murray Cumming  <murrayc murrayc-desktop>
+
+	Docs: Fix the functors group and the link from the overview.
+
+	* docs/website/doc.shtml: Revert this to point to the overview page at
+    docs/indeex.html, which I have manually uploaded to the website, until
+    we add this overview to the doxygen-generated documentation itself.
+	* sigc++/functors/slot_base.h:
+	* sigc++/visit_each.h: Rename the functors doxygen group to sigcfunctors,
+    because doxygen seems to confuse it with the one in libstdc++.
+	* docs/index.html: Update the links.
+
 2010-04-16  Murray Cumming  <murrayc murrayc com>
 
     Website: Fix the Makefile so upload works with sourceforge again.
diff --git a/docs/index.html b/docs/index.html
index b118d3f..9bdd490 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,7 +3,7 @@
 <head>
   <title>libsigc Documentation</title>
   <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-  <link href="reference/html/doxygen.css" rel="stylesheet"
+  <link href="http://library.gnome.org/devel/libsigc++/stable/doxygen.css"; rel="stylesheet"
  type="text/css">
   <style type="text/css">
    body {
@@ -14,7 +14,7 @@
 </head>
 <body bgcolor="#f0f0f0">
 <div align="center"> <a class="qindex" href="index.html">Main Page</a>
-&nbsp; <a class="qindex" href="reference/html/namespaces.html">Namespaces</a>
+&nbsp; <a class="qindex" href="http://library.gnome.org/devel/libsigc++/stable/namespaces.html";>Namespaces</a>
 &nbsp;
 <hr>
 <h1>libsigc++ 2 documentation</h1>
@@ -37,31 +37,31 @@
           <tr>
             <td valign="top" width="33%">
             <ul>
-              <li><a href="reference/html/group__signal.html">Signals</a></li>
-              <li><a href="reference/html/group__slot.html">Slots</a></li>
-              <li><a href="reference/html/group__functors.html">Functors</a></li>
-              <li><a href="reference/html/group__adaptors.html">Adaptors</a></li>
-              <li><a href="reference/html/group__lambdas.html">Lambdas</a></li>
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/group__signal.html";>Signals</a></li>
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/group__slot.html";>Slots</a></li>
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/group__sigcfunctors.html";>Functors</a></li>
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/group__adaptors.html";>Adaptors</a></li>
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/group__lambdas.html";>Lambdas</a></li>
             </ul>
             </td>
             <td valign="top" width="33%">
             <ul>
-              <li><a href="reference/html/namespacesigc.html">sigc</a></li>
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/namespacesigc.html";>sigc</a></li>
               <li><a
- href="reference/html/namespacesigc_1_1internal.html">sigc::internal</a></li>
-              <li><a href="reference/html/namespacesigc_1_1functor.html">sigc::functor</a></li>
+ href="http://library.gnome.org/devel/libsigc++/stable/namespacesigc_1_1internal.html";>sigc::internal</a></li>
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/namespacesigc_1_1functor.html";>sigc::functor</a></li>
               <li><a
- href="reference/html/namespacesigc_1_1functor_1_1internal.html">sigc::functor::internal</a></li>
+ href="http://library.gnome.org/devel/libsigc++/stable/namespacesigc_1_1functor_1_1internal.html";>sigc::functor::internal</a></li>
             </ul>
             </td>
             <td valign="top" width="33%">
             <ul>
-              <li><a href="reference/html/hierarchy.html">Inheritance
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/hierarchy.html";>Inheritance
 Hierarchy</a></li>
-              <li><a href="reference/html/inherits.html">Class Chart
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/inherits.html";>Class Chart
 (image)</a></li>
-              <li><a href="reference/html/classes.html">All Classes</a></li>
-              <li><a href="reference/html/functions.html">All methods
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/classes.html";>All Classes</a></li>
+              <li><a href="http://library.gnome.org/devel/libsigc++/stable/functions.html";>All methods
 (long)</a></li>
             </ul>
             </td>
diff --git a/docs/website/doc.shtml b/docs/website/doc.shtml
index cada3ed..e7d5f44 100644
--- a/docs/website/doc.shtml
+++ b/docs/website/doc.shtml
@@ -5,14 +5,14 @@
 <a name="doc"><h3>Documentation</h3></a>
 
 <p>
-We have both <a href="libsigc2/docs/manual/html/index.html">tutorial-style</a> and <a href="http://library.gnome.org/devel/libsigc++/stable/";>reference</a> documentation.</p>
+We have both <a href="libsigc2/docs/manual/html/index.html">tutorial-style</a> and <a href="libsigc2/docs/index.html">reference</a> documentation.</p>
 
 
 <a name="glossary"><h3>Glossary of terms</h3></a>
 <p>
 For those which just want a quick look at the terms used in
 the system, glance over the <a href="glossary.shtml">glossary</a>
-<p> 
+<p>
 
 
 <!-- SSI fragments/footer.html_fragment begin -->
diff --git a/sigc++/functors/slot_base.h b/sigc++/functors/slot_base.h
index a91c75d..7081238 100644
--- a/sigc++/functors/slot_base.h
+++ b/sigc++/functors/slot_base.h
@@ -196,7 +196,7 @@ struct SIGC_API slot_do_unbind
  *
  * You can also pass slots as method parameters where you might normally pass a function pointer.
  *
- * @ingroup functors
+ * @ingroup sigcfunctors
  */
 
 /** Base type for slots.
diff --git a/sigc++/visit_each.h b/sigc++/visit_each.h
index cff27ba..71e4e9d 100644
--- a/sigc++/visit_each.h
+++ b/sigc++/visit_each.h
@@ -137,7 +137,7 @@ struct limit_derived_target<T_target*, T_action>
  *   }
  *   @endcode
  *
- * @ingroup functors
+ * @ingroup sigcfunctors
  */
 template <class T_action, class T_functor>
 void visit_each(const T_action& _A_action, const T_functor& _A_functor)
@@ -146,7 +146,7 @@ void visit_each(const T_action& _A_action, const T_functor& _A_functor)
 /** This function performs a functor on each of the targets
  * of a functor limited to a restricted type.
  *
- * @ingroup functors
+ * @ingroup sigcfunctors
  */
 template <class T_type, class T_action, class T_functor>
 void visit_each_type(const T_action& _A_action, const T_functor& _A_functor)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]