diff -r feb7974cf4ec -r 2025a571895e lemon/graph_reader.h
--- a/lemon/graph_reader.h	Tue Aug 28 13:58:54 2007 +0000
+++ b/lemon/graph_reader.h	Tue Aug 28 14:00:42 2007 +0000
@@ -324,7 +324,7 @@
     /// It reads an label from the stream and gives back which edge belongs to
     /// it. It is possible only if there was read a "label" named edge map.
     void readLabel(std::istream& is, Edge& edge) const {
-      return edgeset_reader.readLabel(is, edge);
+      edgeset_reader.readLabel(is, edge);
     } 
 
   private:
@@ -443,10 +443,10 @@
 		     const DefaultSkipper& _skipper = DefaultSkipper()) 
       : reader(new LemonReader(_is)), own_reader(true), skipper(_skipper),
 	nodeset_reader(*reader, _graph, std::string(), skipper),
-	u_edgeset_reader(*reader, _graph, nodeset_reader, 
+	uedgeset_reader(*reader, _graph, nodeset_reader, 
 			     std::string(), skipper),
 	node_reader(*reader, nodeset_reader, std::string()),
-	u_edge_reader(*reader, u_edgeset_reader, std::string()),
+	uedge_reader(*reader, uedgeset_reader, std::string()),
 	attribute_reader(*reader, std::string()) {}
 
     /// \brief Construct a new UGraphReader.
@@ -458,10 +458,10 @@
       : reader(new LemonReader(_filename)), own_reader(true), 
 	skipper(_skipper),
 	nodeset_reader(*reader, _graph, std::string(), skipper),
-	u_edgeset_reader(*reader, _graph, nodeset_reader, 
+	uedgeset_reader(*reader, _graph, nodeset_reader, 
 			     std::string(), skipper),
 	node_reader(*reader, nodeset_reader, std::string()),
-	u_edge_reader(*reader, u_edgeset_reader, std::string()),
+	uedge_reader(*reader, uedgeset_reader, std::string()),
 	attribute_reader(*reader, std::string()) {}
 
     /// \brief Construct a new UGraphReader.
@@ -472,10 +472,10 @@
 		     const DefaultSkipper& _skipper = DefaultSkipper()) 
       : reader(_reader), own_reader(false), skipper(_skipper),
 	nodeset_reader(*reader, _graph, std::string(), skipper),
-	u_edgeset_reader(*reader, _graph, nodeset_reader, 
+	uedgeset_reader(*reader, _graph, nodeset_reader, 
 			     std::string(), skipper),
 	node_reader(*reader, nodeset_reader, std::string()),
-	u_edge_reader(*reader, u_edgeset_reader, std::string()),
+	uedge_reader(*reader, uedgeset_reader, std::string()),
 	attribute_reader(*reader, std::string()) {}
 
     /// \brief Destruct the graph reader.
@@ -533,13 +533,13 @@
     /// Give a new undirected edge map reading command to the reader.
     template <typename Map>
     UGraphReader& readUEdgeMap(std::string name, Map& map) { 
-      u_edgeset_reader.readUEdgeMap(name, map);
+      uedgeset_reader.readUEdgeMap(name, map);
       return *this;
     }
 
     template <typename Map>
     UGraphReader& readUEdgeMap(std::string name, const Map& map) { 
-      u_edgeset_reader.readUEdgeMap(name, map);
+      uedgeset_reader.readUEdgeMap(name, map);
       return *this;
     }
 
@@ -550,14 +550,14 @@
     template <typename ItemReader, typename Map>
     UGraphReader& readUEdgeMap(std::string name, Map& map,
                                const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.readUEdgeMap(name, map, ir);
+      uedgeset_reader.readUEdgeMap(name, map, ir);
       return *this;
     }
 
     template <typename ItemReader, typename Map>
     UGraphReader& readUEdgeMap(std::string name, const Map& map,
                                const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.readUEdgeMap(name, map, ir);
+      uedgeset_reader.readUEdgeMap(name, map, ir);
       return *this;
     }
 
@@ -567,7 +567,7 @@
     template <typename ItemReader>
     UGraphReader& skipUEdgeMap(std::string name,
 				       const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.skipUMap(name, ir);
+      uedgeset_reader.skipUMap(name, ir);
       return *this;
     }
 
@@ -577,13 +577,13 @@
     /// Give a new edge map reading command to the reader.
     template <typename Map>
     UGraphReader& readEdgeMap(std::string name, Map& map) { 
-      u_edgeset_reader.readEdgeMap(name, map);
+      uedgeset_reader.readEdgeMap(name, map);
       return *this;
     }
 
     template <typename Map>
     UGraphReader& readEdgeMap(std::string name, const Map& map) { 
-      u_edgeset_reader.readEdgeMap(name, map);
+      uedgeset_reader.readEdgeMap(name, map);
       return *this;
     }
 
@@ -594,14 +594,14 @@
     template <typename ItemReader, typename Map>
     UGraphReader& readEdgeMap(std::string name, Map& map,
                               const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.readEdgeMap(name, map, ir);
+      uedgeset_reader.readEdgeMap(name, map, ir);
       return *this;
     }
 
     template <typename ItemReader, typename Map>
     UGraphReader& readEdgeMap(std::string name, const Map& map,
                               const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.readEdgeMap(name, map, ir);
+      uedgeset_reader.readEdgeMap(name, map, ir);
       return *this;
     }
 
@@ -611,7 +611,7 @@
     template <typename ItemReader>
     UGraphReader& skipEdgeMap(std::string name,
                               const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.skipEdgeMap(name, ir);
+      uedgeset_reader.skipEdgeMap(name, ir);
       return *this;
     }
 
@@ -627,7 +627,7 @@
     ///
     /// Give a new labeled edge reading command to the reader.
     UGraphReader& readEdge(std::string name, Edge& edge) {
-      u_edge_reader.readEdge(name, edge);
+      uedge_reader.readEdge(name, edge);
     }
 
     /// \brief Give a new labeled undirected edge reading command to the
@@ -635,7 +635,7 @@
     ///
     /// Give a new labeled undirected edge reading command to the reader.
     UGraphReader& readUEdge(std::string name, UEdge& edge) {
-      u_edge_reader.readUEdge(name, edge);
+      uedge_reader.readUEdge(name, edge);
     }
 
     /// \brief Give a new attribute reading command.
@@ -677,10 +677,10 @@
 
     /// \brief Returns true if the reader can give back the items by its label.
     ///
-    /// \brief Returns true if the reader can give back the items by its label.
+    /// Returns true if the reader can give back the items by its label.
     bool isLabelReader() const {
       return nodeset_reader.isLabelReader() && 
-        u_edgeset_reader.isLabelReader();
+        uedgeset_reader.isLabelReader();
     }
 
     /// \brief Gives back the node by its label.
@@ -696,7 +696,7 @@
     /// It reads an label from the stream and gives back which edge belongs to
     /// it. It is possible only if there was read a "label" named edge map.
     void readLabel(std::istream& is, Edge& edge) const {
-      return u_edgeset_reader.readLabel(is, edge);
+      return uedgeset_reader.readLabel(is, edge);
     } 
 
     /// \brief Gives back the undirected edge by its label.
@@ -705,7 +705,7 @@
     /// belongs to it. It is possible only if there was read a "label" named 
     /// edge map.
     void readLabel(std::istream& is, UEdge& uedge) const {
-      return u_edgeset_reader.readLabel(is, uedge);
+      return uedgeset_reader.readLabel(is, uedge);
     } 
     
 
@@ -717,10 +717,10 @@
     DefaultSkipper skipper;
 
     NodeSetReader<Graph, ReaderTraits> nodeset_reader;
-    UEdgeSetReader<Graph, ReaderTraits> u_edgeset_reader;
+    UEdgeSetReader<Graph, ReaderTraits> uedgeset_reader;
 
     NodeReader<Graph> node_reader;
-    UEdgeReader<Graph> u_edge_reader;
+    UEdgeReader<Graph> uedge_reader;
     
     AttributeReader<ReaderTraits> attribute_reader;
   };