aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/qa
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-07-29 21:47:08 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-03 21:20:26 +0100
commit77be16f5c2de2ebcd7ce78084755f83c522edc39 (patch)
tree7f46de7cf0f1cd9ec9cd2c4b342446cd0c4d567c /paludis/repositories/e/qa
parent5c42e4800f4e6edd91dc6d8cdf54afb3d1fb34df (diff)
downloadpaludis-77be16f5c2de2ebcd7ce78084755f83c522edc39.tar.gz
paludis-77be16f5c2de2ebcd7ce78084755f83c522edc39.tar.xz
Kill kc. Breaks python.
Diffstat (limited to 'paludis/repositories/e/qa')
-rw-r--r--paludis/repositories/e/qa/eapi_supported.cc1
-rw-r--r--paludis/repositories/e/qa/fetches_key.cc2
-rw-r--r--paludis/repositories/e/qa/iuse_key.cc2
-rw-r--r--paludis/repositories/e/qa/spec_keys.cc6
-rw-r--r--paludis/repositories/e/qa/visibility.cc24
5 files changed, 17 insertions, 18 deletions
diff --git a/paludis/repositories/e/qa/eapi_supported.cc b/paludis/repositories/e/qa/eapi_supported.cc
index d449753..10d1e73 100644
--- a/paludis/repositories/e/qa/eapi_supported.cc
+++ b/paludis/repositories/e/qa/eapi_supported.cc
@@ -23,7 +23,6 @@
#include <paludis/repositories/e/eapi.hh>
#include <paludis/repositories/e/e_repository_id.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/kc.hh>
bool
paludis::erepository::eapi_supported_check(
diff --git a/paludis/repositories/e/qa/fetches_key.cc b/paludis/repositories/e/qa/fetches_key.cc
index a3779dd..91f96ae 100644
--- a/paludis/repositories/e/qa/fetches_key.cc
+++ b/paludis/repositories/e/qa/fetches_key.cc
@@ -145,7 +145,7 @@ namespace
else
{
mirror_host.erase(pos);
- RepositoryMirrorsInterface * m((*id->repository())[k::mirrors_interface()]);
+ RepositoryMirrorsInterface * m((*id->repository()).mirrors_interface());
if (! m->is_mirror(mirror_host))
reporter.message(QAMessage(entry, qaml_normal, name,
"Unknown mirror '" + mirror_host + "' for '" +
diff --git a/paludis/repositories/e/qa/iuse_key.cc b/paludis/repositories/e/qa/iuse_key.cc
index 4074bb8..eaf78fe 100644
--- a/paludis/repositories/e/qa/iuse_key.cc
+++ b/paludis/repositories/e/qa/iuse_key.cc
@@ -94,7 +94,7 @@ paludis::erepository::iuse_key_check(
.with_associated_id(id)
.with_associated_key(id, id->iuse_key()));
- if ("" == (*repo)[k::use_interface()]->describe_use_flag(it->flag, *id))
+ if ("" == (*repo).use_interface()->describe_use_flag(it->flag, *id))
reporter.message(QAMessage(entry, qaml_minor, name,
"Flag '" + stringify(it->flag) + "' in '" + id->iuse_key()->raw_name() + "' has no description")
.with_associated_id(id)
diff --git a/paludis/repositories/e/qa/spec_keys.cc b/paludis/repositories/e/qa/spec_keys.cc
index 9a421e6..9c3f737 100644
--- a/paludis/repositories/e/qa/spec_keys.cc
+++ b/paludis/repositories/e/qa/spec_keys.cc
@@ -190,7 +190,7 @@ namespace
.with_associated_id(id)
.with_associated_key(id, key));
- if ((*id->repository())[k::use_interface()]->arch_flags()->count(elike_conditional_dep_spec_flag(u)))
+ if ((*id->repository()).use_interface()->arch_flags()->count(elike_conditional_dep_spec_flag(u)))
{
if (forbid_arch_flags)
reporter.message(QAMessage(entry, qaml_normal, name,
@@ -209,14 +209,14 @@ namespace
if (iuse_flags.end() == iuse_flags.find(elike_conditional_dep_spec_flag(u)))
{
std::tr1::shared_ptr<const UseFlagNameSet> c(
- (*id->repository())[k::use_interface()]->use_expand_hidden_prefixes());
+ (*id->repository()).use_interface()->use_expand_hidden_prefixes());
std::string flag(stringify(elike_conditional_dep_spec_flag(u)));
bool is_hidden(false);
for (UseFlagNameSet::ConstIterator i(c->begin()), i_end(c->end()) ;
i != i_end ; ++i)
{
- std::string prefix(stringify(*i) + (*id->repository())[k::use_interface()]->use_expand_separator(*id));
+ std::string prefix(stringify(*i) + (*id->repository()).use_interface()->use_expand_separator(*id));
if (0 == flag.compare(0, prefix.length(), prefix))
{
is_hidden = true;
diff --git a/paludis/repositories/e/qa/visibility.cc b/paludis/repositories/e/qa/visibility.cc
index 96b8d98..33fd739 100644
--- a/paludis/repositories/e/qa/visibility.cc
+++ b/paludis/repositories/e/qa/visibility.cc
@@ -117,8 +117,8 @@ namespace
/* rewrite virtuals to avoid problems later on */
if (p->package_ptr())
{
- ERepositoryProfile::VirtualsConstIterator v((*profile)[k::profile()]->find_virtual(*p->package_ptr()));
- if ((*profile)[k::profile()]->end_virtuals() != v)
+ ERepositoryProfile::VirtualsConstIterator v((*profile).profile()->find_virtual(*p->package_ptr()));
+ if ((*profile).profile()->end_virtuals() != v)
{
PartiallyMadePackageDepSpec pp;
@@ -148,8 +148,8 @@ namespace
if (reporter)
reporter->message(QAMessage(entry, qaml_normal, name, "No packages matching '"
+ stringify(orig_p) + "' in dependencies key '" + stringify(key->raw_name()) + "' for profile '"
- + stringify((*profile)[k::path()]) + "' (" + stringify((*profile)[k::arch()]) + "."
- + stringify((*profile)[k::status()])
+ + stringify((*profile).path()) + "' (" + stringify((*profile).arch()) + "."
+ + stringify((*profile).status())
+ (unstable ? ".unstable" : ".stable") + ")")
.with_associated_id(id)
.with_associated_key(id, key));
@@ -162,13 +162,13 @@ namespace
/* can't use the usual masked rules here, so this gets a bit complicated... */
if ((*i)->repository() == repo)
{
- if (repo->repository_masked(**i) || (*profile)[k::profile()]->profile_masked(**i) || ! (*i)->keywords_key())
+ if (repo->repository_masked(**i) || (*profile).profile()->profile_masked(**i) || ! (*i)->keywords_key())
continue;
}
else if ((*i)->repository() == repo->params().master_repository)
{
if (repo->params().master_repository->repository_masked(**i) ||
- (*profile)[k::profile()]->profile_masked(**i) || ! (*i)->keywords_key())
+ (*profile).profile()->profile_masked(**i) || ! (*i)->keywords_key())
continue;
}
else
@@ -196,7 +196,7 @@ namespace
if (reporter)
reporter->message(QAMessage(entry, qaml_normal, name, "No visible packages matching '"
+ stringify(orig_p) + "' in dependencies key '" + stringify(key->raw_name()) + "' for profile '"
- + stringify((*profile)[k::path()]) + "' (" + stringify((*profile)[k::arch()]) + "." + stringify((*profile)[k::status()])
+ + stringify((*profile).path()) + "' (" + stringify((*profile).arch()) + "." + stringify((*profile).status())
+ (unstable ? ".unstable" : ".stable") + ")")
.with_associated_id(id)
.with_associated_key(id, key));
@@ -208,8 +208,8 @@ namespace
DependencySpecTree::ConstSequenceIterator end)
{
viable =
- ((! elike_conditional_dep_spec_is_inverse(u)) && (! (*profile)[k::profile()]->use_masked(elike_conditional_dep_spec_flag(u), *id))) ||
- ((elike_conditional_dep_spec_is_inverse(u)) && (! (*profile)[k::profile()]->use_forced(elike_conditional_dep_spec_flag(u), *id)));
+ ((! elike_conditional_dep_spec_is_inverse(u)) && (! (*profile).profile()->use_masked(elike_conditional_dep_spec_flag(u), *id))) ||
+ ((elike_conditional_dep_spec_is_inverse(u)) && (! (*profile).profile()->use_forced(elike_conditional_dep_spec_flag(u), *id)));
if (viable)
std::for_each(cur, end, accept_visitor(*this));
@@ -243,7 +243,7 @@ namespace
std::for_each(begin, end, accept_visitor(printer));
reporter->message(QAMessage(entry, qaml_normal, name, "No item in block '|| ( "
+ stringify(printer) + " )' visible for profile '"
- + stringify((*profile)[k::path()]) + "' (" + stringify((*profile)[k::arch()]) + "." + stringify((*profile)[k::status()])
+ + stringify((*profile).path()) + "' (" + stringify((*profile).arch()) + "." + stringify((*profile).status())
+ (unstable ? ".unstable" : ".stable") + ")")
.with_associated_id(id)
.with_associated_key(id, key));
@@ -281,11 +281,11 @@ paludis::erepository::visibility_check(
for (ERepository::ProfilesConstIterator p(repo->begin_profiles()), p_end(repo->end_profiles()) ;
p != p_end ; ++p)
{
- if ((*p)[k::profile()]->profile_masked(*id))
+ if ((*p).profile()->profile_masked(*id))
continue;
std::set<KeywordName> accepted_keywords, overlap;
- tokenise_whitespace((*p)[k::profile()]->environment_variable(
+ tokenise_whitespace((*p).profile()->environment_variable(
repo->accept_keywords_variable()), create_inserter<KeywordName>(std::inserter(accepted_keywords, accepted_keywords.begin())));
std::set_intersection(accepted_keywords.begin(), accepted_keywords.end(),