aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-16 10:02:41 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-16 10:02:41 +0000
commit2f7bde898437a912f36b42b94124d95ca03ee407 (patch)
treeb16ee2168c662d15c85ff02f2acbc85f8905efbe
parent95086f46d8f5b76f5ea14511e5bede3c27d57b3e (diff)
downloadpaludis-2f7bde898437a912f36b42b94124d95ca03ee407.tar.gz
paludis-2f7bde898437a912f36b42b94124d95ca03ee407.tar.xz
MetadataSetKey -> MetadataCollectionKey. Fixes: ticket:437
-rw-r--r--doc/api/cplusplus/examples/example_metadata_key.cc12
-rw-r--r--paludis/literal_metadata_key.cc4
-rw-r--r--paludis/literal_metadata_key.hh4
-rw-r--r--paludis/mask.hh2
-rw-r--r--paludis/metadata_key-fwd.hh4
-rw-r--r--paludis/metadata_key.cc16
-rw-r--r--paludis/metadata_key.hh30
-rw-r--r--paludis/override_functions.cc4
-rw-r--r--paludis/package_id.hh6
-rw-r--r--paludis/repositories/cran/cran_package_id.cc10
-rw-r--r--paludis/repositories/cran/cran_package_id.hh6
-rw-r--r--paludis/repositories/cran/keys.cc2
-rw-r--r--paludis/repositories/cran/keys.hh2
-rw-r--r--paludis/repositories/e/e_key.cc8
-rw-r--r--paludis/repositories/e/e_key.hh8
-rw-r--r--paludis/repositories/e/e_repository.cc4
-rw-r--r--paludis/repositories/e/ebuild_id.cc10
-rw-r--r--paludis/repositories/e/ebuild_id.hh8
-rw-r--r--paludis/repositories/e/qa/spec_keys.cc12
-rw-r--r--paludis/repositories/e/vdb_id.cc20
-rw-r--r--paludis/repositories/e/vdb_id.hh10
-rw-r--r--paludis/repositories/fake/fake_package_id.cc30
-rw-r--r--paludis/repositories/fake/fake_package_id.hh22
-rw-r--r--paludis/repositories/gems/gem_specification.cc12
-rw-r--r--paludis/repositories/gems/gem_specification.hh6
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc12
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc12
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh6
-rw-r--r--paludis/repositories/virtuals/package_id.cc12
-rw-r--r--paludis/repositories/virtuals/package_id.hh6
-rw-r--r--python/additional_tests.cc4
-rw-r--r--python/metadata_key.cc86
-rw-r--r--ruby/metadata_key.cc48
-rw-r--r--ruby/package_id.cc12
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc12
-rw-r--r--src/clients/inquisitio/key_extractor.cc12
-rw-r--r--src/clients/instruo/instruo.cc12
-rw-r--r--src/clients/paludis/applets.cc12
-rw-r--r--src/clients/paludis/info.cc12
-rw-r--r--src/clients/qualudis/qualudis.cc12
-rw-r--r--src/output/console_query_task.cc12
-rw-r--r--src/output/mask_displayer.cc12
43 files changed, 276 insertions, 276 deletions
diff --git a/doc/api/cplusplus/examples/example_metadata_key.cc b/doc/api/cplusplus/examples/example_metadata_key.cc
index 2d0b672..3a037d7 100644
--- a/doc/api/cplusplus/examples/example_metadata_key.cc
+++ b/doc/api/cplusplus/examples/example_metadata_key.cc
@@ -152,37 +152,37 @@ namespace
cout << indent << left << setw(30) << " Initial label:" << " " << key.initial_label()->text() << endl;
}
- void visit(const MetadataSetKey<IUseFlagSet> & key)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & key)
{
cout << indent << left << setw(30) << " Class:" << " " << "MetadataSpecTreeKey<IUseFlagSet>" << endl;
cout << indent << left << setw(30) << " Value:" << " " << key.pretty_print_flat(formatter) << endl;
}
- void visit(const MetadataSetKey<KeywordNameSet> & key)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & key)
{
cout << indent << left << setw(30) << " Class:" << " " << "MetadataSpecTreeKey<KeywordNameSet>" << endl;
cout << indent << left << setw(30) << " Value:" << " " << key.pretty_print_flat(formatter) << endl;
}
- void visit(const MetadataSetKey<UseFlagNameSet> & key)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & key)
{
cout << indent << left << setw(30) << " Class:" << " " << "MetadataSpecTreeKey<UseFlagNameSet>" << endl;
cout << indent << left << setw(30) << " Value:" << " " << key.pretty_print_flat(formatter) << endl;
}
- void visit(const MetadataSetKey<Set<std::string> > & key)
+ void visit(const MetadataCollectionKey<Set<std::string> > & key)
{
cout << indent << left << setw(30) << " Class:" << " " << "MetadataSpecTreeKey<Set<std::string> >" << endl;
cout << indent << left << setw(30) << " Value:" << " " << join(key.value()->begin(), key.value()->end(), " ") << endl;
}
- void visit(const MetadataSetKey<FSEntrySequence> & key)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & key)
{
cout << indent << left << setw(30) << " Class:" << " " << "MetadataSpecTreeKey<FSEntrySequence>" << endl;
cout << indent << left << setw(30) << " Value:" << " " << join(key.value()->begin(), key.value()->end(), " ") << endl;
}
- void visit(const MetadataSetKey<PackageIDSequence> & key)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & key)
{
cout << indent << left << setw(30) << " Class:" << " " << "MetadataSpecTreeKey<PackageIDSequence>" << endl;
/* Slight trickery: a PackageIDSequence stores shared pointers
diff --git a/paludis/literal_metadata_key.cc b/paludis/literal_metadata_key.cc
index a272ea0..2ac2226 100644
--- a/paludis/literal_metadata_key.cc
+++ b/paludis/literal_metadata_key.cc
@@ -143,7 +143,7 @@ LiteralMetadataPackageIDKey::value() const
LiteralMetadataFSEntrySequenceKey::LiteralMetadataFSEntrySequenceKey(const std::string & h, const std::string & r,
const MetadataKeyType t, const tr1::shared_ptr<const FSEntrySequence> & v) :
- MetadataSetKey<FSEntrySequence>(h, r, t),
+ MetadataCollectionKey<FSEntrySequence>(h, r, t),
PrivateImplementationPattern<LiteralMetadataFSEntrySequenceKey>(new Implementation<LiteralMetadataFSEntrySequenceKey>(v)),
_imp(PrivateImplementationPattern<LiteralMetadataFSEntrySequenceKey>::_imp)
{
@@ -176,7 +176,7 @@ LiteralMetadataFSEntrySequenceKey::pretty_print_flat(const Formatter<FSEntry> &
LiteralMetadataStringSetKey::LiteralMetadataStringSetKey(const std::string & h, const std::string & r,
const MetadataKeyType t, const tr1::shared_ptr<const Set<std::string> > & v) :
- MetadataSetKey<Set<std::string> >(h, r, t),
+ MetadataCollectionKey<Set<std::string> >(h, r, t),
PrivateImplementationPattern<LiteralMetadataStringSetKey>(new Implementation<LiteralMetadataStringSetKey>(v)),
_imp(PrivateImplementationPattern<LiteralMetadataStringSetKey>::_imp)
{
diff --git a/paludis/literal_metadata_key.hh b/paludis/literal_metadata_key.hh
index 14b46eb..ddaef15 100644
--- a/paludis/literal_metadata_key.hh
+++ b/paludis/literal_metadata_key.hh
@@ -74,7 +74,7 @@ namespace paludis
};
class PALUDIS_VISIBLE LiteralMetadataFSEntrySequenceKey :
- public MetadataSetKey<FSEntrySequence>,
+ public MetadataCollectionKey<FSEntrySequence>,
private PrivateImplementationPattern<LiteralMetadataFSEntrySequenceKey>
{
private:
@@ -92,7 +92,7 @@ namespace paludis
};
class PALUDIS_VISIBLE LiteralMetadataStringSetKey :
- public MetadataSetKey<Set<std::string> >,
+ public MetadataCollectionKey<Set<std::string> >,
private PrivateImplementationPattern<LiteralMetadataStringSetKey>
{
private:
diff --git a/paludis/mask.hh b/paludis/mask.hh
index f0985cf..143b95b 100644
--- a/paludis/mask.hh
+++ b/paludis/mask.hh
@@ -119,7 +119,7 @@ namespace paludis
/**
* An UnacceptedMask is a Mask that signifies that a particular value or
- * combination of values in (for example) a MetadataSetKey or
+ * combination of values in (for example) a MetadataCollectionKey or
* MetadataSpecTreeKey is not accepted by user configuration.
*
* \ingroup g_mask
diff --git a/paludis/metadata_key-fwd.hh b/paludis/metadata_key-fwd.hh
index 2beca7c..659096a 100644
--- a/paludis/metadata_key-fwd.hh
+++ b/paludis/metadata_key-fwd.hh
@@ -42,8 +42,8 @@ namespace paludis
class MetadataRepositoryMaskInfoKey;
class MetadataFSEntryKey;
class MetadataSectionKey;
- template <typename C_> class MetadataSetKey;
- template <> class MetadataSetKey<IUseFlagSet>;
+ template <typename C_> class MetadataCollectionKey;
+ template <> class MetadataCollectionKey<IUseFlagSet>;
template <typename C_> class MetadataSpecTreeKey;
#include <paludis/metadata_key-se.hh>
diff --git a/paludis/metadata_key.cc b/paludis/metadata_key.cc
index 4420222..e4c2edf 100644
--- a/paludis/metadata_key.cc
+++ b/paludis/metadata_key.cc
@@ -165,12 +165,12 @@ MetadataSectionKey::find_metadata(const std::string & s) const
}
template <typename C_>
-MetadataSetKey<C_>::MetadataSetKey(const std::string & r, const std::string & h, const MetadataKeyType t) :
+MetadataCollectionKey<C_>::MetadataCollectionKey(const std::string & r, const std::string & h, const MetadataKeyType t) :
MetadataKey(r, h, t)
{
}
-MetadataSetKey<IUseFlagSet>::MetadataSetKey(const std::string & r, const std::string & h, const MetadataKeyType t) :
+MetadataCollectionKey<IUseFlagSet>::MetadataCollectionKey(const std::string & r, const std::string & h, const MetadataKeyType t) :
MetadataKey(r, h, t)
{
}
@@ -186,12 +186,12 @@ MetadataSpecTreeKey<FetchableURISpecTree>::MetadataSpecTreeKey(const std::string
{
}
-template class MetadataSetKey<KeywordNameSet>;
-template class MetadataSetKey<IUseFlagSet>;
-template class MetadataSetKey<Set<std::string> >;
-template class MetadataSetKey<UseFlagNameSet>;
-template class MetadataSetKey<PackageIDSequence>;
-template class MetadataSetKey<FSEntrySequence>;
+template class MetadataCollectionKey<KeywordNameSet>;
+template class MetadataCollectionKey<IUseFlagSet>;
+template class MetadataCollectionKey<Set<std::string> >;
+template class MetadataCollectionKey<UseFlagNameSet>;
+template class MetadataCollectionKey<PackageIDSequence>;
+template class MetadataCollectionKey<FSEntrySequence>;
template class MetadataSpecTreeKey<LicenseSpecTree>;
template class MetadataSpecTreeKey<ProvideSpecTree>;
diff --git a/paludis/metadata_key.hh b/paludis/metadata_key.hh
index 549885a..4495e31 100644
--- a/paludis/metadata_key.hh
+++ b/paludis/metadata_key.hh
@@ -62,12 +62,12 @@ namespace paludis
MetadataKeyVisitorTypes,
MetadataKey,
MetadataPackageIDKey,
- MetadataSetKey<UseFlagNameSet>,
- MetadataSetKey<IUseFlagSet>,
- MetadataSetKey<KeywordNameSet>,
- MetadataSetKey<Set<std::string> >,
- MetadataSetKey<PackageIDSequence>,
- MetadataSetKey<FSEntrySequence>,
+ MetadataCollectionKey<UseFlagNameSet>,
+ MetadataCollectionKey<IUseFlagSet>,
+ MetadataCollectionKey<KeywordNameSet>,
+ MetadataCollectionKey<Set<std::string> >,
+ MetadataCollectionKey<PackageIDSequence>,
+ MetadataCollectionKey<FSEntrySequence>,
MetadataSpecTreeKey<DependencySpecTree>,
MetadataSpecTreeKey<LicenseSpecTree>,
MetadataSpecTreeKey<FetchableURISpecTree>,
@@ -367,7 +367,7 @@ namespace paludis
};
/**
- * A MetadataSetKey is a MetadataKey that holds a Set of some kind of item
+ * A MetadataCollectionKey is a MetadataKey that holds a Set of some kind of item
* as its value.
*
* \ingroup g_metadata_key
@@ -375,15 +375,15 @@ namespace paludis
* \nosubgrouping
*/
template <typename C_>
- class PALUDIS_VISIBLE MetadataSetKey :
+ class PALUDIS_VISIBLE MetadataCollectionKey :
public MetadataKey,
- public ConstAcceptInterfaceVisitsThis<MetadataKeyVisitorTypes, MetadataSetKey<C_> >
+ public ConstAcceptInterfaceVisitsThis<MetadataKeyVisitorTypes, MetadataCollectionKey<C_> >
{
protected:
///\name Basic operations
///\{
- MetadataSetKey(const std::string &, const std::string &, const MetadataKeyType);
+ MetadataCollectionKey(const std::string &, const std::string &, const MetadataKeyType);
///\}
@@ -404,10 +404,10 @@ namespace paludis
};
/**
- * A MetadataSetKey<IUseFlagSet> is a MetadataKey that holds an IUseFlagSet
+ * A MetadataCollectionKey<IUseFlagSet> is a MetadataKey that holds an IUseFlagSet
* as its value.
*
- * This specialisation of MetadataSetKey provides an additional
+ * This specialisation of MetadataCollectionKey provides an additional
* pretty_print_flat_with_comparison method.
*
* \ingroup g_metadata_key
@@ -415,15 +415,15 @@ namespace paludis
* \nosubgrouping
*/
template <>
- class PALUDIS_VISIBLE MetadataSetKey<IUseFlagSet> :
+ class PALUDIS_VISIBLE MetadataCollectionKey<IUseFlagSet> :
public MetadataKey,
- public ConstAcceptInterfaceVisitsThis<MetadataKeyVisitorTypes, MetadataSetKey<IUseFlagSet> >
+ public ConstAcceptInterfaceVisitsThis<MetadataKeyVisitorTypes, MetadataCollectionKey<IUseFlagSet> >
{
protected:
///\name Basic operations
///\{
- MetadataSetKey(const std::string &, const std::string &, const MetadataKeyType);
+ MetadataCollectionKey(const std::string &, const std::string &, const MetadataKeyType);
///\}
diff --git a/paludis/override_functions.cc b/paludis/override_functions.cc
index db8aeb2..7c78b83 100644
--- a/paludis/override_functions.cc
+++ b/paludis/override_functions.cc
@@ -39,7 +39,7 @@ paludis::override_tilde_keywords(const Environment * const e, const PackageID &
if (! mm)
return false;
- const MetadataSetKey<KeywordNameSet> * const k(visitor_cast<const MetadataSetKey<KeywordNameSet> >(*mm->unaccepted_key()));
+ const MetadataCollectionKey<KeywordNameSet> * const k(visitor_cast<const MetadataCollectionKey<KeywordNameSet> >(*mm->unaccepted_key()));
if (! k)
return false;
@@ -64,7 +64,7 @@ paludis::override_unkeyworded(const Environment * const e, const PackageID & id,
if (! mm)
return false;
- const MetadataSetKey<KeywordNameSet> * const k(visitor_cast<const MetadataSetKey<KeywordNameSet> >(*mm->unaccepted_key()));
+ const MetadataCollectionKey<KeywordNameSet> * const k(visitor_cast<const MetadataCollectionKey<KeywordNameSet> >(*mm->unaccepted_key()));
if (! k)
return false;
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index dd520ec..42c409d 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -174,14 +174,14 @@ namespace paludis
* The keywords_key, if non-zero, is used by FindUnusedPackagesTask
* to determine whether a package is unused.
*/
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const = 0;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const = 0;
/**
* The iuse_key, if non-zero, is used when displaying single-line
* install-pretend output, and when resolving where DepList's
* DepListReinstallOption is dl_reinstall_if_use_changed.
*/
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const = 0;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const = 0;
/**
* The provide_key, if non-zero, indicates that a package provides
@@ -192,7 +192,7 @@ namespace paludis
/**
* The contains_key, if non-zero, indicates that a package contains
* other packages. This affects dependency resolution. */
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const = 0;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const = 0;
/**
* The contained_in_key, if non-zero, indicates that a package is
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index b6fe77f..6443a4c 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -319,16 +319,16 @@ CRANPackageID::virtual_for_key() const
return tr1::shared_ptr<const MetadataPackageIDKey>();
}
-const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
CRANPackageID::keywords_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
CRANPackageID::iuse_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >();
}
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
@@ -510,7 +510,7 @@ CRANPackageID::perform_action(Action & a) const
throw UnsupportedActionError(*this, a);
}
-const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
+const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
CRANPackageID::contains_key() const
{
return _imp->contains_key;
diff --git a/paludis/repositories/cran/cran_package_id.hh b/paludis/repositories/cran/cran_package_id.hh
index 3738f72..422cc55 100644
--- a/paludis/repositories/cran/cran_package_id.hh
+++ b/paludis/repositories/cran/cran_package_id.hh
@@ -58,8 +58,8 @@ namespace paludis
virtual const tr1::shared_ptr<const Repository> repository() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
@@ -73,7 +73,7 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> source_origin_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> binary_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataFSEntryKey> fs_location_key() const;
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index b5c5f28..e49fadd 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.cc
@@ -61,7 +61,7 @@ SimpleURIKey::pretty_print_flat(const SimpleURISpecTree::ItemFormatter & f) cons
PackageIDSequenceKey::PackageIDSequenceKey(const Environment * const e,
const std::string & r, const std::string & h, const MetadataKeyType t) :
- MetadataSetKey<PackageIDSequence>(r, h, t),
+ MetadataCollectionKey<PackageIDSequence>(r, h, t),
_env(e),
_v(new PackageIDSequence)
{
diff --git a/paludis/repositories/cran/keys.hh b/paludis/repositories/cran/keys.hh
index 2dbda3a..bc23d14 100644
--- a/paludis/repositories/cran/keys.hh
+++ b/paludis/repositories/cran/keys.hh
@@ -51,7 +51,7 @@ namespace paludis
};
class PackageIDSequenceKey :
- public MetadataSetKey<PackageIDSequence>
+ public MetadataCollectionKey<PackageIDSequence>
{
private:
const Environment * const _env;
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 9d1a72e..3c86dcc 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -532,7 +532,7 @@ EIUseKey::EIUseKey(
const Environment * const e,
const tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- MetadataSetKey<IUseFlagSet>(r, h, t),
+ MetadataCollectionKey<IUseFlagSet>(r, h, t),
PrivateImplementationPattern<EIUseKey>(new Implementation<EIUseKey>(id, e, v)),
_imp(PrivateImplementationPattern<EIUseKey>::_imp)
{
@@ -761,7 +761,7 @@ namespace paludis
EKeywordsKey::EKeywordsKey(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- MetadataSetKey<KeywordNameSet>(r, h, t),
+ MetadataCollectionKey<KeywordNameSet>(r, h, t),
PrivateImplementationPattern<EKeywordsKey>(new Implementation<EKeywordsKey>(id, e, v)),
_imp(PrivateImplementationPattern<EKeywordsKey>::_imp)
{
@@ -834,7 +834,7 @@ namespace paludis
EUseKey::EUseKey(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- MetadataSetKey<UseFlagNameSet>(r, h, t),
+ MetadataCollectionKey<UseFlagNameSet>(r, h, t),
PrivateImplementationPattern<EUseKey>(new Implementation<EUseKey>(id, e, v)),
_imp(PrivateImplementationPattern<EUseKey>::_imp)
{
@@ -906,7 +906,7 @@ namespace paludis
EInheritedKey::EInheritedKey(const tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- MetadataSetKey<Set<std::string> >(r, h, t),
+ MetadataCollectionKey<Set<std::string> >(r, h, t),
PrivateImplementationPattern<EInheritedKey>(new Implementation<EInheritedKey>(id, v)),
_imp(PrivateImplementationPattern<EInheritedKey>::_imp)
{
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index 05c774a..b6af486 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -191,7 +191,7 @@ namespace paludis
};
class EIUseKey :
- public MetadataSetKey<IUseFlagSet>,
+ public MetadataCollectionKey<IUseFlagSet>,
private PrivateImplementationPattern<EIUseKey>
{
private:
@@ -219,7 +219,7 @@ namespace paludis
};
class EKeywordsKey :
- public MetadataSetKey<KeywordNameSet>,
+ public MetadataCollectionKey<KeywordNameSet>,
private PrivateImplementationPattern<EKeywordsKey>
{
private:
@@ -240,7 +240,7 @@ namespace paludis
};
class EUseKey :
- public MetadataSetKey<UseFlagNameSet>,
+ public MetadataCollectionKey<UseFlagNameSet>,
private PrivateImplementationPattern<EUseKey>
{
private:
@@ -261,7 +261,7 @@ namespace paludis
};
class EInheritedKey :
- public MetadataSetKey<Set<std::string> >,
+ public MetadataCollectionKey<Set<std::string> >,
private PrivateImplementationPattern<EInheritedKey>
{
private:
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 90e3611..b220f54 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -235,14 +235,14 @@ namespace paludis
tr1::shared_ptr<const MetadataStringKey> format_key;
tr1::shared_ptr<const MetadataStringKey> layout_key;
tr1::shared_ptr<const MetadataFSEntryKey> location_key;
- tr1::shared_ptr<const MetadataSetKey<FSEntrySequence> > profiles_key;
+ tr1::shared_ptr<const MetadataCollectionKey<FSEntrySequence> > profiles_key;
tr1::shared_ptr<const MetadataFSEntryKey> cache_key;
tr1::shared_ptr<const MetadataFSEntryKey> write_cache_key;
tr1::shared_ptr<const MetadataStringKey> append_repository_name_to_write_cache_key;
tr1::shared_ptr<const MetadataStringKey> ignore_deprecated_profiles;
tr1::shared_ptr<const MetadataFSEntryKey> names_cache_key;
tr1::shared_ptr<const MetadataFSEntryKey> distdir_key;
- tr1::shared_ptr<const MetadataSetKey<FSEntrySequence> > eclassdirs_key;
+ tr1::shared_ptr<const MetadataCollectionKey<FSEntrySequence> > eclassdirs_key;
tr1::shared_ptr<const MetadataFSEntryKey> securitydir_key;
tr1::shared_ptr<const MetadataFSEntryKey> setsdir_key;
tr1::shared_ptr<const MetadataFSEntryKey> newsdir_key;
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 94737aa..eb72977 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -469,14 +469,14 @@ EbuildID::virtual_for_key() const
return tr1::shared_ptr<const MetadataPackageIDKey>();
}
-const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
EbuildID::keywords_key() const
{
need_keys_added();
return _imp->keywords;
}
-const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
EbuildID::iuse_key() const
{
need_keys_added();
@@ -582,7 +582,7 @@ EbuildID::binary_origin_key() const
return tr1::shared_ptr<const MetadataStringKey>();
}
-const tr1::shared_ptr<const MetadataSetKey<Set<std::string> > >
+const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EbuildID::inherited_key() const
{
return _imp->inherited;
@@ -861,10 +861,10 @@ EbuildID::perform_action(Action & a) const
a.accept(b);
}
-const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
+const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
EbuildID::contains_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
const tr1::shared_ptr<const MetadataPackageIDKey>
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index 29dc6ca..980b25b 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -64,8 +64,8 @@ namespace paludis
virtual const tr1::shared_ptr<const Repository> repository() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
@@ -79,11 +79,11 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> source_origin_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> binary_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataFSEntryKey> fs_location_key() const;
- const tr1::shared_ptr<const MetadataSetKey<Set<std::string> > > inherited_key() const;
+ const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
diff --git a/paludis/repositories/e/qa/spec_keys.cc b/paludis/repositories/e/qa/spec_keys.cc
index c839143..970b3f7 100644
--- a/paludis/repositories/e/qa/spec_keys.cc
+++ b/paludis/repositories/e/qa/spec_keys.cc
@@ -282,27 +282,27 @@ namespace
{
}
- void visit(const MetadataSetKey<IUseFlagSet> &)
+ void visit(const MetadataCollectionKey<IUseFlagSet> &)
{
}
- void visit(const MetadataSetKey<KeywordNameSet> &)
+ void visit(const MetadataCollectionKey<KeywordNameSet> &)
{
}
- void visit(const MetadataSetKey<Set<std::string> > &)
+ void visit(const MetadataCollectionKey<Set<std::string> > &)
{
}
- void visit(const MetadataSetKey<FSEntrySequence> &)
+ void visit(const MetadataCollectionKey<FSEntrySequence> &)
{
}
- void visit(const MetadataSetKey<UseFlagNameSet> &)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> &)
{
}
- void visit(const MetadataSetKey<PackageIDSequence> &)
+ void visit(const MetadataCollectionKey<PackageIDSequence> &)
{
}
diff --git a/paludis/repositories/e/vdb_id.cc b/paludis/repositories/e/vdb_id.cc
index 24e86d4..b7bc794 100644
--- a/paludis/repositories/e/vdb_id.cc
+++ b/paludis/repositories/e/vdb_id.cc
@@ -74,9 +74,9 @@ namespace paludis
tr1::shared_ptr<const EAPI> eapi;
tr1::shared_ptr<const MetadataFSEntryKey> fs_location;
- tr1::shared_ptr<const MetadataSetKey<UseFlagNameSet> > use;
- tr1::shared_ptr<const MetadataSetKey<Set<std::string> > > inherited;
- tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse;
+ tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use;
+ tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited;
+ tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse;
tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license;
tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide;
tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies;
@@ -442,27 +442,27 @@ VDBID::virtual_for_key() const
return tr1::shared_ptr<const MetadataPackageIDKey>();
}
-const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
VDBID::keywords_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataSetKey<UseFlagNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> >
VDBID::use_key() const
{
need_keys_added();
return _imp->use;
}
-const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
VDBID::iuse_key() const
{
need_keys_added();
return _imp->iuse;
}
-const tr1::shared_ptr<const MetadataSetKey<Set<std::string> > >
+const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
VDBID::inherited_key() const
{
need_keys_added();
@@ -707,10 +707,10 @@ VDBID::perform_action(Action & a) const
a.accept(b);
}
-const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
+const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
VDBID::contains_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
const tr1::shared_ptr<const MetadataPackageIDKey>
diff --git a/paludis/repositories/e/vdb_id.hh b/paludis/repositories/e/vdb_id.hh
index c61a5e3..621ffe5 100644
--- a/paludis/repositories/e/vdb_id.hh
+++ b/paludis/repositories/e/vdb_id.hh
@@ -59,8 +59,8 @@ namespace paludis
virtual const tr1::shared_ptr<const EAPI> eapi() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
@@ -75,12 +75,12 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> source_origin_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> binary_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataFSEntryKey> fs_location_key() const;
- const tr1::shared_ptr<const MetadataSetKey<UseFlagNameSet> > use_key() const;
- const tr1::shared_ptr<const MetadataSetKey<Set<std::string> > > inherited_key() const;
+ const tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const;
+ const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const;
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index ea502f1..48de5c5 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -48,7 +48,7 @@ namespace paludis
{
template <>
template <typename C_>
- struct Implementation<FakeMetadataSetKey<C_> >
+ struct Implementation<FakeMetadataCollectionKey<C_> >
{
tr1::shared_ptr<C_> collection;
const PackageID * const id;
@@ -63,23 +63,23 @@ namespace paludis
}
template <typename C_>
-FakeMetadataSetKey<C_>::FakeMetadataSetKey(
+FakeMetadataCollectionKey<C_>::FakeMetadataCollectionKey(
const std::string & r, const std::string & h, const MetadataKeyType t, const PackageID * const i,
const Environment * const e) :
- MetadataSetKey<C_>(r, h, t),
- PrivateImplementationPattern<FakeMetadataSetKey<C_> >(new Implementation<FakeMetadataSetKey<C_> >(i, e)),
- _imp(PrivateImplementationPattern<FakeMetadataSetKey<C_> >::_imp)
+ MetadataCollectionKey<C_>(r, h, t),
+ PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >(new Implementation<FakeMetadataCollectionKey<C_> >(i, e)),
+ _imp(PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >::_imp)
{
}
template <typename C_>
-FakeMetadataSetKey<C_>::~FakeMetadataSetKey()
+FakeMetadataCollectionKey<C_>::~FakeMetadataCollectionKey()
{
}
template <typename C_>
const tr1::shared_ptr<const C_>
-FakeMetadataSetKey<C_>::value() const
+FakeMetadataCollectionKey<C_>::value() const
{
return _imp->collection;
}
@@ -87,7 +87,7 @@ FakeMetadataSetKey<C_>::value() const
FakeMetadataKeywordSetKey::FakeMetadataKeywordSetKey(const std::string & r,
const std::string & h, const std::string & v, const MetadataKeyType t,
const PackageID * const i, const Environment * const e) :
- FakeMetadataSetKey<KeywordNameSet>(r, h, t, i, e)
+ FakeMetadataCollectionKey<KeywordNameSet>(r, h, t, i, e)
{
set_from_string(v);
}
@@ -102,7 +102,7 @@ FakeMetadataKeywordSetKey::set_from_string(const std::string & s)
FakeMetadataIUseSetKey::FakeMetadataIUseSetKey(const std::string & r,
const std::string & h, const std::string & v, const IUseFlagParseMode m, const MetadataKeyType t,
const PackageID * const i, const Environment * const e) :
- FakeMetadataSetKey<IUseFlagSet>(r, h, t, i, e)
+ FakeMetadataCollectionKey<IUseFlagSet>(r, h, t, i, e)
{
set_from_string(v, m);
}
@@ -421,13 +421,13 @@ FakePackageID::virtual_for_key() const
return _imp->virtual_for;
}
-const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
FakePackageID::keywords_key() const
{
return _imp->keywords;
}
-const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
FakePackageID::iuse_key() const
{
return _imp->iuse;
@@ -778,10 +778,10 @@ FakePackageID::breaks_portage() const
return (version().has_try_part() || version().has_scm_part());
}
-const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
+const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
FakePackageID::contains_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
const tr1::shared_ptr<const MetadataPackageIDKey>
@@ -905,6 +905,6 @@ template class FakeMetadataSpecTreeKey<RestrictSpecTree>;
template class FakeMetadataSpecTreeKey<FetchableURISpecTree>;
template class FakeMetadataSpecTreeKey<SimpleURISpecTree>;
-template class FakeMetadataSetKey<KeywordNameSet>;
-template class FakeMetadataSetKey<IUseFlagSet>;
+template class FakeMetadataCollectionKey<KeywordNameSet>;
+template class FakeMetadataCollectionKey<IUseFlagSet>;
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index 1c119d0..71a63d8 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -31,24 +31,24 @@ namespace paludis
class FakeRepositoryBase;
template <typename C_>
- class PALUDIS_VISIBLE FakeMetadataSetKey :
- public MetadataSetKey<C_>,
- private PrivateImplementationPattern<FakeMetadataSetKey<C_> >
+ class PALUDIS_VISIBLE FakeMetadataCollectionKey :
+ public MetadataCollectionKey<C_>,
+ private PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >
{
protected:
- typename PrivateImplementationPattern<FakeMetadataSetKey<C_> >::ImpPtr & _imp;
+ typename PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >::ImpPtr & _imp;
- FakeMetadataSetKey(const std::string &, const std::string &, const MetadataKeyType,
+ FakeMetadataCollectionKey(const std::string &, const std::string &, const MetadataKeyType,
const PackageID * const, const Environment * const);
public:
- ~FakeMetadataSetKey();
+ ~FakeMetadataCollectionKey();
virtual const tr1::shared_ptr<const C_> value() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE FakeMetadataKeywordSetKey :
- public FakeMetadataSetKey<KeywordNameSet>
+ public FakeMetadataCollectionKey<KeywordNameSet>
{
public:
FakeMetadataKeywordSetKey(const std::string &, const std::string &, const std::string &, const MetadataKeyType,
@@ -61,7 +61,7 @@ namespace paludis
};
class PALUDIS_VISIBLE FakeMetadataIUseSetKey :
- public FakeMetadataSetKey<IUseFlagSet>
+ public FakeMetadataCollectionKey<IUseFlagSet>
{
public:
FakeMetadataIUseSetKey(const std::string &, const std::string &, const std::string &, const IUseFlagParseMode,
@@ -172,8 +172,8 @@ namespace paludis
virtual const tr1::shared_ptr<const Repository> repository() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
@@ -187,7 +187,7 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> source_origin_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> binary_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataFSEntryKey> fs_location_key() const;
diff --git a/paludis/repositories/gems/gem_specification.cc b/paludis/repositories/gems/gem_specification.cc
index 4100627..f58177d 100644
--- a/paludis/repositories/gems/gem_specification.cc
+++ b/paludis/repositories/gems/gem_specification.cc
@@ -336,16 +336,16 @@ GemSpecification::virtual_for_key() const
return tr1::shared_ptr<const MetadataPackageIDKey>();
}
-const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
GemSpecification::keywords_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
GemSpecification::iuse_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >();
}
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
@@ -432,10 +432,10 @@ GemSpecification::binary_origin_key() const
return tr1::shared_ptr<const MetadataStringKey>();
}
-const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
+const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
GemSpecification::contains_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
const tr1::shared_ptr<const MetadataPackageIDKey>
diff --git a/paludis/repositories/gems/gem_specification.hh b/paludis/repositories/gems/gem_specification.hh
index a8015dd..ceea649 100644
--- a/paludis/repositories/gems/gem_specification.hh
+++ b/paludis/repositories/gems/gem_specification.hh
@@ -91,8 +91,8 @@ namespace paludis
virtual const tr1::shared_ptr<const Repository> repository() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
@@ -102,7 +102,7 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> short_description_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> long_description_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataFSEntryKey> fs_location_key() const;
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 135a824..5b13f35 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -379,16 +379,16 @@ InstalledUnpackagedID::virtual_for_key() const
return tr1::shared_ptr<const MetadataPackageIDKey>();
}
-const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
InstalledUnpackagedID::keywords_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
InstalledUnpackagedID::iuse_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >();
}
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
@@ -397,10 +397,10 @@ InstalledUnpackagedID::provide_key() const
return tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
}
-const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
+const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
InstalledUnpackagedID::contains_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
const tr1::shared_ptr<const MetadataPackageIDKey>
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index e9987dc..496bffc 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -58,10 +58,10 @@ namespace paludis
virtual const tr1::shared_ptr<const Repository> repository() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 98924c7..6db6f9f 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -156,16 +156,16 @@ UnpackagedID::virtual_for_key() const
return tr1::shared_ptr<const MetadataPackageIDKey>();
}
-const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
UnpackagedID::keywords_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
UnpackagedID::iuse_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >();
}
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
@@ -174,10 +174,10 @@ UnpackagedID::provide_key() const
return tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
}
-const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
+const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
UnpackagedID::contains_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
const tr1::shared_ptr<const MetadataPackageIDKey>
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index 196bfb8..2790dc9 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -56,10 +56,10 @@ namespace paludis
virtual const tr1::shared_ptr<const Repository> repository() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 9e14535..52aae67 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -232,16 +232,16 @@ VirtualsPackageID::virtual_for_key() const
return _imp->virtual_for;
}
-const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
VirtualsPackageID::keywords_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >
+const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
VirtualsPackageID::iuse_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >();
}
const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
@@ -480,10 +480,10 @@ VirtualsPackageID::breaks_portage() const
return (version().has_try_part() || version().has_scm_part());
}
-const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
+const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
VirtualsPackageID::contains_key() const
{
- return tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >();
+ return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
const tr1::shared_ptr<const MetadataPackageIDKey>
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index f9bca57..b60bfc0 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -79,8 +79,8 @@ namespace paludis
virtual const tr1::shared_ptr<const Repository> repository() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > iuse_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
@@ -94,7 +94,7 @@ namespace paludis
virtual const tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> source_origin_key() const;
virtual const tr1::shared_ptr<const MetadataStringKey> binary_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > contains_key() const;
+ virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const tr1::shared_ptr<const MetadataPackageIDKey> contained_in_key() const;
virtual const tr1::shared_ptr<const MetadataFSEntryKey> fs_location_key() const;
diff --git a/python/additional_tests.cc b/python/additional_tests.cc
index 8781d60..3682bf2 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -183,7 +183,7 @@ namespace metadata_key
}
template <typename C_>
- void test_metadata_set_key(const MetadataSetKey<C_> & m)
+ void test_metadata_set_key(const MetadataCollectionKey<C_> & m)
{
test_metadata_key(m);
m.value();
@@ -192,7 +192,7 @@ namespace metadata_key
}
template <>
- void test_metadata_set_key(const MetadataSetKey<IUseFlagSet> & m)
+ void test_metadata_set_key(const MetadataCollectionKey<IUseFlagSet> & m)
{
test_metadata_key(m);
m.value();
diff --git a/python/metadata_key.cc b/python/metadata_key.cc
index 59a7869..b4e1d21 100644
--- a/python/metadata_key.cc
+++ b/python/metadata_key.cc
@@ -79,29 +79,29 @@ class MetadataKeySptrToPythonVisitor :
obj = bp::object(tr1::static_pointer_cast<const MetadataFSEntryKey>(_m_ptr));
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSetKey<KeywordNameSet> >(_m_ptr));
+ obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<KeywordNameSet> >(_m_ptr));
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSetKey<UseFlagNameSet> >(_m_ptr));
+ obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<UseFlagNameSet> >(_m_ptr));
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSetKey<IUseFlagSet> >(_m_ptr));
+ obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<IUseFlagSet> >(_m_ptr));
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSetKey<Set<std::string> > >(_m_ptr));
+ obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<Set<std::string> > >(_m_ptr));
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSetKey<FSEntrySequence> >(_m_ptr));
+ obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<FSEntrySequence> >(_m_ptr));
}
void visit(const MetadataSpecTreeKey<LicenseSpecTree> & k)
@@ -134,9 +134,9 @@ class MetadataKeySptrToPythonVisitor :
obj = bp::object(tr1::static_pointer_cast<const MetadataSpecTreeKey<SimpleURISpecTree> >(_m_ptr));
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
- obj = bp::object(tr1::static_pointer_cast<const MetadataSetKey<PackageIDSequence> >(_m_ptr));
+ obj = bp::object(tr1::static_pointer_cast<const MetadataCollectionKey<PackageIDSequence> >(_m_ptr));
}
void visit(const MetadataSectionKey & k)
@@ -328,12 +328,12 @@ struct MetadataRepositoryMaskInfoKeyWrapper :
};
template <typename C_>
-struct MetadataSetKeyWrapper :
- MetadataSetKey<C_>,
- bp::wrapper<MetadataSetKey<C_> >
+struct MetadataCollectionKeyWrapper :
+ MetadataCollectionKey<C_>,
+ bp::wrapper<MetadataCollectionKey<C_> >
{
- MetadataSetKeyWrapper(const std::string & r, const std::string & h, const MetadataKeyType t) :
- MetadataSetKey<C_>(r, h, t)
+ MetadataCollectionKeyWrapper(const std::string & r, const std::string & h, const MetadataKeyType t) :
+ MetadataCollectionKey<C_>(r, h, t)
{
}
@@ -345,7 +345,7 @@ struct MetadataSetKeyWrapper :
if (bp::override f = this->get_override("value"))
return f();
else
- throw PythonMethodNotImplemented("MetadataSetKey", "value");
+ throw PythonMethodNotImplemented("MetadataCollectionKey", "value");
}
std::string pretty_print_flat(const Formatter<typename C_::value_type> & formatter) const
@@ -356,17 +356,17 @@ struct MetadataSetKeyWrapper :
if (bp::override f = this->get_override("pretty_print_flat"))
return f(boost::cref(formatter));
else
- throw PythonMethodNotImplemented("MetadataSetKey", "pretty_print_flat");
+ throw PythonMethodNotImplemented("MetadataCollectionKey", "pretty_print_flat");
}
};
template <>
-struct MetadataSetKeyWrapper<IUseFlagSet> :
- MetadataSetKey<IUseFlagSet>,
- bp::wrapper<MetadataSetKey<IUseFlagSet> >
+struct MetadataCollectionKeyWrapper<IUseFlagSet> :
+ MetadataCollectionKey<IUseFlagSet>,
+ bp::wrapper<MetadataCollectionKey<IUseFlagSet> >
{
- MetadataSetKeyWrapper(const std::string & r, const std::string & h, const MetadataKeyType t) :
- MetadataSetKey<IUseFlagSet>(r, h, t)
+ MetadataCollectionKeyWrapper(const std::string & r, const std::string & h, const MetadataKeyType t) :
+ MetadataCollectionKey<IUseFlagSet>(r, h, t)
{
}
@@ -378,7 +378,7 @@ struct MetadataSetKeyWrapper<IUseFlagSet> :
if (bp::override f = this->get_override("value"))
return f();
else
- throw PythonMethodNotImplemented("MetadataSetKey", "value");
+ throw PythonMethodNotImplemented("MetadataCollectionKey", "value");
}
std::string pretty_print_flat(const Formatter<IUseFlag> & formatter) const
@@ -389,7 +389,7 @@ struct MetadataSetKeyWrapper<IUseFlagSet> :
if (bp::override f = this->get_override("pretty_print_flat"))
return f(boost::cref(formatter));
else
- throw PythonMethodNotImplemented("MetadataSetKey", "pretty_print_flat");
+ throw PythonMethodNotImplemented("MetadataCollectionKey", "pretty_print_flat");
}
std::string pretty_print_flat_with_comparison(
@@ -403,7 +403,7 @@ struct MetadataSetKeyWrapper<IUseFlagSet> :
if (bp::override f = this->get_override("pretty_print_flat_with_comparison"))
return f(boost::cref(e), pid, boost::cref(formatter));
else
- throw PythonMethodNotImplemented("MetadataSetKey", "pretty_print_flat_with_comparison");
+ throw PythonMethodNotImplemented("MetadataCollectionKey", "pretty_print_flat_with_comparison");
}
};
@@ -508,14 +508,14 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> :
template <typename C_>
struct class_set_key :
- bp::class_<MetadataSetKeyWrapper<C_>, tr1::shared_ptr<MetadataSetKeyWrapper<C_> >,
+ bp::class_<MetadataCollectionKeyWrapper<C_>, tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
bp::bases<MetadataKey>, boost::noncopyable>
{
class_set_key(const std::string & set) :
- bp::class_<MetadataSetKeyWrapper<C_>, tr1::shared_ptr<MetadataSetKeyWrapper<C_> >,
+ bp::class_<MetadataCollectionKeyWrapper<C_>, tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
bp::bases<MetadataKey>, boost::noncopyable>(
("Metadata" + set + "Key").c_str(),
- "A MetadataSetKey is a MetadataKey that holds a Set of some kind of item\n"
+ "A MetadataCollectionKey is a MetadataKey that holds a Set or Sequence of some kind of item\n"
"as its value.\n\n"
"This class can be subclassed in Python.",
@@ -524,16 +524,16 @@ struct class_set_key :
)
)
{
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataSetKey<C_> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataSetKeyWrapper<C_> >,
+ bp::register_ptr_to_python<tr1::shared_ptr<const MetadataCollectionKey<C_> > >();
+ bp::implicitly_convertible<tr1::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
tr1::shared_ptr<MetadataKey> >();
- def("value", bp::pure_virtual(&MetadataSetKey<C_>::value),
+ def("value", bp::pure_virtual(&MetadataCollectionKey<C_>::value),
("value() -> " + set + "\n"
"Fetch our value.").c_str()
);
- def("pretty_print_flat", bp::pure_virtual(&MetadataSetKey<C_>::pretty_print_flat),
+ def("pretty_print_flat", bp::pure_virtual(&MetadataCollectionKey<C_>::pretty_print_flat),
("pretty_print_flat(" + set +"Formatter) -> string\n"
"Return a single-line formatted version of our value, using the\n"
"supplied Formatter to format individual items.").c_str()
@@ -543,14 +543,14 @@ struct class_set_key :
template <>
struct class_set_key<IUseFlagSet> :
- bp::class_<MetadataSetKeyWrapper<IUseFlagSet>, tr1::shared_ptr<MetadataSetKeyWrapper<IUseFlagSet> >,
+ bp::class_<MetadataCollectionKeyWrapper<IUseFlagSet>, tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
bp::bases<MetadataKey>, boost::noncopyable>
{
class_set_key(const std::string & set) :
- bp::class_<MetadataSetKeyWrapper<IUseFlagSet>, tr1::shared_ptr<MetadataSetKeyWrapper<IUseFlagSet> >,
+ bp::class_<MetadataCollectionKeyWrapper<IUseFlagSet>, tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
bp::bases<MetadataKey>, boost::noncopyable>(
("Metadata" + set + "Key").c_str(),
- "A MetadataSetKey is a MetadataKey that holds a Set of some kind of item\n"
+ "A MetadataCollectionKey is a MetadataKey that holds a Set or Sequence of some kind of item\n"
"as its value.\n\n"
"This class can be subclassed in Python.",
@@ -559,23 +559,23 @@ struct class_set_key<IUseFlagSet> :
)
)
{
- bp::register_ptr_to_python<tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > >();
- bp::implicitly_convertible<tr1::shared_ptr<MetadataSetKeyWrapper<IUseFlagSet> >,
+ bp::register_ptr_to_python<tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > >();
+ bp::implicitly_convertible<tr1::shared_ptr<MetadataCollectionKeyWrapper<IUseFlagSet> >,
tr1::shared_ptr<MetadataKey> >();
- def("value", bp::pure_virtual(&MetadataSetKey<IUseFlagSet>::value),
+ def("value", bp::pure_virtual(&MetadataCollectionKey<IUseFlagSet>::value),
("value() -> " + set + "\n"
"Fetch our value.").c_str()
);
- def("pretty_print_flat", bp::pure_virtual(&MetadataSetKey<IUseFlagSet>::pretty_print_flat),
+ def("pretty_print_flat", bp::pure_virtual(&MetadataCollectionKey<IUseFlagSet>::pretty_print_flat),
("pretty_print_flat(" + set +"Formatter) -> string\n"
"Return a single-line formatted version of our value, using the\n"
"supplied Formatter to format individual items.").c_str()
);
def("pretty_print_flat_with_comparison",
- bp::pure_virtual(&MetadataSetKey<IUseFlagSet>::pretty_print_flat_with_comparison),
+ bp::pure_virtual(&MetadataCollectionKey<IUseFlagSet>::pretty_print_flat_with_comparison),
("pretty_print_flat_with_comparison(Environment, PackageID, " + set +"Formatter) -> string\n"
"Return a single-line formatted version of our value, using the\n"
"supplied Formatter to format individual items, and the supplied\n"
@@ -917,7 +917,7 @@ void expose_metadata_key()
;
/**
- * MetadataSetKeys
+ * MetadataCollectionKeys
*/
class_set_key<KeywordNameSet>("KeywordNameIterable");
class_set_key<UseFlagNameSet>("UseFlagNameIterable");
diff --git a/ruby/metadata_key.cc b/ruby/metadata_key.cc
index 4456729..f171276 100644
--- a/ruby/metadata_key.cc
+++ b/ruby/metadata_key.cc
@@ -134,43 +134,43 @@ namespace
new tr1::shared_ptr<const MetadataRepositoryMaskInfoKey>(tr1::static_pointer_cast<const MetadataRepositoryMaskInfoKey>(mm)));
}
- void visit(const MetadataSetKey<KeywordNameSet> &)
+ void visit(const MetadataCollectionKey<KeywordNameSet> &)
{
- value = Data_Wrap_Struct(c_metadata_keyword_name_set_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > >::free,
- new tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >(tr1::static_pointer_cast<const MetadataSetKey<KeywordNameSet> >(mm)));
+ value = Data_Wrap_Struct(c_metadata_keyword_name_set_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > >::free,
+ new tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >(tr1::static_pointer_cast<const MetadataCollectionKey<KeywordNameSet> >(mm)));
}
- void visit(const MetadataSetKey<UseFlagNameSet> &)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> &)
{
- value = Data_Wrap_Struct(c_metadata_use_flag_name_set_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<UseFlagNameSet> > >::free,
- new tr1::shared_ptr<const MetadataSetKey<UseFlagNameSet> >(tr1::static_pointer_cast<const MetadataSetKey<UseFlagNameSet> >(mm)));
+ value = Data_Wrap_Struct(c_metadata_use_flag_name_set_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > >::free,
+ new tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> >(tr1::static_pointer_cast<const MetadataCollectionKey<UseFlagNameSet> >(mm)));
}
- void visit(const MetadataSetKey<IUseFlagSet> &)
+ void visit(const MetadataCollectionKey<IUseFlagSet> &)
{
- value = Data_Wrap_Struct(c_metadata_iuse_flag_set_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > >::free,
- new tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >(tr1::static_pointer_cast<const MetadataSetKey<IUseFlagSet> >(mm)));
+ value = Data_Wrap_Struct(c_metadata_iuse_flag_set_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > >::free,
+ new tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >(tr1::static_pointer_cast<const MetadataCollectionKey<IUseFlagSet> >(mm)));
}
- void visit(const MetadataSetKey<Set<std::string> > &)
+ void visit(const MetadataCollectionKey<Set<std::string> > &)
{
- value = Data_Wrap_Struct(c_metadata_string_set_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<Set<std::string> > > >::free,
- new tr1::shared_ptr<const MetadataSetKey<Set<std::string> > >(
- tr1::static_pointer_cast<const MetadataSetKey<Set<std::string> > >(mm)));
+ value = Data_Wrap_Struct(c_metadata_string_set_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > >::free,
+ new tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >(
+ tr1::static_pointer_cast<const MetadataCollectionKey<Set<std::string> > >(mm)));
}
- void visit(const MetadataSetKey<FSEntrySequence> &)
+ void visit(const MetadataCollectionKey<FSEntrySequence> &)
{
value = Data_Wrap_Struct(c_metadata_fsentry_sequence_key, 0, &Common<tr1::shared_ptr<const FSEntrySequence> >::free,
- new tr1::shared_ptr<const MetadataSetKey<FSEntrySequence> >(
- tr1::static_pointer_cast<const MetadataSetKey<FSEntrySequence> >(mm)));
+ new tr1::shared_ptr<const MetadataCollectionKey<FSEntrySequence> >(
+ tr1::static_pointer_cast<const MetadataCollectionKey<FSEntrySequence> >(mm)));
}
- void visit(const MetadataSetKey<PackageIDSequence> &)
+ void visit(const MetadataCollectionKey<PackageIDSequence> &)
{
- value = Data_Wrap_Struct(c_metadata_package_id_sequence_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > >::free,
- new tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >
- (tr1::static_pointer_cast<const MetadataSetKey<PackageIDSequence> >(mm)));
+ value = Data_Wrap_Struct(c_metadata_package_id_sequence_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > >::free,
+ new tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+ (tr1::static_pointer_cast<const MetadataCollectionKey<PackageIDSequence> >(mm)));
}
void visit(const MetadataSpecTreeKey<LicenseSpecTree> &)
@@ -286,8 +286,8 @@ namespace
static VALUE
fetch(VALUE self)
{
- tr1::shared_ptr<const MetadataSetKey<T_> > * self_ptr;
- Data_Get_Struct(self, tr1::shared_ptr<const MetadataSetKey<T_> >, self_ptr);
+ tr1::shared_ptr<const MetadataCollectionKey<T_> > * self_ptr;
+ Data_Get_Struct(self, tr1::shared_ptr<const MetadataCollectionKey<T_> >, self_ptr);
tr1::shared_ptr<const T_> c = (*self_ptr)->value();
VALUE result (rb_ary_new());
for (typename T_::ConstIterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
@@ -302,8 +302,8 @@ namespace
static VALUE
fetch(VALUE self)
{
- tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> > * self_ptr;
- Data_Get_Struct(self, tr1::shared_ptr<const MetadataSetKey<PackageIDSequence> >, self_ptr);
+ tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > * self_ptr;
+ Data_Get_Struct(self, tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >, self_ptr);
tr1::shared_ptr<const PackageIDSequence> c = (*self_ptr)->value();
VALUE result (rb_ary_new());
for (PackageIDSequence::ConstIterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
diff --git a/ruby/package_id.cc b/ruby/package_id.cc
index 6646c79..2359cf2 100644
--- a/ruby/package_id.cc
+++ b/ruby/package_id.cc
@@ -188,7 +188,7 @@ namespace
* Document-method: keywords_key
*
* call-seq:
- * keywords_key -> MetadataSetKey
+ * keywords_key -> MetadataCollectionKey
*
* Our keywords
*/
@@ -196,7 +196,7 @@ namespace
* Document-method: use_key
*
* call-seq:
- * use_key -> MetadataSetKey
+ * use_key -> MetadataCollectionKey
*
* Our use flags
*/
@@ -204,7 +204,7 @@ namespace
* Document-method: iuse_key
*
* call-seq:
- * iuse_key -> MetadataSetKey
+ * iuse_key -> MetadataCollectionKey
*
* Our iuse flags
*/
@@ -212,7 +212,7 @@ namespace
* Document-method: inherited_key
*
* call-seq:
- * inherited_key -> MetadataSetKey
+ * inherited_key -> MetadataCollectionKey
*
* Our inherited
*/
@@ -310,8 +310,8 @@ namespace
rb_define_method(c_package_id, "supports_action", RUBY_FUNC_CAST(&package_id_supports_action), 1);
rb_define_method(c_package_id, "perform_action", RUBY_FUNC_CAST(&package_id_perform_action), 1);
rb_define_method(c_package_id, "each_metadata", RUBY_FUNC_CAST(&package_id_each_metadata), 0);
- rb_define_method(c_package_id, "keywords_key", RUBY_FUNC_CAST((&KeyValue<MetadataSetKey<KeywordNameSet>,&PackageID::keywords_key>::fetch)), 0);
- rb_define_method(c_package_id, "iuse_key", RUBY_FUNC_CAST((&KeyValue<MetadataSetKey<IUseFlagSet>,&PackageID::iuse_key>::fetch)), 0);
+ rb_define_method(c_package_id, "keywords_key", RUBY_FUNC_CAST((&KeyValue<MetadataCollectionKey<KeywordNameSet>,&PackageID::keywords_key>::fetch)), 0);
+ rb_define_method(c_package_id, "iuse_key", RUBY_FUNC_CAST((&KeyValue<MetadataCollectionKey<IUseFlagSet>,&PackageID::iuse_key>::fetch)), 0);
rb_define_method(c_package_id, "short_description_key", RUBY_FUNC_CAST((&KeyValue<MetadataStringKey,&PackageID::short_description_key>::fetch)), 0);
rb_define_method(c_package_id, "long_description_key", RUBY_FUNC_CAST((&KeyValue<MetadataStringKey,&PackageID::long_description_key>::fetch)), 0);
rb_define_method(c_package_id, "contents_key", RUBY_FUNC_CAST((&KeyValue<MetadataContentsKey,&PackageID::contents_key>::fetch)), 0);
diff --git a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
index 331f141..155cd62 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
@@ -104,27 +104,27 @@ namespace gtkpaludis
virtual void got_key(const MetadataKey & k, const std::string & s) = 0;
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
@@ -159,7 +159,7 @@ namespace gtkpaludis
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
diff --git a/src/clients/inquisitio/key_extractor.cc b/src/clients/inquisitio/key_extractor.cc
index 2c7b04c..ccdfa74 100644
--- a/src/clients/inquisitio/key_extractor.cc
+++ b/src/clients/inquisitio/key_extractor.cc
@@ -225,7 +225,7 @@ namespace
result = _m(stringify(*s.value()));
}
- void visit(const MetadataSetKey<UseFlagNameSet> & s)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & s)
{
using namespace tr1::placeholders;
@@ -236,7 +236,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), tr1::bind(&stringify<UseFlagName>, _1)));
}
- void visit(const MetadataSetKey<IUseFlagSet> & s)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & s)
{
using namespace tr1::placeholders;
@@ -247,7 +247,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), tr1::bind(&stringify<IUseFlag>, _1)));
}
- void visit(const MetadataSetKey<KeywordNameSet> & s)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & s)
{
using namespace tr1::placeholders;
@@ -258,7 +258,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), tr1::bind(&stringify<KeywordName>, _1)));
}
- void visit(const MetadataSetKey<Set<std::string> > & s)
+ void visit(const MetadataCollectionKey<Set<std::string> > & s)
{
using namespace tr1::placeholders;
@@ -269,7 +269,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), _1));
}
- void visit(const MetadataSetKey<FSEntrySequence> & s)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & s)
{
using namespace tr1::placeholders;
@@ -280,7 +280,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), tr1::bind(&stringify<FSEntry>, _1)));
}
- void visit(const MetadataSetKey<PackageIDSequence> & s)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & s)
{
using namespace tr1::placeholders;
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index 1baadb8..526ae9f 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -110,32 +110,32 @@ namespace
const tr1::shared_ptr<DependencySpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
const tr1::shared_ptr<const PackageIDSequence> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
const tr1::shared_ptr<const Set<std::string> > & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
const tr1::shared_ptr<const FSEntrySequence> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
const tr1::shared_ptr<const KeywordNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
const tr1::shared_ptr<const IUseFlagSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
const tr1::shared_ptr<const UseFlagNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
diff --git a/src/clients/paludis/applets.cc b/src/clients/paludis/applets.cc
index d4d4fe1..43dcadb 100644
--- a/src/clients/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -116,37 +116,37 @@ namespace
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
diff --git a/src/clients/paludis/info.cc b/src/clients/paludis/info.cc
index 70590c1..12eb608 100644
--- a/src/clients/paludis/info.cc
+++ b/src/clients/paludis/info.cc
@@ -131,37 +131,37 @@ namespace
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index 2691cd7..2c86442 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -59,27 +59,27 @@ namespace
std::ostringstream stream;
StringifyFormatter formatter;
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
@@ -114,7 +114,7 @@ namespace
stream << k.raw_name() << ": " << k.pretty_print_flat(formatter) << "\n";
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
stream << k.raw_name() << ": "
<< join(indirect_iterator(k.value()->begin()), indirect_iterator(k.value()->end()), " ") << "\n";
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index 6cdef71..0f88877 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -256,7 +256,7 @@ namespace
{
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
if (k.type() == type)
{
@@ -274,7 +274,7 @@ namespace
}
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
if (k.type() == type)
{
@@ -292,7 +292,7 @@ namespace
}
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
if (k.type() == type)
{
@@ -310,7 +310,7 @@ namespace
}
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
if (k.type() == type)
{
@@ -328,7 +328,7 @@ namespace
}
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
if (k.type() == type)
{
@@ -467,7 +467,7 @@ namespace
}
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
if (k.type() == type)
{
diff --git a/src/output/mask_displayer.cc b/src/output/mask_displayer.cc
index ea15114..a1d0e49 100644
--- a/src/output/mask_displayer.cc
+++ b/src/output/mask_displayer.cc
@@ -114,31 +114,31 @@ namespace
s << k.value();
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
@@ -168,7 +168,7 @@ namespace
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);