diff -r c7dd9d8c770a -r 62e7d237e1fb lemon/smart_graph.h
--- a/lemon/smart_graph.h	Mon Nov 14 18:36:45 2005 +0000
+++ b/lemon/smart_graph.h	Mon Nov 14 18:38:41 2005 +0000
@@ -30,8 +30,7 @@
 #include <lemon/bits/iterable_graph_extender.h>
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/bits/default_map.h>
-
-#include <lemon/bits/undir_graph_extender.h>
+#include <lemon/bits/graph_extender.h>
 
 #include <lemon/utility.h>
 
@@ -90,12 +89,12 @@
     
     /// Maximum node ID.
     ///\sa id(Node)
-    int maxId(Node) const { return nodes.size()-1; }
+    int maxNodeId() const { return nodes.size()-1; }
     /// Maximum edge ID.
     
     /// Maximum edge ID.
     ///\sa id(Edge)
-    int maxId(Edge) const { return edges.size()-1; }
+    int maxEdgeId() const { return edges.size()-1; }
 
     Node source(Edge e) const { return edges[e.n].source; }
     Node target(Edge e) const { return edges[e.n].target; }
@@ -103,8 +102,8 @@
     /// Node ID.
     
     /// The ID of a valid Node is a nonnegative integer not greater than
-    /// \ref maxId(Node). The range of the ID's is not surely continuous
-    /// and the greatest node ID can be actually less then \ref maxId(Node).
+    /// \ref maxNodeId(). The range of the ID's is not surely continuous
+    /// and the greatest node ID can be actually less then \ref maxNodeId().
     ///
     /// The ID of the \ref INVALID node is -1.
     ///\return The ID of the node \c v. 
@@ -112,16 +111,16 @@
     /// Edge ID.
     
     /// The ID of a valid Edge is a nonnegative integer not greater than
-    /// \ref maxId(Edge). The range of the ID's is not surely continuous
-    /// and the greatest edge ID can be actually less then \ref maxId(Edge).
+    /// \ref maxEdgeId(). The range of the ID's is not surely continuous
+    /// and the greatest edge ID can be actually less then \ref maxEdgeId().
     ///
     /// The ID of the \ref INVALID edge is -1.
     ///\return The ID of the edge \c e. 
     static int id(Edge e) { return e.n; }
 
-    static Node fromId(int id, Node) { return Node(id);}
+    static Node nodeFromId(int id) { return Node(id);}
 
-    static Edge fromId(int id, Edge) { return Edge(id);}
+    static Edge edgeFromId(int id) { return Edge(id);}
 
     Node addNode() {
       Node n; n.n=nodes.size();
@@ -151,10 +150,6 @@
 
     protected:
       int n;
-      ///\e
-
-      ///\todo It should be removed (or at least define a setToId() instead).
-      ///
       Node(int nn) {n=nn;}
     public:
       Node() {}
@@ -171,8 +166,6 @@
 
     protected:
       int n;
-      ///\todo It should be removed (or at least define a setToId() instead).
-      ///
       Edge(int nn) {n=nn;}
     public:
       Edge() { }
@@ -230,10 +223,10 @@
     ExtendableGraphExtender<
     MappableGraphExtender<
     IterableGraphExtender<
-    AlterableGraphExtender<SmartGraphBase> > > > > ExtendedSmartGraphBase;
+    AlterableGraphExtender<
+    GraphExtender<SmartGraphBase> > > > > > ExtendedSmartGraphBase;
 
-  /// \addtogroup graphs
-  /// @{
+  /// \ingroup graphs
 
   ///A smart graph class.