aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-02-21 14:40:19 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-02-21 14:40:19 +0000
commit981dd553a590eff046d49bccd06f2cb61963edee (patch)
tree5ffceeda6cfaa575b92ca48e1152997bbded3605 /src
parent690aca7a8de4bf9b682be59abbed08a8d12a21d8 (diff)
downloadpaludis-981dd553a590eff046d49bccd06f2cb61963edee.tar.gz
paludis-981dd553a590eff046d49bccd06f2cb61963edee.tar.xz
More sr -> kc
Diffstat (limited to 'src')
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.cc16
-rw-r--r--src/clients/adjutrix/downgrade_check.cc18
-rw-r--r--src/clients/adjutrix/find_insecure_packages.cc6
-rw-r--r--src/clients/adjutrix/find_unused_packages.cc2
-rw-r--r--src/clients/adjutrix/keywords_graph.cc6
-rw-r--r--src/clients/adjutrix/what_needs_keywording.cc4
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/repository_buttons.cc2
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc4
-rw-r--r--src/clients/paludis/applets.cc2
-rw-r--r--src/clients/paludis/list.cc6
-rw-r--r--src/clients/qualudis/qualudis.cc6
-rw-r--r--src/output/console_install_task.cc2
12 files changed, 37 insertions, 37 deletions
diff --git a/src/clients/adjutrix/display_default_system_resolution.cc b/src/clients/adjutrix/display_default_system_resolution.cc
index 0973b95e5..3b9d6c8f4 100644
--- a/src/clients/adjutrix/display_default_system_resolution.cc
+++ b/src/clients/adjutrix/display_default_system_resolution.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 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
@@ -125,11 +125,11 @@ int do_display_default_system_resolution(NoConfigEnvironment & env)
CommandLine::get_instance()->a_profile.end_args())
{
for (RepositoryEInterface::ProfilesConstIterator
- p(env.main_repository()->e_interface->begin_profiles()),
- p_end(env.main_repository()->e_interface->end_profiles()) ; p != p_end ; ++p)
+ p((*env.main_repository())[k::e_interface()]->begin_profiles()),
+ p_end((*env.main_repository())[k::e_interface()]->end_profiles()) ; p != p_end ; ++p)
{
- env.main_repository()->e_interface->set_profile(p);
- return_code |= display_default_system_resolution(env, p->arch + "." + p->status, p->path);
+ (*env.main_repository())[k::e_interface()]->set_profile(p);
+ return_code |= display_default_system_resolution(env, (*p)[k::arch()] + "." + (*p)[k::status()], (*p)[k::path()]);
}
}
else
@@ -138,12 +138,12 @@ int do_display_default_system_resolution(NoConfigEnvironment & env)
i_end(CommandLine::get_instance()->a_profile.end_args()) ; i != i_end ; ++i)
{
RepositoryEInterface::ProfilesConstIterator
- p(env.main_repository()->e_interface->find_profile(
+ p((*env.main_repository())[k::e_interface()]->find_profile(
env.main_repository_dir() / "profiles" / (*i)));
- if (p == env.main_repository()->e_interface->end_profiles())
+ if (p == (*env.main_repository())[k::e_interface()]->end_profiles())
throw ConfigurationError("Repository does not have a profile listed in profiles.desc matching '"
+ stringify(*i) + "'");
- env.main_repository()->e_interface->set_profile(p);
+ (*env.main_repository())[k::e_interface()]->set_profile(p);
return_code |= display_default_system_resolution(env, *i, env.main_repository_dir()
/ "profiles" / *i);
}
diff --git a/src/clients/adjutrix/downgrade_check.cc b/src/clients/adjutrix/downgrade_check.cc
index 2e60580ef..3bcdff710 100644
--- a/src/clients/adjutrix/downgrade_check.cc
+++ b/src/clients/adjutrix/downgrade_check.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 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
@@ -74,7 +74,7 @@ namespace
make_filename(const RepositoryEInterface::ProfilesConstIterator & p, bool unstable)
{
std::string result;
- FSEntry f(p->path);
+ FSEntry f((*p)[k::path()]);
while (f.basename() != "profiles" && f != FSEntry("/"))
{
result = f.basename() + (result.empty() ? "" : "_" + result);
@@ -90,7 +90,7 @@ namespace
make_desc(const RepositoryEInterface::ProfilesConstIterator & p, bool unstable)
{
std::string result;
- FSEntry f(p->path);
+ FSEntry f((*p)[k::path()]);
while (f.basename() != "profiles" && f != FSEntry("/"))
{
result = f.basename() + (result.empty() ? "" : "/" + result);
@@ -167,13 +167,13 @@ do_build_downgrade_check_list(NoConfigEnvironment & env)
throw ConfigurationError("Output directory already exists");
for (RepositoryEInterface::ProfilesConstIterator
- p(env.main_repository()->e_interface->begin_profiles()),
- p_end(env.main_repository()->e_interface->end_profiles()) ; p != p_end ; ++p)
+ p((*env.main_repository())[k::e_interface()]->begin_profiles()),
+ p_end((*env.main_repository())[k::e_interface()]->end_profiles()) ; p != p_end ; ++p)
{
for (int i = 0 ; i < 2 ; ++i)
{
env.set_accept_unstable(i);
- env.main_repository()->e_interface->set_profile(p);
+ (*env.main_repository())[k::e_interface()]->set_profile(p);
std::string n(make_filename(p, i));
std::cerr << "Generating " << n << "..." << std::endl;
std::ofstream f(stringify(output_dir / n).c_str());
@@ -200,13 +200,13 @@ do_downgrade_check(NoConfigEnvironment & env)
std::multimap<QPNS, std::string> results;
for (RepositoryEInterface::ProfilesConstIterator
- p(env.main_repository()->e_interface->begin_profiles()),
- p_end(env.main_repository()->e_interface->end_profiles()) ; p != p_end ; ++p)
+ p((*env.main_repository())[k::e_interface()]->begin_profiles()),
+ p_end((*env.main_repository())[k::e_interface()]->end_profiles()) ; p != p_end ; ++p)
{
for (int i = 0 ; i < 2 ; ++i)
{
env.set_accept_unstable(i);
- env.main_repository()->e_interface->set_profile(p);
+ (*env.main_repository())[k::e_interface()]->set_profile(p);
std::string n(make_filename(p, i)), desc(make_desc(p, i));
if ((before_dir / n).exists() && (after_dir / n).exists())
diff --git a/src/clients/adjutrix/find_insecure_packages.cc b/src/clients/adjutrix/find_insecure_packages.cc
index 0b26760e9..290253508 100644
--- a/src/clients/adjutrix/find_insecure_packages.cc
+++ b/src/clients/adjutrix/find_insecure_packages.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 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
@@ -158,12 +158,12 @@ void do_find_insecure_packages(const NoConfigEnvironment & env)
if (env.master_repository() && r->name() == env.master_repository()->name())
continue;
- if (! r->sets_interface)
+ if (! (*r)[k::sets_interface()])
continue;
write_repository_header(r->name());
- tr1::shared_ptr<const SetSpecTree::ConstItem> all_insecure(r->sets_interface->package_set(SetName("insecurity")));
+ tr1::shared_ptr<const SetSpecTree::ConstItem> all_insecure((*r)[k::sets_interface()]->package_set(SetName("insecurity")));
if (! all_insecure)
continue;
ListInsecureVisitor v(env);
diff --git a/src/clients/adjutrix/find_unused_packages.cc b/src/clients/adjutrix/find_unused_packages.cc
index ae60b2182..04d52c1d4 100644
--- a/src/clients/adjutrix/find_unused_packages.cc
+++ b/src/clients/adjutrix/find_unused_packages.cc
@@ -51,7 +51,7 @@ void do_find_unused_packages(const NoConfigEnvironment & env)
if (env.master_repository() && r->name() == env.master_repository()->name())
continue;
- if (! r->use_interface)
+ if (! (*r)[k::use_interface()])
continue;
Context repo_context("When searching for unused packages in repository '" + stringify(r->name()) + "':");
diff --git a/src/clients/adjutrix/keywords_graph.cc b/src/clients/adjutrix/keywords_graph.cc
index 466f6f708..e309c7de9 100644
--- a/src/clients/adjutrix/keywords_graph.cc
+++ b/src/clients/adjutrix/keywords_graph.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 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
@@ -80,10 +80,10 @@ namespace
if (packages->empty())
return;
- if (! repo.use_interface)
+ if (! repo[k::use_interface()])
throw InternalError(PALUDIS_HERE, "Repository has no use_interface");
- tr1::shared_ptr<const UseFlagNameSet> arch_flags(repo.use_interface->arch_flags());
+ tr1::shared_ptr<const UseFlagNameSet> arch_flags(repo[k::use_interface()]->arch_flags());
if (arch_flags->empty())
return;
diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc
index 0fe4e4fa5..2a442b2cc 100644
--- a/src/clients/adjutrix/what_needs_keywording.cc
+++ b/src/clients/adjutrix/what_needs_keywording.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 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
@@ -68,7 +68,7 @@ int do_what_needs_keywording(NoConfigEnvironment & env)
UseFlagName target_arch(strip_leading_string(
*CommandLine::get_instance()->begin_parameters(), "~"));
- env.main_repository()->e_interface->set_profile_by_arch(target_arch);
+ (*env.main_repository())[k::e_interface()]->set_profile_by_arch(target_arch);
env.set_accept_unstable('~' == stringify(target_keyword).at(0));
DepListOptions d_options;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/repository_buttons.cc b/src/clients/gtkpaludis/libgtkpaludis/repository_buttons.cc
index 2a63ca1b0..b38f1061f 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/repository_buttons.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/repository_buttons.cc
@@ -65,7 +65,7 @@ RepositoryButtons::set_repository_in_paludis_thread(const RepositoryName & name)
{
_imp->main_window->gui_thread_action(
sigc::bind(sigc::mem_fun(this, &RepositoryButtons::set_repository_in_gui_thread),
- 0 != _imp->main_window->environment()->package_database()->fetch_repository(name)->syncable_interface));
+ 0 != (*_imp->main_window->environment()->package_database()->fetch_repository(name))[k::syncable_interface()]));
}
void
diff --git a/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
index eed33df25..8827753f5 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
@@ -62,7 +62,7 @@ SetsListModel::populate_in_paludis_thread()
for (RepositoryNameSequence::ConstIterator r(repos->begin()), r_end(repos->end()) ;
r != r_end ; ++r)
{
- RepositorySetsInterface * const i(_imp->main_window->environment()->package_database()->fetch_repository(*r)->sets_interface);
+ RepositorySetsInterface * const i((*_imp->main_window->environment()->package_database()->fetch_repository(*r))[k::sets_interface()]);
if (i)
{
tr1::shared_ptr<const SetNameSet> sets(i->sets_list());
@@ -77,7 +77,7 @@ SetsListModel::populate_in_paludis_thread()
r_end(indirect_iterator(_imp->main_window->environment()->package_database()->end_repositories())) ;
r != r_end ; ++r)
{
- RepositorySetsInterface * const i(r->sets_interface);
+ RepositorySetsInterface * const i((*r)[k::sets_interface()]);
if (i)
{
tr1::shared_ptr<const SetNameSet> sets(i->sets_list());
diff --git a/src/clients/paludis/applets.cc b/src/clients/paludis/applets.cc
index 05b57b675..a38253276 100644
--- a/src/clients/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -287,7 +287,7 @@ int do_environment_variable(tr1::shared_ptr<Environment> env)
if (entries->empty())
throw NoSuchPackageError(spec_str);
- RepositoryEnvironmentVariableInterface * env_if((*entries->last())->repository()->environment_variable_interface);
+ RepositoryEnvironmentVariableInterface * env_if((*(*entries->last())->repository())[k::environment_variable_interface()]);
if (! env_if)
{
diff --git a/src/clients/paludis/list.cc b/src/clients/paludis/list.cc
index a0a347353..84452d110 100644
--- a/src/clients/paludis/list.cc
+++ b/src/clients/paludis/list.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 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
@@ -201,7 +201,7 @@ do_list_sets(tr1::shared_ptr<Environment> env)
r(env->package_database()->begin_repositories()), r_end(env->package_database()->end_repositories()) ;
r != r_end ; ++r)
{
- if (r->sets_interface == 0)
+ if ((*r)[k::sets_interface()] == 0)
continue;
if (CommandLine::get_instance()->a_repository.specified())
@@ -217,7 +217,7 @@ do_list_sets(tr1::shared_ptr<Environment> env)
r->format_key() ? r->format_key()->value() : "?"))
continue;
- tr1::shared_ptr<const SetNameSet> set_names(r->sets_interface->sets_list());
+ tr1::shared_ptr<const SetNameSet> set_names((*r)[k::sets_interface()]->sets_list());
for (SetNameSet::ConstIterator s(set_names->begin()), s_end(set_names->end()) ;
s != s_end ; ++s)
sets[*s].push_back(stringify(r->name()));
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index 416fefa0d..bfc9484c5 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -337,13 +337,13 @@ int main(int argc, char *argv[])
.extra_params(tr1::shared_ptr<Map<std::string, std::string> >())
));
- if (! env->main_repository()->qa_interface)
+ if (! (*env->main_repository())[k::qa_interface()])
throw ConfigurationError("Repository '" + stringify(env->main_repository()->name()) + "' does not support QA checks");
QualudisReporter r(QualudisCommandLine::get_instance()->a_show_associated_keys.argument());
if (QualudisCommandLine::get_instance()->empty())
{
- env->main_repository()->qa_interface->check_qa(
+ (*env->main_repository())[k::qa_interface()]->check_qa(
r,
QACheckProperties(),
QACheckProperties(),
@@ -355,7 +355,7 @@ int main(int argc, char *argv[])
for (QualudisCommandLine::ParametersConstIterator c(QualudisCommandLine::get_instance()->begin_parameters()),
c_end(QualudisCommandLine::get_instance()->end_parameters()) ;
c != c_end ; ++c)
- env->main_repository()->qa_interface->check_qa(
+ (*env->main_repository())[k::qa_interface()]->check_qa(
r,
QACheckProperties(),
QACheckProperties(),
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index 52318351b..949054a20 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -1127,7 +1127,7 @@ ConsoleInstallTask::_add_descriptions(tr1::shared_ptr<const UseFlagNameSet> c,
f != f_end ; ++f)
{
std::string d;
- const RepositoryUseInterface * const i(p->repository()->use_interface);
+ const RepositoryUseInterface * const i((*p->repository())[k::use_interface()]);
if (i)
d = i->describe_use_flag(*f, *p);