aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/fake
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/fake')
-rw-r--r--paludis/repositories/fake/fake_package_id.cc30
-rw-r--r--paludis/repositories/fake/fake_package_id.hh22
2 files changed, 26 insertions, 26 deletions
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index ea502f178..48de5c5f9 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 1c119d0f9..71a63d886 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;