aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-05-12 11:02:03 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-05-12 11:02:03 +0100
commit962018d649a70ed785c713b538e0d51c453f385b (patch)
treeb1f7e548fbe581bdacb99501dbaacc9863797d6c
parent1a7ae61f7a12aeb10ff385bd3f30942016f87aec (diff)
downloadpaludis-962018d649a70ed785c713b538e0d51c453f385b.tar.gz
paludis-962018d649a70ed785c713b538e0d51c453f385b.tar.xz
UnavailableID -> UnavailablePackageID
-rw-r--r--paludis/repositories/unavailable/Makefile.am4
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc (renamed from paludis/repositories/unavailable/unavailable_id.cc)82
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.hh (renamed from paludis/repositories/unavailable/unavailable_id.hh)18
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_store.cc6
4 files changed, 55 insertions, 55 deletions
diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
index 7769cf9..3465e49 100644
--- a/paludis/repositories/unavailable/Makefile.am
+++ b/paludis/repositories/unavailable/Makefile.am
@@ -13,14 +13,14 @@ noinst_LTLIBRARIES = libpaludisunavailablerepository.la
noinst_HEADERS = \
unavailable_repository.hh unavailable_repository-fwd.hh \
- unavailable_id.hh \
+ unavailable_package_id.hh \
unavailable_mask.hh \
unavailable_repository_store.hh \
unavailable_repository_file.hh unavailable_repository_file-fwd.hh
libpaludisunavailablerepository_la_SOURCES = \
unavailable_repository.cc \
- unavailable_id.cc \
+ unavailable_package_id.cc \
unavailable_mask.cc \
unavailable_repository_store.cc \
unavailable_repository_file.cc \
diff --git a/paludis/repositories/unavailable/unavailable_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index f732832..0d209b8 100644
--- a/paludis/repositories/unavailable/unavailable_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/unavailable/unavailable_id.hh>
+#include <paludis/repositories/unavailable/unavailable_package_id.hh>
#include <paludis/repositories/unavailable/unavailable_repository.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/stringify.hh>
@@ -40,7 +40,7 @@ using namespace paludis::unavailable_repository;
namespace paludis
{
template <>
- struct Implementation<UnavailableID>
+ struct Implementation<UnavailablePackageID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -55,7 +55,7 @@ namespace paludis
const std::tr1::shared_ptr<const Mask> mask;
Implementation(
- const UnavailableIDParams & e) :
+ const UnavailablePackageIDParams & e) :
env(e.environment()),
name(e.name()),
version(e.version()),
@@ -72,9 +72,9 @@ namespace paludis
};
}
-UnavailableID::UnavailableID(const UnavailableIDParams & entry) :
- PrivateImplementationPattern<UnavailableID>(new Implementation<UnavailableID>(entry)),
- _imp(PrivateImplementationPattern<UnavailableID>::_imp)
+UnavailablePackageID::UnavailablePackageID(const UnavailablePackageIDParams & entry) :
+ PrivateImplementationPattern<UnavailablePackageID>(new Implementation<UnavailablePackageID>(entry)),
+ _imp(PrivateImplementationPattern<UnavailablePackageID>::_imp)
{
add_metadata_key(_imp->slot_key);
add_metadata_key(_imp->description_key);
@@ -86,22 +86,22 @@ UnavailableID::UnavailableID(const UnavailableIDParams & entry) :
add_mask(_imp->mask);
}
-UnavailableID::~UnavailableID()
+UnavailablePackageID::~UnavailablePackageID()
{
}
void
-UnavailableID::need_keys_added() const
+UnavailablePackageID::need_keys_added() const
{
}
void
-UnavailableID::need_masks_added() const
+UnavailablePackageID::need_masks_added() const
{
}
const std::string
-UnavailableID::canonical_form(const PackageIDCanonicalForm f) const
+UnavailablePackageID::canonical_form(const PackageIDCanonicalForm f) const
{
switch (f)
{
@@ -132,7 +132,7 @@ UnavailableID::canonical_form(const PackageIDCanonicalForm f) const
}
PackageDepSpec
-UnavailableID::uniquely_identifying_spec() const
+UnavailablePackageID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()) +
@@ -141,43 +141,43 @@ UnavailableID::uniquely_identifying_spec() const
}
const QualifiedPackageName
-UnavailableID::name() const
+UnavailablePackageID::name() const
{
return _imp->name;
}
const VersionSpec
-UnavailableID::version() const
+UnavailablePackageID::version() const
{
return _imp->version;
}
const std::tr1::shared_ptr<const Repository>
-UnavailableID::repository() const
+UnavailablePackageID::repository() const
{
return _imp->repo->shared_from_this();
}
bool
-UnavailableID::supports_action(const SupportsActionTestBase & a) const
+UnavailablePackageID::supports_action(const SupportsActionTestBase & a) const
{
return simple_visitor_cast<const SupportsActionTest<InstallAction> >(a);
}
void
-UnavailableID::perform_action(Action & a) const
+UnavailablePackageID::perform_action(Action & a) const
{
throw ActionFailedError("Unsupported action: " + a.simple_name());
}
std::tr1::shared_ptr<const Set<std::string> >
-UnavailableID::breaks_portage() const
+UnavailablePackageID::breaks_portage() const
{
return make_shared_ptr(new Set<std::string>);
}
bool
-UnavailableID::arbitrary_less_than_comparison(const PackageID & other) const
+UnavailablePackageID::arbitrary_less_than_comparison(const PackageID & other) const
{
if (! other.slot_key())
return false;
@@ -197,137 +197,137 @@ UnavailableID::arbitrary_less_than_comparison(const PackageID & other) const
}
std::size_t
-UnavailableID::extra_hash_value() const
+UnavailablePackageID::extra_hash_value() const
{
return Hash<std::pair<SlotName, std::string> >()(std::make_pair(
slot_key()->value(), *_imp->from_repositories_key->value()->begin()));
}
const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
-UnavailableID::contains_key() const
+UnavailablePackageID::contains_key() const
{
return std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
-UnavailableID::contained_in_key() const
+UnavailablePackageID::contained_in_key() const
{
return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
}
const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
-UnavailableID::fs_location_key() const
+UnavailablePackageID::fs_location_key() const
{
return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
}
const std::tr1::shared_ptr<const MetadataValueKey<bool> >
-UnavailableID::transient_key() const
+UnavailablePackageID::transient_key() const
{
return std::tr1::shared_ptr<const MetadataValueKey<bool> >();
}
const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
-UnavailableID::virtual_for_key() const
+UnavailablePackageID::virtual_for_key() const
{
return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
}
const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
-UnavailableID::keywords_key() const
+UnavailablePackageID::keywords_key() const
{
return std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
-UnavailableID::provide_key() const
+UnavailablePackageID::provide_key() const
{
return std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
}
const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnavailableID::dependencies_key() const
+UnavailablePackageID::dependencies_key() const
{
return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnavailableID::build_dependencies_key() const
+UnavailablePackageID::build_dependencies_key() const
{
return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnavailableID::run_dependencies_key() const
+UnavailablePackageID::run_dependencies_key() const
{
return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnavailableID::post_dependencies_key() const
+UnavailablePackageID::post_dependencies_key() const
{
return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
-UnavailableID::suggested_dependencies_key() const
+UnavailablePackageID::suggested_dependencies_key() const
{
return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
-UnavailableID::short_description_key() const
+UnavailablePackageID::short_description_key() const
{
return _imp->description_key;
}
const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
-UnavailableID::long_description_key() const
+UnavailablePackageID::long_description_key() const
{
return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
}
const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
-UnavailableID::fetches_key() const
+UnavailablePackageID::fetches_key() const
{
return std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
}
const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
-UnavailableID::homepage_key() const
+UnavailablePackageID::homepage_key() const
{
return std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >();
}
const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
-UnavailableID::contents_key() const
+UnavailablePackageID::contents_key() const
{
return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >();
}
const std::tr1::shared_ptr<const MetadataTimeKey>
-UnavailableID::installed_time_key() const
+UnavailablePackageID::installed_time_key() const
{
return std::tr1::shared_ptr<const MetadataTimeKey>();
}
const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
-UnavailableID::from_repositories_key() const
+UnavailablePackageID::from_repositories_key() const
{
return _imp->from_repositories_key;
}
const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > >
-UnavailableID::choices_key() const
+UnavailablePackageID::choices_key() const
{
return _imp->choices_key;
}
const std::tr1::shared_ptr<const MetadataValueKey<SlotName> >
-UnavailableID::slot_key() const
+UnavailablePackageID::slot_key() const
{
return _imp->slot_key;
}
-template class PrivateImplementationPattern<UnavailableID>;
+template class PrivateImplementationPattern<UnavailablePackageID>;
diff --git a/paludis/repositories/unavailable/unavailable_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index ab5009f..fa55eb3 100644
--- a/paludis/repositories/unavailable/unavailable_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_ID_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_ID_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_PACKAGE_ID_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_PACKAGE_ID_HH 1
#include <paludis/util/named_value.hh>
#include <paludis/package_id.hh>
@@ -43,7 +43,7 @@ namespace paludis
namespace unavailable_repository
{
- struct UnavailableIDParams
+ struct UnavailablePackageIDParams
{
NamedValue<n::description, std::tr1::shared_ptr<const MetadataValueKey<std::string> > > description;
NamedValue<n::environment, const Environment *> environment;
@@ -57,20 +57,20 @@ namespace paludis
NamedValue<n::version, VersionSpec> version;
};
- class PALUDIS_VISIBLE UnavailableID :
+ class PALUDIS_VISIBLE UnavailablePackageID :
public PackageID,
- private PrivateImplementationPattern<UnavailableID>
+ private PrivateImplementationPattern<UnavailablePackageID>
{
private:
- PrivateImplementationPattern<UnavailableID>::ImpPtr & _imp;
+ PrivateImplementationPattern<UnavailablePackageID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
void need_masks_added() const;
public:
- UnavailableID(const UnavailableIDParams &);
- ~UnavailableID();
+ UnavailablePackageID(const UnavailablePackageIDParams &);
+ ~UnavailablePackageID();
const std::string canonical_form(const PackageIDCanonicalForm) const;
const QualifiedPackageName name() const;
diff --git a/paludis/repositories/unavailable/unavailable_repository_store.cc b/paludis/repositories/unavailable/unavailable_repository_store.cc
index fbda50b..f33c4a2 100644
--- a/paludis/repositories/unavailable/unavailable_repository_store.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_store.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -19,7 +19,7 @@
#include <paludis/repositories/unavailable/unavailable_repository_store.hh>
#include <paludis/repositories/unavailable/unavailable_repository_file.hh>
-#include <paludis/repositories/unavailable/unavailable_id.hh>
+#include <paludis/repositories/unavailable/unavailable_package_id.hh>
#include <paludis/repositories/unavailable/unavailable_mask.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/fs_entry.hh>
@@ -162,7 +162,7 @@ UnavailableRepositoryStore::_populate_one(const Environment * const env, const F
ids = p->second;
}
- ids->push_back(make_shared_ptr(new UnavailableID(make_named_values<UnavailableIDParams>(
+ ids->push_back(make_shared_ptr(new UnavailablePackageID(make_named_values<UnavailablePackageIDParams>(
value_for<n::description>((*i).description()),
value_for<n::environment>(env),
value_for<n::from_repositories>(from_repositories),