aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/fake
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 /paludis/repositories/fake
parent690aca7a8de4bf9b682be59abbed08a8d12a21d8 (diff)
downloadpaludis-981dd553a590eff046d49bccd06f2cb61963edee.tar.gz
paludis-981dd553a590eff046d49bccd06f2cb61963edee.tar.xz
More sr -> kc
Diffstat (limited to 'paludis/repositories/fake')
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc36
-rw-r--r--paludis/repositories/fake/fake_package_id.cc8
-rw-r--r--paludis/repositories/fake/fake_repository.cc60
3 files changed, 52 insertions, 52 deletions
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index be66ce9f9..29cb158bc 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -53,21 +53,21 @@ namespace paludis
}
FakeInstalledRepository::FakeInstalledRepository(const Environment * const e, const RepositoryName & our_name) :
- FakeRepositoryBase(e, our_name, RepositoryCapabilities::create()
- .sets_interface(this)
- .syncable_interface(0)
- .use_interface(this)
- .world_interface(0)
- .mirrors_interface(0)
- .environment_variable_interface(0)
- .provides_interface(this)
- .virtuals_interface(0)
- .destination_interface(this)
- .e_interface(0)
- .make_virtuals_interface(0)
- .qa_interface(0)
- .hook_interface(0)
- .manifest_interface(0),
+ FakeRepositoryBase(e, our_name, RepositoryCapabilities::named_create()
+ (k::sets_interface(), this)
+ (k::syncable_interface(), static_cast<RepositorySyncableInterface *>(0))
+ (k::use_interface(), this)
+ (k::world_interface(), static_cast<RepositoryWorldInterface *>(0))
+ (k::mirrors_interface(), static_cast<RepositoryMirrorsInterface *>(0))
+ (k::environment_variable_interface(), static_cast<RepositoryEnvironmentVariableInterface *>(0))
+ (k::provides_interface(), this)
+ (k::virtuals_interface(), static_cast<RepositoryVirtualsInterface *>(0))
+ (k::destination_interface(), this)
+ (k::e_interface(), static_cast<RepositoryEInterface *>(0))
+ (k::make_virtuals_interface(), static_cast<RepositoryMakeVirtualsInterface *>(0))
+ (k::qa_interface(), static_cast<RepositoryQAInterface *>(0))
+ (k::hook_interface(), static_cast<RepositoryHookInterface *>(0))
+ (k::manifest_interface(), static_cast<RepositoryManifestInterface *>(0)),
"0"),
PrivateImplementationPattern<FakeInstalledRepository>(new Implementation<FakeInstalledRepository>),
_imp(PrivateImplementationPattern<FakeInstalledRepository>::_imp)
@@ -110,9 +110,9 @@ FakeInstalledRepository::provided_packages() const
(*v)->provide_key()->value()->accept(f);
for (DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIterator q(f.begin()), q_end(f.end()) ; q != q_end ; ++q)
- result->push_back(RepositoryProvidesEntry::create()
- .virtual_name(QualifiedPackageName((*q)->text()))
- .provided_by(*v));
+ result->push_back(RepositoryProvidesEntry::named_create()
+ (k::virtual_name(), QualifiedPackageName((*q)->text()))
+ (k::provided_by(), *v));
}
}
}
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index eaffb75e9..e8dfb7a1e 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -964,9 +964,9 @@ FakeMetadataIUseSetKey::pretty_print_flat(const Formatter<IUseFlag> & f) const
if (! result.empty())
result.append(" ");
- if (_imp->id->repository()->use_interface && _imp->id->repository()->use_interface->query_use_mask(i->flag, *_imp->id))
+ if ((*_imp->id->repository())[k::use_interface()] && (*_imp->id->repository())[k::use_interface()]->query_use_mask(i->flag, *_imp->id))
result.append(f.format(*i, format::Masked()));
- else if (_imp->id->repository()->use_interface && _imp->id->repository()->use_interface->query_use_force(i->flag, *_imp->id))
+ else if ((*_imp->id->repository())[k::use_interface()] && (*_imp->id->repository())[k::use_interface()]->query_use_force(i->flag, *_imp->id))
result.append(f.format(*i, format::Forced()));
else if (_imp->env->query_use(i->flag, *_imp->id))
result.append(f.format(*i, format::Enabled()));
@@ -993,12 +993,12 @@ FakeMetadataIUseSetKey::pretty_print_flat_with_comparison(
std::string l;
bool n;
- if (_imp->id->repository()->use_interface && _imp->id->repository()->use_interface->query_use_mask(i->flag, *_imp->id))
+ if ((*_imp->id->repository())[k::use_interface()] && (*_imp->id->repository())[k::use_interface()]->query_use_mask(i->flag, *_imp->id))
{
l = f.format(*i, format::Masked());
n = false;
}
- else if (_imp->id->repository()->use_interface && _imp->id->repository()->use_interface->query_use_force(i->flag, *_imp->id))
+ else if ((*_imp->id->repository())[k::use_interface()] && (*_imp->id->repository())[k::use_interface()]->query_use_force(i->flag, *_imp->id))
{
l = f.format(*i, format::Forced());
n = true;
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index 35d092ba3..c62704807 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -60,22 +60,22 @@ namespace paludis
FakeRepository::FakeRepository(const Environment * const e, const RepositoryName & our_name) :
PrivateImplementationPattern<FakeRepository>(new Implementation<FakeRepository>),
- FakeRepositoryBase(e, our_name, RepositoryCapabilities::create()
- .sets_interface(this)
- .syncable_interface(0)
- .use_interface(this)
- .world_interface(0)
- .mirrors_interface(this)
- .environment_variable_interface(0)
- .provides_interface(0)
- .virtuals_interface((*DistributionData::get_instance()->distribution_from_string(
+ FakeRepositoryBase(e, our_name, RepositoryCapabilities::named_create()
+ (k::sets_interface(), this)
+ (k::syncable_interface(), static_cast<RepositorySyncableInterface *>(0))
+ (k::use_interface(), this)
+ (k::world_interface(), static_cast<RepositoryWorldInterface *>(0))
+ (k::mirrors_interface(), this)
+ (k::environment_variable_interface(), static_cast<RepositoryEnvironmentVariableInterface *>(0))
+ (k::provides_interface(), static_cast<RepositoryProvidesInterface *>(0))
+ (k::virtuals_interface(), (*DistributionData::get_instance()->distribution_from_string(
e->default_distribution()))[k::support_old_style_virtuals()] ? this : 0)
- .destination_interface(0)
- .e_interface(0)
- .make_virtuals_interface(0)
- .qa_interface(0)
- .hook_interface(0)
- .manifest_interface(0),
+ (k::destination_interface(), static_cast<RepositoryDestinationInterface *>(0))
+ (k::e_interface(), static_cast<RepositoryEInterface *>(0))
+ (k::make_virtuals_interface(), static_cast<RepositoryMakeVirtualsInterface *>(0))
+ (k::qa_interface(), static_cast<RepositoryQAInterface *>(0))
+ (k::hook_interface(), static_cast<RepositoryHookInterface *>(0))
+ (k::manifest_interface(), static_cast<RepositoryManifestInterface *>(0)),
"0"),
_imp(PrivateImplementationPattern<FakeRepository>::_imp)
{
@@ -84,22 +84,22 @@ FakeRepository::FakeRepository(const Environment * const e, const RepositoryName
FakeRepository::FakeRepository(const FakeRepositoryParams & params) :
PrivateImplementationPattern<FakeRepository>(new Implementation<FakeRepository>),
- FakeRepositoryBase(params.environment, params.name, RepositoryCapabilities::create()
- .sets_interface(this)
- .syncable_interface(0)
- .use_interface(this)
- .world_interface(0)
- .mirrors_interface(this)
- .environment_variable_interface(0)
- .provides_interface(0)
- .virtuals_interface((*DistributionData::get_instance()->distribution_from_string(
+ FakeRepositoryBase(params.environment, params.name, RepositoryCapabilities::named_create()
+ (k::sets_interface(), this)
+ (k::syncable_interface(), static_cast<RepositorySyncableInterface *>(0))
+ (k::use_interface(), this)
+ (k::world_interface(), static_cast<RepositoryWorldInterface *>(0))
+ (k::mirrors_interface(), this)
+ (k::environment_variable_interface(), static_cast<RepositoryEnvironmentVariableInterface *>(0))
+ (k::provides_interface(), static_cast<RepositoryProvidesInterface *>(0))
+ (k::virtuals_interface(), (*DistributionData::get_instance()->distribution_from_string(
params.environment->default_distribution()))[k::support_old_style_virtuals()] ? this : 0)
- .destination_interface(0)
- .e_interface(0)
- .make_virtuals_interface(0)
- .qa_interface(0)
- .hook_interface(0)
- .manifest_interface(0),
+ (k::destination_interface(), static_cast<RepositoryDestinationInterface *>(0))
+ (k::e_interface(), static_cast<RepositoryEInterface *>(0))
+ (k::make_virtuals_interface(), static_cast<RepositoryMakeVirtualsInterface *>(0))
+ (k::qa_interface(), static_cast<RepositoryQAInterface *>(0))
+ (k::hook_interface(), static_cast<RepositoryHookInterface *>(0))
+ (k::manifest_interface(), static_cast<RepositoryManifestInterface *>(0)),
params.eapi),
_imp(PrivateImplementationPattern<FakeRepository>::_imp)
{