1.1 --- a/src/lemon/kruskal.h	Sat Nov 13 12:53:28 2004 +0000
     1.2 +++ b/src/lemon/kruskal.h	Sat Nov 13 17:07:10 2004 +0000
     1.3 @@ -112,12 +112,12 @@
     1.4    class NonConstMapWr {
     1.5      const Map &m;
     1.6    public:
     1.7 -    typedef typename Map::ValueType ValueType;
     1.8 +    typedef typename Map::Value Value;
     1.9  
    1.10      NonConstMapWr(const Map &_m) : m(_m) {}
    1.11  
    1.12 -    template<class KeyType>
    1.13 -    void set(KeyType const& k, ValueType const &v) const { m.set(k,v); }
    1.14 +    template<class Key>
    1.15 +    void set(Key const& k, Value const &v) const { m.set(k,v); }
    1.16    };
    1.17  
    1.18    template <class GR, class IN, class OUT>
    1.19 @@ -150,11 +150,11 @@
    1.20    template<class GR, class Map>
    1.21    class KruskalMapInput
    1.22      : public std::vector< std::pair<typename GR::Edge,
    1.23 -				    typename Map::ValueType> > {
    1.24 +				    typename Map::Value> > {
    1.25      
    1.26    public:
    1.27      typedef std::vector< std::pair<typename GR::Edge,
    1.28 -				   typename Map::ValueType> > Parent;
    1.29 +				   typename Map::Value> > Parent;
    1.30      typedef typename Parent::value_type value_type;
    1.31  
    1.32    private:
    1.33 @@ -235,19 +235,19 @@
    1.34    /// map and the output is a sequence of the tree edges, a special
    1.35    /// wrapper function exists: \ref kruskalEdgeMap_IteratorOut().
    1.36    ///
    1.37 -  /// \warning Not a regular property map, as it doesn't know its KeyType
    1.38 +  /// \warning Not a regular property map, as it doesn't know its Key
    1.39  
    1.40    template<class Iterator>
    1.41    class KruskalSequenceOutput {
    1.42      mutable Iterator it;
    1.43  
    1.44    public:
    1.45 -    typedef bool ValueType;
    1.46 +    typedef bool Value;
    1.47  
    1.48      KruskalSequenceOutput(Iterator const &_it) : it(_it) {}
    1.49  
    1.50 -    template<typename KeyType>
    1.51 -    void set(KeyType const& k, bool v) const { if(v) {*it=k; ++it;} }
    1.52 +    template<typename Key>
    1.53 +    void set(Key const& k, bool v) const { if(v) {*it=k; ++it;} }
    1.54    };
    1.55  
    1.56    template<class Iterator>
    1.57 @@ -287,7 +287,7 @@
    1.58  
    1.59    template <class GR, class IN, class RET>
    1.60    inline
    1.61 -  typename IN::ValueType
    1.62 +  typename IN::Value
    1.63    kruskalEdgeMap(GR const& G,
    1.64  		 IN const& in,
    1.65  		 RET &out) {
    1.66 @@ -332,7 +332,7 @@
    1.67  
    1.68    template <class GR, class IN, class RET>
    1.69    inline
    1.70 -  typename IN::ValueType
    1.71 +  typename IN::Value
    1.72    kruskalEdgeMap_IteratorOut(const GR& G,
    1.73  			     const IN& in,
    1.74  			     RET out)