aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-23 08:54:11 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-23 08:54:11 +0100
commitdd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a (patch)
treeba2da539f103634b8ddb52a477bbace3b4a52c57 /paludis/repositories
parent4209b95ecc83365718b3dd5556a6866a662e95c5 (diff)
downloadpaludis-dd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a.tar.gz
paludis-dd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a.tar.xz
PrivateImplementationPattern -> Pimp, Implementation -> Imp
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.cc8
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.hh4
-rw-r--r--paludis/repositories/accounts/accounts_id.cc10
-rw-r--r--paludis/repositories/accounts/accounts_id.hh6
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc22
-rw-r--r--paludis/repositories/accounts/accounts_repository.hh6
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.cc10
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.hh6
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.cc12
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.hh6
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc20
-rw-r--r--paludis/repositories/cran/cran_installed_repository.hh6
-rw-r--r--paludis/repositories/cran/cran_package_id.cc16
-rw-r--r--paludis/repositories/cran/cran_package_id.hh4
-rw-r--r--paludis/repositories/cran/cran_repository.cc18
-rw-r--r--paludis/repositories/cran/cran_repository.hh6
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.cc8
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.hh4
-rw-r--r--paludis/repositories/cran/description_file.cc6
-rw-r--r--paludis/repositories/cran/description_file.hh2
-rw-r--r--paludis/repositories/cran/keys.cc8
-rw-r--r--paludis/repositories/cran/keys.hh4
-rw-r--r--paludis/repositories/cran/masks.cc8
-rw-r--r--paludis/repositories/cran/masks.hh4
-rw-r--r--paludis/repositories/e/aa_visitor.cc8
-rw-r--r--paludis/repositories/e/aa_visitor.hh4
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.cc8
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.hh4
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.cc10
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.hh2
-rw-r--r--paludis/repositories/e/dependencies_rewriter.cc8
-rw-r--r--paludis/repositories/e/dependencies_rewriter.hh4
-rw-r--r--paludis/repositories/e/e_choices_key.cc8
-rw-r--r--paludis/repositories/e/e_choices_key.hh2
-rw-r--r--paludis/repositories/e/e_installed_repository.cc10
-rw-r--r--paludis/repositories/e/e_installed_repository.hh4
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc10
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh4
-rw-r--r--paludis/repositories/e/e_key.cc74
-rw-r--r--paludis/repositories/e/e_key.hh24
-rw-r--r--paludis/repositories/e/e_mask.cc20
-rw-r--r--paludis/repositories/e/e_mask.hh8
-rw-r--r--paludis/repositories/e/e_repository.cc24
-rw-r--r--paludis/repositories/e/e_repository.hh6
-rw-r--r--paludis/repositories/e/e_repository_mask_file.cc6
-rw-r--r--paludis/repositories/e/e_repository_mask_file.hh4
-rw-r--r--paludis/repositories/e/e_repository_news.cc16
-rw-r--r--paludis/repositories/e/e_repository_news.hh6
-rw-r--r--paludis/repositories/e/e_repository_sets.cc10
-rw-r--r--paludis/repositories/e/e_repository_sets.hh2
-rw-r--r--paludis/repositories/e/e_stripper.cc10
-rw-r--r--paludis/repositories/e/e_stripper.hh4
-rw-r--r--paludis/repositories/e/eapi.cc14
-rw-r--r--paludis/repositories/e/eapi.hh6
-rw-r--r--paludis/repositories/e/eapi_phase.cc10
-rw-r--r--paludis/repositories/e/eapi_phase.hh6
-rw-r--r--paludis/repositories/e/ebuild.cc2
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc12
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.hh6
-rw-r--r--paludis/repositories/e/ebuild_id.cc10
-rw-r--r--paludis/repositories/e/ebuild_id.hh4
-rw-r--r--paludis/repositories/e/eclass_mtimes.cc8
-rw-r--r--paludis/repositories/e/eclass_mtimes.hh4
-rw-r--r--paludis/repositories/e/exheres_layout.cc8
-rw-r--r--paludis/repositories/e/exheres_layout.hh4
-rw-r--r--paludis/repositories/e/exheres_profile.cc8
-rw-r--r--paludis/repositories/e/exheres_profile.hh2
-rw-r--r--paludis/repositories/e/exndbam_repository.cc12
-rw-r--r--paludis/repositories/e/exndbam_repository.hh6
-rw-r--r--paludis/repositories/e/fetch_visitor.cc8
-rw-r--r--paludis/repositories/e/fetch_visitor.hh4
-rw-r--r--paludis/repositories/e/glsa.cc12
-rw-r--r--paludis/repositories/e/glsa.hh6
-rw-r--r--paludis/repositories/e/info_metadata_key.cc20
-rw-r--r--paludis/repositories/e/info_metadata_key.hh12
-rw-r--r--paludis/repositories/e/manifest2_reader.cc8
-rw-r--r--paludis/repositories/e/manifest2_reader.hh2
-rw-r--r--paludis/repositories/e/memoised_hashes.cc10
-rw-r--r--paludis/repositories/e/memoised_hashes.hh6
-rw-r--r--paludis/repositories/e/metadata_xml.cc8
-rw-r--r--paludis/repositories/e/metadata_xml.hh6
-rw-r--r--paludis/repositories/e/myoptions_requirements_verifier.cc10
-rw-r--r--paludis/repositories/e/myoptions_requirements_verifier.hh6
-rw-r--r--paludis/repositories/e/pretend_fetch_visitor.cc8
-rw-r--r--paludis/repositories/e/pretend_fetch_visitor.hh4
-rw-r--r--paludis/repositories/e/profile_file.cc10
-rw-r--r--paludis/repositories/e/profile_file.hh4
-rw-r--r--paludis/repositories/e/source_uri_finder.cc8
-rw-r--r--paludis/repositories/e/source_uri_finder.hh4
-rw-r--r--paludis/repositories/e/traditional_layout.cc8
-rw-r--r--paludis/repositories/e/traditional_layout.hh4
-rw-r--r--paludis/repositories/e/traditional_profile.cc36
-rw-r--r--paludis/repositories/e/traditional_profile.hh2
-rw-r--r--paludis/repositories/e/use_desc.cc8
-rw-r--r--paludis/repositories/e/use_desc.hh4
-rw-r--r--paludis/repositories/e/vdb_merger.cc10
-rw-r--r--paludis/repositories/e/vdb_merger.hh6
-rw-r--r--paludis/repositories/e/vdb_repository.cc18
-rw-r--r--paludis/repositories/e/vdb_repository.hh6
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc10
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh6
-rw-r--r--paludis/repositories/e/xml_things_handle.cc10
-rw-r--r--paludis/repositories/e/xml_things_handle.hh6
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc10
-rw-r--r--paludis/repositories/fake/fake_installed_repository.hh4
-rw-r--r--paludis/repositories/fake/fake_package_id.cc64
-rw-r--r--paludis/repositories/fake/fake_package_id.hh30
-rw-r--r--paludis/repositories/fake/fake_repository.cc10
-rw-r--r--paludis/repositories/fake/fake_repository.hh4
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc14
-rw-r--r--paludis/repositories/fake/fake_repository_base.hh6
-rw-r--r--paludis/repositories/gems/gem_specification.cc18
-rw-r--r--paludis/repositories/gems/gem_specification.hh6
-rw-r--r--paludis/repositories/gems/gem_specifications.cc14
-rw-r--r--paludis/repositories/gems/gem_specifications.hh4
-rw-r--r--paludis/repositories/gems/gems_repository.cc12
-rw-r--r--paludis/repositories/gems/gems_repository.hh6
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc12
-rw-r--r--paludis/repositories/gems/installed_gems_repository.hh6
-rw-r--r--paludis/repositories/gems/yaml.cc30
-rw-r--r--paludis/repositories/gems/yaml.hh12
-rw-r--r--paludis/repositories/repository/repository_id.cc14
-rw-r--r--paludis/repositories/repository/repository_id.hh4
-rw-r--r--paludis/repositories/repository/repository_repository.cc14
-rw-r--r--paludis/repositories/repository/repository_repository.hh8
-rw-r--r--paludis/repositories/repository/repository_repository_store.cc10
-rw-r--r--paludis/repositories/repository/repository_repository_store.hh6
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc12
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.hh4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.cc14
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.hh8
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc8
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_file.cc10
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_file.hh6
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc12
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.hh4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_store.cc10
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_store.hh6
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc12
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh6
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc12
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc10
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.cc14
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.cc12
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.cc10
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.hh4
-rw-r--r--paludis/repositories/unwritten/unwritten_id.cc12
-rw-r--r--paludis/repositories/unwritten/unwritten_id.hh4
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.cc14
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.hh8
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.cc8
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.hh6
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_store.cc10
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_store.hh6
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc12
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh4
-rw-r--r--paludis/repositories/virtuals/package_id.cc18
-rw-r--r--paludis/repositories/virtuals/package_id.hh10
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc12
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh4
165 files changed, 782 insertions, 782 deletions
diff --git a/paludis/repositories/accounts/accounts_dep_key.cc b/paludis/repositories/accounts/accounts_dep_key.cc
index 702ea4dcc..dc8d8d9cf 100644
--- a/paludis/repositories/accounts/accounts_dep_key.cc
+++ b/paludis/repositories/accounts/accounts_dep_key.cc
@@ -28,7 +28,7 @@
#include <paludis/dep_spec.hh>
#include <paludis/formatter.hh>
#include <paludis/environment.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <sstream>
#include <list>
@@ -38,14 +38,14 @@ using namespace paludis::accounts_repository;
namespace paludis
{
template <>
- struct Implementation<AccountsDepKey>
+ struct Imp<AccountsDepKey>
{
const Environment * const env;
const std::shared_ptr<std::list<std::shared_ptr<PackageDepSpec> > > specs;
const std::shared_ptr<DependencySpecTree> tree;
const std::shared_ptr<DependenciesLabelSequence> initial_labels;
- Implementation(const Environment * const e, const std::shared_ptr<const Set<std::string> > & s) :
+ Imp(const Environment * const e, const std::shared_ptr<const Set<std::string> > & s) :
env(e),
specs(new std::list<std::shared_ptr<PackageDepSpec> >),
tree(new DependencySpecTree(std::make_shared<AllDepSpec>())),
@@ -68,7 +68,7 @@ namespace paludis
AccountsDepKey::AccountsDepKey(const Environment * const e,
const std::shared_ptr<const Set<std::string> > & s) :
- PrivateImplementationPattern<AccountsDepKey>(e, s)
+ Pimp<AccountsDepKey>(e, s)
{
}
diff --git a/paludis/repositories/accounts/accounts_dep_key.hh b/paludis/repositories/accounts/accounts_dep_key.hh
index 839f37c60..b31cdc2c8 100644
--- a/paludis/repositories/accounts/accounts_dep_key.hh
+++ b/paludis/repositories/accounts/accounts_dep_key.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_ACCOUNTS_DEP_KEY_HH 1
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -29,7 +29,7 @@ namespace paludis
{
class AccountsDepKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<AccountsDepKey>
+ private Pimp<AccountsDepKey>
{
public:
AccountsDepKey(const Environment * const e,
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index 77b67a759..860948370 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/accounts/accounts_id.hh>
#include <paludis/repositories/accounts/accounts_dep_key.hh>
#include <paludis/repositories/accounts/accounts_installed_mask.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/options.hh>
#include <paludis/util/stringify.hh>
@@ -46,7 +46,7 @@ using namespace paludis::accounts_repository;
namespace paludis
{
template <>
- struct Implementation<AccountsID>
+ struct Imp<AccountsID>
{
const Environment * const env;
@@ -76,7 +76,7 @@ namespace paludis
mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > groupname_key;
mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > preferred_gid_key;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & f,
const FSEntry & l, const bool u, const bool m) :
@@ -99,8 +99,8 @@ AccountsID::AccountsID(const Environment * const e,
const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & f, const FSEntry & l,
const bool u, const bool m) :
- PrivateImplementationPattern<AccountsID>(e, q, r, f, l, u, m),
- _imp(PrivateImplementationPattern<AccountsID>::_imp)
+ Pimp<AccountsID>(e, q, r, f, l, u, m),
+ _imp(Pimp<AccountsID>::_imp)
{
if (_imp->mask)
add_mask(_imp->mask);
diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh
index 0740cac62..f163a9e86 100644
--- a/paludis/repositories/accounts/accounts_id.hh
+++ b/paludis/repositories/accounts/accounts_id.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_ACCOUNTS_ID_HH 1
#include <paludis/package_id.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -31,11 +31,11 @@ namespace paludis
class AccountsID :
public PackageID,
- private PrivateImplementationPattern<AccountsID>,
+ private Pimp<AccountsID>,
public std::enable_shared_from_this<AccountsID>
{
private:
- PrivateImplementationPattern<AccountsID>::ImpPtr & _imp;
+ Pimp<AccountsID>::ImpPtr & _imp;
void _add_metadata_keys() const;
void _need_file_keys() const;
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index 2335a9853..a0367bb43 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/accounts/accounts_repository_store.hh>
#include <paludis/repositories/accounts/dummy_accounts_handler.hh>
#include <paludis/repositories/accounts/passwd_accounts_handler.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/set.hh>
#include <paludis/util/active_object_ptr.hh>
@@ -72,7 +72,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<AccountsRepository>
+ struct Imp<AccountsRepository>
{
const std::shared_ptr<const AccountsRepositoryParams> params_if_not_installed;
const std::shared_ptr<const InstalledAccountsRepositoryParams> params_if_installed;
@@ -84,7 +84,7 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > > store;
- Implementation(AccountsRepository * const repo, const AccountsRepositoryParams & p) :
+ Imp(AccountsRepository * const repo, const AccountsRepositoryParams & p) :
params_if_not_installed(new AccountsRepositoryParams(p)),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format", mkt_significant, "accounts")),
store(DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > (
@@ -92,7 +92,7 @@ namespace paludis
{
}
- Implementation(AccountsRepository * const repo, const InstalledAccountsRepositoryParams & p) :
+ Imp(AccountsRepository * const repo, const InstalledAccountsRepositoryParams & p) :
params_if_installed(new InstalledAccountsRepositoryParams(p)),
handler_if_installed(make_handler(p.handler())),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format", mkt_significant, "installed-accounts")),
@@ -106,7 +106,7 @@ namespace paludis
}
AccountsRepository::AccountsRepository(const AccountsRepositoryParams & p) :
- PrivateImplementationPattern<AccountsRepository>(this, p),
+ Pimp<AccountsRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -118,13 +118,13 @@ AccountsRepository::AccountsRepository(const AccountsRepositoryParams & p) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<AccountsRepository>::_imp)
+ _imp(Pimp<AccountsRepository>::_imp)
{
_add_metadata_keys();
}
AccountsRepository::AccountsRepository(const InstalledAccountsRepositoryParams & p) :
- PrivateImplementationPattern<AccountsRepository>(this, p),
+ Pimp<AccountsRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -136,7 +136,7 @@ AccountsRepository::AccountsRepository(const InstalledAccountsRepositoryParams &
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<AccountsRepository>::_imp)
+ _imp(Pimp<AccountsRepository>::_imp)
{
_add_metadata_keys();
}
@@ -275,9 +275,9 @@ void
AccountsRepository::invalidate()
{
if (_imp->params_if_not_installed)
- _imp.reset(new Implementation<AccountsRepository>(this, *_imp->params_if_not_installed));
+ _imp.reset(new Imp<AccountsRepository>(this, *_imp->params_if_not_installed));
else
- _imp.reset(new Implementation<AccountsRepository>(this, *_imp->params_if_installed));
+ _imp.reset(new Imp<AccountsRepository>(this, *_imp->params_if_installed));
_add_metadata_keys();
}
@@ -458,5 +458,5 @@ AccountsRepository::accept_keywords_key() const
return make_null_shared_ptr();
}
-template class PrivateImplementationPattern<AccountsRepository>;
+template class Pimp<AccountsRepository>;
diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh
index 133a03dbc..6fb8d1821 100644
--- a/paludis/repositories/accounts/accounts_repository.hh
+++ b/paludis/repositories/accounts/accounts_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/named_value.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/repository.hh>
namespace paludis
@@ -53,13 +53,13 @@ namespace paludis
};
class PALUDIS_VISIBLE AccountsRepository :
- private PrivateImplementationPattern<AccountsRepository>,
+ private Pimp<AccountsRepository>,
public Repository,
public RepositoryDestinationInterface,
public std::enable_shared_from_this<AccountsRepository>
{
private:
- PrivateImplementationPattern<AccountsRepository>::ImpPtr & _imp;
+ Pimp<AccountsRepository>::ImpPtr & _imp;
void _add_metadata_keys();
diff --git a/paludis/repositories/accounts/accounts_repository_store.cc b/paludis/repositories/accounts/accounts_repository_store.cc
index ff9ba0cdb..72b16843b 100644
--- a/paludis/repositories/accounts/accounts_repository_store.cc
+++ b/paludis/repositories/accounts/accounts_repository_store.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/accounts/accounts_id.hh>
#include <paludis/repositories/accounts/installed_accounts_id.hh>
#include <paludis/repositories/accounts/accounts_exceptions.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -60,7 +60,7 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Implementation<AccountsRepositoryStore>
+ struct Imp<AccountsRepositoryStore>
{
const Environment * const env;
const AccountsRepository * const repo;
@@ -70,7 +70,7 @@ namespace paludis
mutable PackageNames package_names;
mutable IDs ids;
- Implementation(const Environment * const e, const AccountsRepository * const r, const bool i) :
+ Imp(const Environment * const e, const AccountsRepository * const r, const bool i) :
env(e),
repo(r),
installed(i),
@@ -86,7 +86,7 @@ AccountsRepositoryStore::AccountsRepositoryStore(
const Environment * const env,
const AccountsRepository * const repo,
const bool installed) :
- PrivateImplementationPattern<AccountsRepositoryStore>(env, repo, installed)
+ Pimp<AccountsRepositoryStore>(env, repo, installed)
{
_load(repo->shared_from_this());
}
@@ -315,5 +315,5 @@ AccountsRepositoryStore::package_ids(const QualifiedPackageName & p) const
return i->second;
}
-template class PrivateImplementationPattern<accounts_repository::AccountsRepositoryStore>;
+template class Pimp<accounts_repository::AccountsRepositoryStore>;
diff --git a/paludis/repositories/accounts/accounts_repository_store.hh b/paludis/repositories/accounts/accounts_repository_store.hh
index a192b9bce..1e4477a4e 100644
--- a/paludis/repositories/accounts/accounts_repository_store.hh
+++ b/paludis/repositories/accounts/accounts_repository_store.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_ACCOUNTS_REPOSITORY_STORE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_ACCOUNTS_REPOSITORY_STORE_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -36,7 +36,7 @@ namespace paludis
struct AccountsRepository;
class PALUDIS_VISIBLE AccountsRepositoryStore :
- private PrivateImplementationPattern<AccountsRepositoryStore>
+ private Pimp<AccountsRepositoryStore>
{
private:
void _load(const std::shared_ptr<const Repository> & repo);
@@ -94,7 +94,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<accounts_repository::AccountsRepositoryStore>;
+ extern template class Pimp<accounts_repository::AccountsRepositoryStore>;
}
#endif
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index 08eeea31c..ee9014914 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/accounts/installed_accounts_id.hh>
#include <paludis/repositories/accounts/accounts_dep_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/options.hh>
#include <paludis/util/stringify.hh>
@@ -49,7 +49,7 @@ using namespace paludis::accounts_repository;
namespace paludis
{
template <>
- struct Implementation<InstalledAccountsID>
+ struct Imp<InstalledAccountsID>
{
const Environment * const env;
@@ -65,7 +65,7 @@ namespace paludis
const bool is_user;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
const bool u) :
env(e),
@@ -91,12 +91,12 @@ namespace
}
}
-const std::shared_ptr<Set<std::string> > Implementation<InstalledAccountsID>::behaviours_set = make_behaviours();
+const std::shared_ptr<Set<std::string> > Imp<InstalledAccountsID>::behaviours_set = make_behaviours();
InstalledAccountsID::InstalledAccountsID(const Environment * const e,
const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r, const bool u) :
- PrivateImplementationPattern<InstalledAccountsID>(e, q, r, u),
- _imp(PrivateImplementationPattern<InstalledAccountsID>::_imp)
+ Pimp<InstalledAccountsID>(e, q, r, u),
+ _imp(Pimp<InstalledAccountsID>::_imp)
{
add_metadata_key(_imp->behaviours_key);
}
diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh
index 3b7192d52..1a5530234 100644
--- a/paludis/repositories/accounts/installed_accounts_id.hh
+++ b/paludis/repositories/accounts/installed_accounts_id.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_INSTALLED_ACCOUNTS_ID_HH 1
#include <paludis/package_id.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -31,11 +31,11 @@ namespace paludis
class InstalledAccountsID :
public PackageID,
- private PrivateImplementationPattern<InstalledAccountsID>,
+ private Pimp<InstalledAccountsID>,
public std::enable_shared_from_this<InstalledAccountsID>
{
private:
- PrivateImplementationPattern<InstalledAccountsID>::ImpPtr & _imp;
+ Pimp<InstalledAccountsID>::ImpPtr & _imp;
void _add_metadata_keys() const;
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index 1ae7bc249..f5644bc86 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -19,7 +19,7 @@
*/
#include <paludis/environment.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/dep_spec.hh>
#include <paludis/dep_tag.hh>
#include <paludis/util/config_file.hh>
@@ -65,15 +65,15 @@ typedef std::unordered_map<
namespace paludis
{
template <>
- struct Implementation<CRANInstalledRepository>
+ struct Imp<CRANInstalledRepository>
{
CRANInstalledRepositoryParams params;
mutable bool has_ids;
mutable IDMap ids;
- Implementation(const CRANInstalledRepositoryParams &);
- ~Implementation();
+ Imp(const CRANInstalledRepositoryParams &);
+ ~Imp();
std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key;
@@ -81,7 +81,7 @@ namespace paludis
};
}
-Implementation<CRANInstalledRepository>::Implementation(const CRANInstalledRepositoryParams & p) :
+Imp<CRANInstalledRepository>::Imp(const CRANInstalledRepositoryParams & p) :
params(p),
has_ids(false),
location_key(new LiteralMetadataValueKey<FSEntry> ("location", "location", mkt_significant, params.location())),
@@ -90,13 +90,13 @@ Implementation<CRANInstalledRepository>::Implementation(const CRANInstalledRepos
{
}
-Implementation<CRANInstalledRepository>::~Implementation()
+Imp<CRANInstalledRepository>::~Imp()
{
}
#if 0
void
-Implementation<CRANInstalledRepository>::need_ids() const
+Imp<CRANInstalledRepository>::need_ids() const
{
Context context("When loading CRANInstalledRepository IDs from '" + stringify(location) + "':");
@@ -170,8 +170,8 @@ CRANInstalledRepository::CRANInstalledRepository(const CRANInstalledRepositoryPa
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<CRANInstalledRepository>(p),
- _imp(PrivateImplementationPattern<CRANInstalledRepository>::_imp)
+ Pimp<CRANInstalledRepository>(p),
+ _imp(Pimp<CRANInstalledRepository>::_imp)
{
_add_metadata_keys();
}
@@ -452,7 +452,7 @@ CRANInstalledRepository::do_uninstall(const QualifiedPackageName & q, const Vers
void
CRANInstalledRepository::invalidate()
{
- _imp.reset(new Implementation<CRANInstalledRepository>(_imp->params));
+ _imp.reset(new Imp<CRANInstalledRepository>(_imp->params));
_add_metadata_keys();
}
diff --git a/paludis/repositories/cran/cran_installed_repository.hh b/paludis/repositories/cran/cran_installed_repository.hh
index 3f4630ad5..8c1a09c97 100644
--- a/paludis/repositories/cran/cran_installed_repository.hh
+++ b/paludis/repositories/cran/cran_installed_repository.hh
@@ -23,7 +23,7 @@
#include <paludis/repository.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/map-fwd.hh>
@@ -65,10 +65,10 @@ namespace paludis
class PALUDIS_VISIBLE CRANInstalledRepository :
public Repository,
public RepositoryDestinationInterface,
- public PrivateImplementationPattern<CRANInstalledRepository>
+ public Pimp<CRANInstalledRepository>
{
private:
- PrivateImplementationPattern<CRANInstalledRepository>::ImpPtr & _imp;
+ Pimp<CRANInstalledRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_ids() const;
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index a84bfceef..a2fb66e63 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -31,7 +31,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/return_literal_function.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/literal_metadata_key.hh>
@@ -52,7 +52,7 @@ using namespace paludis::cranrepository;
namespace paludis
{
template <>
- struct Implementation<CRANPackageID>
+ struct Imp<CRANPackageID>
{
const Environment * const env;
@@ -76,7 +76,7 @@ namespace paludis
std::shared_ptr<DependenciesLabelSequence> suggests_labels;
std::shared_ptr<DependenciesLabelSequence> depends_labels;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const std::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
env(e),
repository(r),
@@ -90,7 +90,7 @@ namespace paludis
depends_labels->push_back(std::make_shared<DependenciesBuildLabel>("Depends", return_literal_function(true)));
}
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const std::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
env(e),
repository(c),
@@ -108,8 +108,8 @@ namespace paludis
}
CRANPackageID::CRANPackageID(const Environment * const env, const std::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
- PrivateImplementationPattern<CRANPackageID>(env, r, f),
- _imp(PrivateImplementationPattern<CRANPackageID>::_imp)
+ Pimp<CRANPackageID>(env, r, f),
+ _imp(Pimp<CRANPackageID>::_imp)
{
Context context("When parsing file '" + stringify(f) + "' to create a CRAN Package ID:");
@@ -277,8 +277,8 @@ CRANPackageID::CRANPackageID(const Environment * const env, const std::shared_pt
CRANPackageID::CRANPackageID(const Environment * const e,
const std::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
- PrivateImplementationPattern<CRANPackageID>(e, c, r, t),
- _imp(PrivateImplementationPattern<CRANPackageID>::_imp)
+ Pimp<CRANPackageID>(e, c, r, t),
+ _imp(Pimp<CRANPackageID>::_imp)
{
Context context("When creating contained ID '" + stringify(t) + "' in " + stringify(*r) + "':");
diff --git a/paludis/repositories/cran/cran_package_id.hh b/paludis/repositories/cran/cran_package_id.hh
index 0ecf2d363..6d32ce51d 100644
--- a/paludis/repositories/cran/cran_package_id.hh
+++ b/paludis/repositories/cran/cran_package_id.hh
@@ -33,11 +33,11 @@ namespace paludis
{
class PALUDIS_VISIBLE CRANPackageID :
public PackageID,
- private PrivateImplementationPattern<CRANPackageID>,
+ private Pimp<CRANPackageID>,
public std::enable_shared_from_this<CRANPackageID>
{
private:
- PrivateImplementationPattern<CRANPackageID>::ImpPtr & _imp;
+ Pimp<CRANPackageID>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index fadd8db71..83a520422 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -35,7 +35,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/map.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/system.hh>
@@ -65,7 +65,7 @@ typedef std::unordered_map<
namespace paludis
{
template <>
- struct Implementation<CRANRepository>
+ struct Imp<CRANRepository>
{
CRANRepositoryParams params;
@@ -73,8 +73,8 @@ namespace paludis
mutable bool has_ids;
mutable IDMap ids;
- Implementation(const CRANRepositoryParams &, const std::shared_ptr<Mutex> &);
- ~Implementation();
+ Imp(const CRANRepositoryParams &, const std::shared_ptr<Mutex> &);
+ ~Imp();
std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
std::shared_ptr<const MetadataValueKey<FSEntry> > distdir_key;
@@ -86,7 +86,7 @@ namespace paludis
};
}
-Implementation<CRANRepository>::Implementation(const CRANRepositoryParams & p, const std::shared_ptr<Mutex> & m) :
+Imp<CRANRepository>::Imp(const CRANRepositoryParams & p, const std::shared_ptr<Mutex> & m) :
params(p),
big_nasty_mutex(m),
has_ids(false),
@@ -100,7 +100,7 @@ Implementation<CRANRepository>::Implementation(const CRANRepositoryParams & p, c
{
}
-Implementation<CRANRepository>::~Implementation()
+Imp<CRANRepository>::~Imp()
{
}
@@ -117,8 +117,8 @@ CRANRepository::CRANRepository(const CRANRepositoryParams & p) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<CRANRepository>(p, std::make_shared<Mutex>()),
- _imp(PrivateImplementationPattern<CRANRepository>::_imp)
+ Pimp<CRANRepository>(p, std::make_shared<Mutex>()),
+ _imp(Pimp<CRANRepository>::_imp)
{
_add_metadata_keys();
}
@@ -459,7 +459,7 @@ CRANRepositoryConfigurationError::CRANRepositoryConfigurationError(
void
CRANRepository::invalidate()
{
- _imp.reset(new Implementation<CRANRepository>(_imp->params, _imp->big_nasty_mutex));
+ _imp.reset(new Imp<CRANRepository>(_imp->params, _imp->big_nasty_mutex));
_add_metadata_keys();
}
diff --git a/paludis/repositories/cran/cran_repository.hh b/paludis/repositories/cran/cran_repository.hh
index e21dac5d3..1a7ecc239 100644
--- a/paludis/repositories/cran/cran_repository.hh
+++ b/paludis/repositories/cran/cran_repository.hh
@@ -23,7 +23,7 @@
#include <paludis/repository.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/environment-fwd.hh>
#include <memory>
#include <string>
@@ -75,11 +75,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE CRANRepository :
public Repository,
- private PrivateImplementationPattern<CRANRepository>,
+ private Pimp<CRANRepository>,
public std::enable_shared_from_this<CRANRepository>
{
private:
- PrivateImplementationPattern<CRANRepository>::ImpPtr & _imp;
+ Pimp<CRANRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_ids() const;
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.cc b/paludis/repositories/cran/dep_spec_pretty_printer.cc
index 6d00eacf5..f89abab49 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/cran/dep_spec_pretty_printer.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/fs_entry.hh>
@@ -38,7 +38,7 @@ using namespace paludis::cranrepository;
namespace paludis
{
template <>
- struct Implementation<DepSpecPrettyPrinter>
+ struct Imp<DepSpecPrettyPrinter>
{
std::stringstream s;
const Environment * const env;
@@ -47,7 +47,7 @@ namespace paludis
const bool multiline;
bool need_comma;
- Implementation(
+ Imp(
const Environment * const e,
const GenericSpecTree::ItemFormatter & f,
const unsigned u,
@@ -64,7 +64,7 @@ namespace paludis
DepSpecPrettyPrinter::DepSpecPrettyPrinter(const Environment * const e,
const GenericSpecTree::ItemFormatter & f, const unsigned initial_indent, const bool multiline) :
- PrivateImplementationPattern<DepSpecPrettyPrinter>(e, f, initial_indent, multiline)
+ Pimp<DepSpecPrettyPrinter>(e, f, initial_indent, multiline)
{
}
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.hh b/paludis/repositories/cran/dep_spec_pretty_printer.hh
index 6db6d0b80..d2ddf4ae9 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_CRAN_DEP_SPEC_PRETTY_PRINTER_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_CRAN_DEP_SPEC_PRETTY_PRINTER_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/spec_tree.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/formatter.hh>
@@ -37,7 +37,7 @@ namespace paludis
* \ingroup grpcranrepository
*/
class PALUDIS_VISIBLE DepSpecPrettyPrinter :
- private PrivateImplementationPattern<DepSpecPrettyPrinter>
+ private Pimp<DepSpecPrettyPrinter>
{
friend std::ostream & operator<< (std::ostream &, const DepSpecPrettyPrinter &);
diff --git a/paludis/repositories/cran/description_file.cc b/paludis/repositories/cran/description_file.cc
index f61f30167..d1045e9b1 100644
--- a/paludis/repositories/cran/description_file.cc
+++ b/paludis/repositories/cran/description_file.cc
@@ -18,7 +18,7 @@
*/
#include "description_file.hh"
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/stringify.hh>
@@ -32,14 +32,14 @@ using namespace paludis::cranrepository;
namespace paludis
{
template <>
- struct Implementation<DescriptionFile>
+ struct Imp<DescriptionFile>
{
std::map<std::string, std::string> values;
};
}
DescriptionFile::DescriptionFile(const Source & sr) :
- PrivateImplementationPattern<DescriptionFile>()
+ Pimp<DescriptionFile>()
{
Context c("When parsing CRAN description file '" + sr.filename() + "':");
diff --git a/paludis/repositories/cran/description_file.hh b/paludis/repositories/cran/description_file.hh
index f7388044b..7984cd84d 100644
--- a/paludis/repositories/cran/description_file.hh
+++ b/paludis/repositories/cran/description_file.hh
@@ -29,7 +29,7 @@ namespace paludis
{
class PALUDIS_VISIBLE DescriptionFile :
public ConfigFile,
- private PrivateImplementationPattern<DescriptionFile>
+ private Pimp<DescriptionFile>
{
private:
void _line(const std::string &);
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index 20df6a91a..10d4d1f9d 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.cc
@@ -139,7 +139,7 @@ PackageIDKey::pretty_print(const Formatter<PackageID> & f) const
namespace paludis
{
template <>
- struct Implementation<DepKey>
+ struct Imp<DepKey>
{
const Environment * const env;
const std::string v;
@@ -152,7 +152,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::string & vv,
+ Imp(const Environment * const e, const std::string & vv,
const std::shared_ptr<const DependenciesLabelSequence> & s,
const std::string & r, const std::string & h, const MetadataKeyType & t) :
env(e),
@@ -168,8 +168,8 @@ namespace paludis
DepKey::DepKey(const Environment * const e, const std::string & r, const std::string & h, const std::string & v,
const std::shared_ptr<const DependenciesLabelSequence> & s, const MetadataKeyType t) :
- PrivateImplementationPattern<DepKey>(e, v, s, r, h, t),
- _imp(PrivateImplementationPattern<DepKey>::_imp)
+ Pimp<DepKey>(e, v, s, r, h, t),
+ _imp(Pimp<DepKey>::_imp)
{
}
diff --git a/paludis/repositories/cran/keys.hh b/paludis/repositories/cran/keys.hh
index 1831f6aed..bb10301af 100644
--- a/paludis/repositories/cran/keys.hh
+++ b/paludis/repositories/cran/keys.hh
@@ -85,10 +85,10 @@ namespace paludis
class DepKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<DepKey>
+ private Pimp<DepKey>
{
private:
- PrivateImplementationPattern<DepKey>::ImpPtr & _imp;
+ Pimp<DepKey>::ImpPtr & _imp;
public:
DepKey(const Environment * const,
diff --git a/paludis/repositories/cran/masks.cc b/paludis/repositories/cran/masks.cc
index 067bbdc95..1612f619a 100644
--- a/paludis/repositories/cran/masks.cc
+++ b/paludis/repositories/cran/masks.cc
@@ -18,7 +18,7 @@
*/
#include "masks.hh"
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
using namespace paludis;
using namespace paludis::cranrepository;
@@ -26,13 +26,13 @@ using namespace paludis::cranrepository;
namespace paludis
{
template <>
- struct Implementation<BrokenMask>
+ struct Imp<BrokenMask>
{
const char key;
const std::string description;
const std::string explanation;
- Implementation(const char k, const std::string & d, const std::string & e) :
+ Imp(const char k, const std::string & d, const std::string & e) :
key(k),
description(d),
explanation(e)
@@ -42,7 +42,7 @@ namespace paludis
}
BrokenMask::BrokenMask(const char c, const std::string & d, const std::string & e) :
- PrivateImplementationPattern<BrokenMask>(c, d, e)
+ Pimp<BrokenMask>(c, d, e)
{
}
diff --git a/paludis/repositories/cran/masks.hh b/paludis/repositories/cran/masks.hh
index 0f658c80b..58d277b67 100644
--- a/paludis/repositories/cran/masks.hh
+++ b/paludis/repositories/cran/masks.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_PALUDIS_REPOSITORIES_CRAN_MASKS_HH 1
#include <paludis/mask.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -29,7 +29,7 @@ namespace paludis
{
class BrokenMask :
public UnsupportedMask,
- private PrivateImplementationPattern<BrokenMask>
+ private Pimp<BrokenMask>
{
public:
BrokenMask(const char, const std::string &, const std::string &);
diff --git a/paludis/repositories/e/aa_visitor.cc b/paludis/repositories/e/aa_visitor.cc
index 0322ffec6..e1b404891 100644
--- a/paludis/repositories/e/aa_visitor.cc
+++ b/paludis/repositories/e/aa_visitor.cc
@@ -19,7 +19,7 @@
#include <paludis/dep_spec.hh>
#include <paludis/repositories/e/aa_visitor.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/accept_visitor.hh>
@@ -27,7 +27,7 @@
#include <algorithm>
/** \file
- * Implementation of aa_visitor.hh
+ * Imp of aa_visitor.hh
*
* \ingroup grpaavisitor
*/
@@ -38,7 +38,7 @@ using namespace paludis::erepository;
namespace paludis
{
template<>
- struct Implementation<AAVisitor>
+ struct Imp<AAVisitor>
{
std::list<std::string> aa;
};
@@ -51,7 +51,7 @@ namespace paludis
}
AAVisitor::AAVisitor() :
- PrivateImplementationPattern<AAVisitor>()
+ Pimp<AAVisitor>()
{
}
diff --git a/paludis/repositories/e/aa_visitor.hh b/paludis/repositories/e/aa_visitor.hh
index b97d627b9..1dec5cc8d 100644
--- a/paludis/repositories/e/aa_visitor.hh
+++ b/paludis/repositories/e/aa_visitor.hh
@@ -22,7 +22,7 @@
#include <paludis/spec_tree.hh>
#include <paludis/dep_spec-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
/** \file
@@ -42,7 +42,7 @@ namespace paludis
* \ingroup grpaavisitor
*/
class PALUDIS_VISIBLE AAVisitor :
- private PrivateImplementationPattern<AAVisitor>
+ private Pimp<AAVisitor>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc
index 991391c1b..03fe76781 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.cc
+++ b/paludis/repositories/e/check_fetched_files_visitor.cc
@@ -30,7 +30,7 @@
#include <paludis/about.hh>
#include <paludis/action.hh>
#include <paludis/util/system.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/log.hh>
#include <paludis/util/join.hh>
@@ -57,7 +57,7 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<CheckFetchedFilesVisitor>
+ struct Imp<CheckFetchedFilesVisitor>
{
const Environment * const env;
const std::shared_ptr<const PackageID> id;
@@ -76,7 +76,7 @@ namespace paludis
const UseManifest use_manifest;
const std::shared_ptr<OutputManager> output_manager;
- Implementation(
+ Imp(
const Environment * const e,
const std::shared_ptr<const PackageID> & i,
const FSEntry & d,
@@ -118,7 +118,7 @@ CheckFetchedFilesVisitor::CheckFetchedFilesVisitor(
const bool x,
const bool u,
const bool nm) :
- PrivateImplementationPattern<CheckFetchedFilesVisitor>(e, i, d, c, n, m2, um, md, x, u, nm)
+ Pimp<CheckFetchedFilesVisitor>(e, i, d, c, n, m2, um, md, x, u, nm)
{
}
diff --git a/paludis/repositories/e/check_fetched_files_visitor.hh b/paludis/repositories/e/check_fetched_files_visitor.hh
index 9f6d3a3b9..ecfb27cdf 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.hh
+++ b/paludis/repositories/e/check_fetched_files_visitor.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/dep_spec-fwd.hh>
@@ -37,7 +37,7 @@ namespace paludis
namespace erepository
{
class PALUDIS_VISIBLE CheckFetchedFilesVisitor :
- private PrivateImplementationPattern<CheckFetchedFilesVisitor>
+ private Pimp<CheckFetchedFilesVisitor>
{
private:
bool check_distfile_manifest(const FSEntry & distfile);
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.cc b/paludis/repositories/e/dep_spec_pretty_printer.cc
index ed91bad7a..0c7431227 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer.cc
@@ -23,7 +23,7 @@
#include <paludis/formatter.hh>
#include <paludis/util/save.hh>
#include <paludis/util/simple_visitor_cast.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/set.hh>
@@ -39,7 +39,7 @@
#include <sstream>
/** \file
- * Implementation of dep_spec_pretty_printer.hh.
+ * Imp of dep_spec_pretty_printer.hh.
*
* \ingroup grpdepspecprettyprinter
*/
@@ -50,7 +50,7 @@ using namespace paludis::erepository;
namespace paludis
{
template<>
- struct Implementation<DepSpecPrettyPrinter>
+ struct Imp<DepSpecPrettyPrinter>
{
std::stringstream s;
const Environment * const env;
@@ -64,7 +64,7 @@ namespace paludis
bool need_space;
bool check_conditions;
- Implementation(
+ Imp(
const Environment * const e,
const std::shared_ptr<const PackageID> & i,
const GenericSpecTree::ItemFormatter & f,
@@ -93,7 +93,7 @@ DepSpecPrettyPrinter::DepSpecPrettyPrinter(
unsigned i,
bool b,
bool c) :
- PrivateImplementationPattern<DepSpecPrettyPrinter>(e, id, f, i, b, c)
+ Pimp<DepSpecPrettyPrinter>(e, id, f, i, b, c)
{
}
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.hh b/paludis/repositories/e/dep_spec_pretty_printer.hh
index da2a582e7..78c81c329 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/e/dep_spec_pretty_printer.hh
@@ -43,7 +43,7 @@ namespace paludis
* \ingroup grperepository
*/
class PALUDIS_VISIBLE DepSpecPrettyPrinter :
- private PrivateImplementationPattern<DepSpecPrettyPrinter>
+ private Pimp<DepSpecPrettyPrinter>
{
friend std::ostream & operator<< (std::ostream &, const DepSpecPrettyPrinter &);
diff --git a/paludis/repositories/e/dependencies_rewriter.cc b/paludis/repositories/e/dependencies_rewriter.cc
index a000e24d0..ef91959d3 100644
--- a/paludis/repositories/e/dependencies_rewriter.cc
+++ b/paludis/repositories/e/dependencies_rewriter.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/e/dependencies_rewriter.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/return_literal_function.hh>
#include <paludis/util/save.hh>
@@ -62,7 +62,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<DependenciesRewriter>
+ struct Imp<DependenciesRewriter>
{
std::string depend;
std::string rdepend;
@@ -71,7 +71,7 @@ namespace paludis
std::shared_ptr<DependenciesLabelSequence> default_labels;
LabelsStack labels;
- Implementation() :
+ Imp() :
default_labels(new DependenciesLabelSequence)
{
default_labels->push_back(std::make_shared<DependenciesBuildLabel>("build", return_literal_function(true)));
@@ -82,7 +82,7 @@ namespace paludis
}
DependenciesRewriter::DependenciesRewriter() :
- PrivateImplementationPattern<DependenciesRewriter>()
+ Pimp<DependenciesRewriter>()
{
}
diff --git a/paludis/repositories/e/dependencies_rewriter.hh b/paludis/repositories/e/dependencies_rewriter.hh
index a50182543..f2f0c71f4 100644
--- a/paludis/repositories/e/dependencies_rewriter.hh
+++ b/paludis/repositories/e/dependencies_rewriter.hh
@@ -22,14 +22,14 @@
#include <paludis/dep_spec.hh>
#include <paludis/spec_tree.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
namespace erepository
{
class DependenciesRewriter :
- private PrivateImplementationPattern<DependenciesRewriter>
+ private Pimp<DependenciesRewriter>
{
public:
DependenciesRewriter();
diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc
index a2dfa9eb8..5dd7a99c7 100644
--- a/paludis/repositories/e/e_choices_key.cc
+++ b/paludis/repositories/e/e_choices_key.cc
@@ -26,7 +26,7 @@
#include <paludis/repositories/e/e_repository.hh>
#include <paludis/repositories/e/myoption.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
#include <paludis/util/mutex.hh>
@@ -56,7 +56,7 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<EChoicesKey>
+ struct Imp<EChoicesKey>
{
mutable Mutex mutex;
mutable std::shared_ptr<Choices> value;
@@ -70,7 +70,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
+ Imp(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
const std::shared_ptr<const ERepository> & p,
const std::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & d,
const std::string & r, const std::string & h, const MetadataKeyType t) :
@@ -92,7 +92,7 @@ EChoicesKey::EChoicesKey(
const std::string & r, const std::string & h, const MetadataKeyType t,
const std::shared_ptr<const ERepository> & p,
const std::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & d) :
- PrivateImplementationPattern<EChoicesKey>(e, i, p, d, r, h, t)
+ Pimp<EChoicesKey>(e, i, p, d, r, h, t)
{
}
diff --git a/paludis/repositories/e/e_choices_key.hh b/paludis/repositories/e/e_choices_key.hh
index 134ae3bd9..00e921e2e 100644
--- a/paludis/repositories/e/e_choices_key.hh
+++ b/paludis/repositories/e/e_choices_key.hh
@@ -35,7 +35,7 @@ namespace paludis
class EChoicesKey :
public MetadataValueKey<std::shared_ptr<const Choices> >,
- private PrivateImplementationPattern<EChoicesKey>
+ private Pimp<EChoicesKey>
{
private:
void populate_iuse() const;
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index 675b1647f..01754ad3a 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -25,7 +25,7 @@
#include <paludis/repositories/e/ebuild.hh>
#include <paludis/repositories/e/e_repository.hh>
#include <paludis/util/simple_visitor_cast.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
@@ -58,12 +58,12 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<EInstalledRepository>
+ struct Imp<EInstalledRepository>
{
EInstalledRepositoryParams params;
Mutex world_mutex;
- Implementation(const EInstalledRepositoryParams & p) :
+ Imp(const EInstalledRepositoryParams & p) :
params(p)
{
}
@@ -73,8 +73,8 @@ namespace paludis
EInstalledRepository::EInstalledRepository(const EInstalledRepositoryParams & p,
const RepositoryName & n, const RepositoryCapabilities & c) :
Repository(p.environment(), n, c),
- PrivateImplementationPattern<EInstalledRepository>(p),
- _imp(PrivateImplementationPattern<EInstalledRepository>::_imp)
+ Pimp<EInstalledRepository>(p),
+ _imp(Pimp<EInstalledRepository>::_imp)
{
}
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index a49220842..7b3e27b00 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -45,10 +45,10 @@ namespace paludis
public Repository,
public RepositoryEnvironmentVariableInterface,
public RepositoryDestinationInterface,
- private PrivateImplementationPattern<EInstalledRepository>
+ private Pimp<EInstalledRepository>
{
private:
- PrivateImplementationPattern<EInstalledRepository>::ImpPtr & _imp;
+ Pimp<EInstalledRepository>::ImpPtr & _imp;
protected:
EInstalledRepository(const EInstalledRepositoryParams &, const RepositoryName &, const RepositoryCapabilities &);
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index f5d779966..d409963da 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -36,7 +36,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -110,7 +110,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<EInstalledRepositoryID>
+ struct Imp<EInstalledRepositoryID>
{
mutable Mutex mutex;
@@ -131,7 +131,7 @@ namespace paludis
std::shared_ptr<DependenciesLabelSequence> run_dependencies_labels;
std::shared_ptr<DependenciesLabelSequence> post_dependencies_labels;
- Implementation(const QualifiedPackageName & q, const VersionSpec & v,
+ Imp(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
const std::shared_ptr<const Repository> r, const FSEntry & f) :
name(q),
@@ -163,8 +163,8 @@ EInstalledRepositoryID::EInstalledRepositoryID(const QualifiedPackageName & q, c
const Environment * const e,
const std::shared_ptr<const Repository> & r,
const FSEntry & f) :
- PrivateImplementationPattern<EInstalledRepositoryID>(q, v, e, r, f),
- _imp(PrivateImplementationPattern<EInstalledRepositoryID>::_imp)
+ Pimp<EInstalledRepositoryID>(q, v, e, r, f),
+ _imp(Pimp<EInstalledRepositoryID>::_imp)
{
}
diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh
index 0b2dcace1..12f498593 100644
--- a/paludis/repositories/e/e_installed_repository_id.hh
+++ b/paludis/repositories/e/e_installed_repository_id.hh
@@ -33,10 +33,10 @@ namespace paludis
class EInstalledRepositoryID :
public ERepositoryID,
public std::enable_shared_from_this<EInstalledRepositoryID>,
- private PrivateImplementationPattern<EInstalledRepositoryID>
+ private Pimp<EInstalledRepositoryID>
{
private:
- PrivateImplementationPattern<EInstalledRepositoryID>::ImpPtr & _imp;
+ Pimp<EInstalledRepositoryID>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 3650f3ac8..1e506994e 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -27,7 +27,7 @@
#include <paludis/repositories/e/myoption.hh>
#include <paludis/util/pretty_print.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/fs_entry.hh>
@@ -104,7 +104,7 @@ EMutableRepositoryMaskInfoKey::type() const
namespace paludis
{
template <>
- struct Implementation<EDependenciesKey>
+ struct Imp<EDependenciesKey>
{
const Environment * const env;
const std::shared_ptr<const ERepositoryID> id;
@@ -117,7 +117,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(
+ Imp(
const Environment * const e,
const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::shared_ptr<const DependenciesLabelSequence> & s,
@@ -139,7 +139,7 @@ EDependenciesKey::EDependenciesKey(
const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v,
const std::shared_ptr<const DependenciesLabelSequence> & l, const MetadataKeyType t) :
- PrivateImplementationPattern<EDependenciesKey>(e, id, v, l, r, h, t)
+ Pimp<EDependenciesKey>(e, id, v, l, r, h, t)
{
}
@@ -204,7 +204,7 @@ EDependenciesKey::type() const
namespace paludis
{
template <>
- struct Implementation<ELicenseKey>
+ struct Imp<ELicenseKey>
{
const Environment * const env;
const std::shared_ptr<const ERepositoryID> id;
@@ -215,7 +215,7 @@ namespace paludis
const std::shared_ptr<const EAPIMetadataVariable> variable;
const MetadataKeyType type;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::shared_ptr<const EAPIMetadataVariable> & m, const MetadataKeyType t) :
env(e),
@@ -232,7 +232,7 @@ ELicenseKey::ELicenseKey(
const Environment * const e,
const std::shared_ptr<const ERepositoryID> & id,
const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<ELicenseKey>(e, id, v, m, t)
+ Pimp<ELicenseKey>(e, id, v, m, t)
{
}
@@ -291,7 +291,7 @@ ELicenseKey::type() const
namespace paludis
{
template <>
- struct Implementation<EFetchableURIKey>
+ struct Imp<EFetchableURIKey>
{
const Environment * const env;
const std::shared_ptr<const ERepositoryID> id;
@@ -303,7 +303,7 @@ namespace paludis
mutable std::shared_ptr<const FetchableURISpecTree> value;
mutable std::shared_ptr<const URILabel> initial_label;
- Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
+ Imp(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v,
const MetadataKeyType t) :
env(e),
@@ -319,7 +319,7 @@ namespace paludis
EFetchableURIKey::EFetchableURIKey(const Environment * const e,
const std::shared_ptr<const ERepositoryID> & id,
const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<EFetchableURIKey>(e, id, m, v, t)
+ Pimp<EFetchableURIKey>(e, id, m, v, t)
{
}
@@ -415,7 +415,7 @@ EFetchableURIKey::type() const
namespace paludis
{
template <>
- struct Implementation<ESimpleURIKey>
+ struct Imp<ESimpleURIKey>
{
const Environment * const env;
const std::shared_ptr<const ERepositoryID> id;
@@ -427,7 +427,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
+ Imp(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
@@ -444,7 +444,7 @@ namespace paludis
ESimpleURIKey::ESimpleURIKey(const Environment * const e,
const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<ESimpleURIKey>(e, id, v, r, h, t)
+ Pimp<ESimpleURIKey>(e, id, v, r, h, t)
{
}
@@ -504,7 +504,7 @@ ESimpleURIKey::type() const
namespace paludis
{
template <>
- struct Implementation<EPlainTextSpecKey>
+ struct Imp<EPlainTextSpecKey>
{
const Environment * const env;
const std::shared_ptr<const ERepositoryID> id;
@@ -515,7 +515,7 @@ namespace paludis
const std::shared_ptr<const EAPIMetadataVariable> variable;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ Imp(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::shared_ptr<const EAPIMetadataVariable> & m,
const MetadataKeyType t) :
env(e),
@@ -531,7 +531,7 @@ namespace paludis
EPlainTextSpecKey::EPlainTextSpecKey(const Environment * const e,
const std::shared_ptr<const ERepositoryID> & id,
const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<EPlainTextSpecKey>(e, id, v, m, t)
+ Pimp<EPlainTextSpecKey>(e, id, v, m, t)
{
}
@@ -591,7 +591,7 @@ EPlainTextSpecKey::type() const
namespace paludis
{
template <>
- struct Implementation<EMyOptionsKey>
+ struct Imp<EMyOptionsKey>
{
const Environment * const env;
const std::shared_ptr<const ERepositoryID> id;
@@ -603,7 +603,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ Imp(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
id(i),
@@ -619,7 +619,7 @@ namespace paludis
EMyOptionsKey::EMyOptionsKey(const Environment * const e,
const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<EMyOptionsKey>(e, id, v, r, h, t)
+ Pimp<EMyOptionsKey>(e, id, v, r, h, t)
{
}
@@ -679,7 +679,7 @@ EMyOptionsKey::type() const
namespace paludis
{
template <>
- struct Implementation<EProvideKey>
+ struct Imp<EProvideKey>
{
const Environment * const env;
const std::shared_ptr<const ERepositoryID> id;
@@ -691,7 +691,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ Imp(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
id(i),
@@ -706,7 +706,7 @@ namespace paludis
EProvideKey::EProvideKey(const Environment * const e, const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<EProvideKey>(e, id, v, r, h, t)
+ Pimp<EProvideKey>(e, id, v, r, h, t)
{
}
@@ -766,7 +766,7 @@ EProvideKey::type() const
namespace paludis
{
template <>
- struct Implementation<EKeywordsKey>
+ struct Imp<EKeywordsKey>
{
const std::shared_ptr<const ERepositoryID> id;
const Environment * const env;
@@ -778,7 +778,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v,
+ Imp(const std::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
id(i),
env(e),
@@ -793,7 +793,7 @@ namespace paludis
EKeywordsKey::EKeywordsKey(const Environment * const e, const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<EKeywordsKey>(id, e, v, r, h, t)
+ Pimp<EKeywordsKey>(id, e, v, r, h, t)
{
}
@@ -856,7 +856,7 @@ EKeywordsKey::type() const
namespace paludis
{
template <>
- struct Implementation<EStringSetKey>
+ struct Imp<EStringSetKey>
{
const std::shared_ptr<const ERepositoryID> id;
const std::string string_value;
@@ -867,7 +867,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ Imp(const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
id(i),
string_value(v),
@@ -881,7 +881,7 @@ namespace paludis
EStringSetKey::EStringSetKey(const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<EStringSetKey>(id, v, r, h, t)
+ Pimp<EStringSetKey>(id, v, r, h, t)
{
}
@@ -939,7 +939,7 @@ EStringSetKey::pretty_print_flat(const Formatter<std::string> & f) const
namespace paludis
{
template <>
- struct Implementation<EContentsKey>
+ struct Imp<EContentsKey>
{
const std::shared_ptr<const ERepositoryID> id;
const FSEntry filename;
@@ -950,7 +950,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::shared_ptr<const ERepositoryID> & i, const FSEntry & v,
+ Imp(const std::shared_ptr<const ERepositoryID> & i, const FSEntry & v,
const std::string & r, const std::string & h, const MetadataKeyType & t) :
id(i),
filename(v),
@@ -964,7 +964,7 @@ namespace paludis
EContentsKey::EContentsKey(const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const FSEntry & v, const MetadataKeyType t) :
- PrivateImplementationPattern<EContentsKey>(id, v, r, h, t)
+ Pimp<EContentsKey>(id, v, r, h, t)
{
}
@@ -1059,7 +1059,7 @@ EContentsKey::type() const
namespace paludis
{
template <>
- struct Implementation<EMTimeKey>
+ struct Imp<EMTimeKey>
{
const std::shared_ptr<const ERepositoryID> id;
const FSEntry filename;
@@ -1070,7 +1070,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::shared_ptr<const ERepositoryID> & i, const FSEntry & v,
+ Imp(const std::shared_ptr<const ERepositoryID> & i, const FSEntry & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
id(i),
filename(v),
@@ -1084,7 +1084,7 @@ namespace paludis
EMTimeKey::EMTimeKey(const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const FSEntry & v, const MetadataKeyType t) :
- PrivateImplementationPattern<EMTimeKey>(id, v, r, h, t)
+ Pimp<EMTimeKey>(id, v, r, h, t)
{
}
@@ -1137,13 +1137,13 @@ EMTimeKey::type() const
namespace paludis
{
template <>
- struct Implementation<ESlotKey>
+ struct Imp<ESlotKey>
{
const SlotName value;
const std::shared_ptr<const EAPIMetadataVariable> variable;
const MetadataKeyType type;
- Implementation(const SlotName & v, const std::shared_ptr<const EAPIMetadataVariable> & m, const MetadataKeyType t) :
+ Imp(const SlotName & v, const std::shared_ptr<const EAPIMetadataVariable> & m, const MetadataKeyType t) :
value(v),
variable(m),
type(t)
@@ -1153,7 +1153,7 @@ namespace paludis
}
ESlotKey::ESlotKey(const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
- PrivateImplementationPattern<ESlotKey>(SlotName(v), m, t)
+ Pimp<ESlotKey>(SlotName(v), m, t)
{
}
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index da66a26bf..626113f8f 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -60,7 +60,7 @@ namespace paludis
class EDependenciesKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<EDependenciesKey>
+ private Pimp<EDependenciesKey>
{
public:
EDependenciesKey(
@@ -90,7 +90,7 @@ namespace paludis
class EFetchableURIKey :
public MetadataSpecTreeKey<FetchableURISpecTree>,
- private PrivateImplementationPattern<EFetchableURIKey>
+ private Pimp<EFetchableURIKey>
{
public:
EFetchableURIKey(const Environment * const,
@@ -119,7 +119,7 @@ namespace paludis
class ESimpleURIKey :
public MetadataSpecTreeKey<SimpleURISpecTree>,
- private PrivateImplementationPattern<ESimpleURIKey>
+ private Pimp<ESimpleURIKey>
{
public:
ESimpleURIKey(const Environment * const,
@@ -143,7 +143,7 @@ namespace paludis
class EPlainTextSpecKey :
public MetadataSpecTreeKey<PlainTextSpecTree>,
- private PrivateImplementationPattern<EPlainTextSpecKey>
+ private Pimp<EPlainTextSpecKey>
{
public:
EPlainTextSpecKey(const Environment * const,
@@ -168,7 +168,7 @@ namespace paludis
class EMyOptionsKey :
public MetadataSpecTreeKey<PlainTextSpecTree>,
- private PrivateImplementationPattern<EMyOptionsKey>
+ private Pimp<EMyOptionsKey>
{
public:
EMyOptionsKey(const Environment * const,
@@ -192,7 +192,7 @@ namespace paludis
class EProvideKey :
public MetadataSpecTreeKey<ProvideSpecTree>,
- private PrivateImplementationPattern<EProvideKey>
+ private Pimp<EProvideKey>
{
public:
EProvideKey(const Environment * const,
@@ -216,7 +216,7 @@ namespace paludis
class ELicenseKey :
public MetadataSpecTreeKey<LicenseSpecTree>,
- private PrivateImplementationPattern<ELicenseKey>
+ private Pimp<ELicenseKey>
{
public:
ELicenseKey(
@@ -242,7 +242,7 @@ namespace paludis
class EKeywordsKey :
public MetadataCollectionKey<KeywordNameSet>,
- private PrivateImplementationPattern<EKeywordsKey>
+ private Pimp<EKeywordsKey>
{
public:
EKeywordsKey(
@@ -264,7 +264,7 @@ namespace paludis
class EStringSetKey :
public MetadataCollectionKey<Set<std::string> >,
- private PrivateImplementationPattern<EStringSetKey>
+ private Pimp<EStringSetKey>
{
public:
EStringSetKey(const std::shared_ptr<const ERepositoryID> &,
@@ -284,7 +284,7 @@ namespace paludis
class EContentsKey :
public MetadataValueKey<std::shared_ptr<const Contents> >,
- private PrivateImplementationPattern<EContentsKey>
+ private Pimp<EContentsKey>
{
public:
EContentsKey(
@@ -302,7 +302,7 @@ namespace paludis
class EMTimeKey :
public MetadataTimeKey,
- private PrivateImplementationPattern<EMTimeKey>
+ private Pimp<EMTimeKey>
{
public:
EMTimeKey(const std::shared_ptr<const ERepositoryID> &,
@@ -319,7 +319,7 @@ namespace paludis
class ESlotKey :
public MetadataValueKey<SlotName>,
- private PrivateImplementationPattern<ESlotKey>
+ private Pimp<ESlotKey>
{
public:
ESlotKey(
diff --git a/paludis/repositories/e/e_mask.cc b/paludis/repositories/e/e_mask.cc
index 71b6f46bb..e25c1f3c3 100644
--- a/paludis/repositories/e/e_mask.cc
+++ b/paludis/repositories/e/e_mask.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/e/e_mask.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
using namespace paludis;
using namespace paludis::erepository;
@@ -26,13 +26,13 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<EUnacceptedMask>
+ struct Imp<EUnacceptedMask>
{
const char key;
const std::string description;
const std::shared_ptr<const MetadataKey> unaccepted_key;
- Implementation(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
+ Imp(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
key(k),
description(d),
unaccepted_key(u)
@@ -42,7 +42,7 @@ namespace paludis
}
EUnacceptedMask::EUnacceptedMask(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
- PrivateImplementationPattern<EUnacceptedMask>(k, d, u)
+ Pimp<EUnacceptedMask>(k, d, u)
{
}
@@ -71,13 +71,13 @@ EUnacceptedMask::unaccepted_key() const
namespace paludis
{
template <>
- struct Implementation<EUnsupportedMask>
+ struct Imp<EUnsupportedMask>
{
const char key;
const std::string description;
const std::string eapi_name;
- Implementation(const char k, const std::string & d, const std::string & n) :
+ Imp(const char k, const std::string & d, const std::string & n) :
key(k),
description(d),
eapi_name(n)
@@ -87,7 +87,7 @@ namespace paludis
}
EUnsupportedMask::EUnsupportedMask(const char k, const std::string & d, const std::string & n) :
- PrivateImplementationPattern<EUnsupportedMask>(k, d, n)
+ Pimp<EUnsupportedMask>(k, d, n)
{
}
@@ -118,13 +118,13 @@ EUnsupportedMask::explanation() const
namespace paludis
{
template <>
- struct Implementation<ERepositoryMask>
+ struct Imp<ERepositoryMask>
{
const char key;
const std::string description;
const std::shared_ptr<const MetadataKey> mask_key;
- Implementation(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & m) :
+ Imp(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & m) :
key(k),
description(d),
mask_key(m)
@@ -134,7 +134,7 @@ namespace paludis
}
ERepositoryMask::ERepositoryMask(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & m) :
- PrivateImplementationPattern<ERepositoryMask>(k, d, m)
+ Pimp<ERepositoryMask>(k, d, m)
{
}
diff --git a/paludis/repositories/e/e_mask.hh b/paludis/repositories/e/e_mask.hh
index cb3081531..0379b597d 100644
--- a/paludis/repositories/e/e_mask.hh
+++ b/paludis/repositories/e/e_mask.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_MASK_HH 1
#include <paludis/mask.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -29,7 +29,7 @@ namespace paludis
{
class EUnacceptedMask :
public UnacceptedMask,
- private PrivateImplementationPattern<EUnacceptedMask>
+ private Pimp<EUnacceptedMask>
{
public:
EUnacceptedMask(const char, const std::string &, const std::shared_ptr<const MetadataKey> &);
@@ -42,7 +42,7 @@ namespace paludis
class EUnsupportedMask :
public UnsupportedMask,
- private PrivateImplementationPattern<EUnsupportedMask>
+ private Pimp<EUnsupportedMask>
{
public:
EUnsupportedMask(const char, const std::string &, const std::string &);
@@ -55,7 +55,7 @@ namespace paludis
class ERepositoryMask :
public RepositoryMask,
- private PrivateImplementationPattern<ERepositoryMask>
+ private Pimp<ERepositoryMask>
{
public:
ERepositoryMask(const char, const std::string &, const std::shared_ptr<const MetadataKey> &);
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 698a8fd03..e5e2ca7dd 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -80,7 +80,7 @@
#include <paludis/util/map.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/options.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/random.hh>
#include <paludis/util/rmd160.hh>
#include <paludis/util/safe_ifstream.hh>
@@ -116,7 +116,7 @@
#define STUPID_CAST(type, val) reinterpret_cast<type>(reinterpret_cast<uintptr_t>(val))
/** \file
- * Implementation of ERepository.
+ * Imp of ERepository.
*
* \ingroup grperepository
*/
@@ -170,12 +170,12 @@ namespace
namespace paludis
{
/**
- * Implementation data for a ERepository.
+ * Imp data for a ERepository.
*
* \ingroup grperepository
*/
template <>
- struct Implementation<ERepository>
+ struct Imp<ERepository>
{
struct Mutexes
{
@@ -216,8 +216,8 @@ namespace paludis
mutable EAPIForFileMap eapi_for_file_map;
- Implementation(ERepository * const, const ERepositoryParams &, std::shared_ptr<Mutexes> = std::make_shared<Mutexes>());
- ~Implementation();
+ Imp(ERepository * const, const ERepositoryParams &, std::shared_ptr<Mutexes> = std::make_shared<Mutexes>());
+ ~Imp();
void need_profiles() const;
@@ -261,7 +261,7 @@ namespace paludis
time_t master_mtime;
};
- Implementation<ERepository>::Implementation(ERepository * const r,
+ Imp<ERepository>::Imp(ERepository * const r,
const ERepositoryParams & p, std::shared_ptr<Mutexes> m) :
repo(r),
params(p),
@@ -381,12 +381,12 @@ namespace paludis
master_mtime = mtf.mtim().seconds();
}
- Implementation<ERepository>::~Implementation()
+ Imp<ERepository>::~Imp()
{
}
void
- Implementation<ERepository>::need_profiles() const
+ Imp<ERepository>::need_profiles() const
{
Lock l(mutexes->profile_ptr_mutex);
@@ -505,8 +505,8 @@ ERepository::ERepository(const ERepositoryParams & p) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = (*DistributionData::get_instance()->distribution_from_string(p.environment()->distribution())).support_old_style_virtuals() ? this : 0
)),
- PrivateImplementationPattern<ERepository>(this, p),
- _imp(PrivateImplementationPattern<ERepository>::_imp)
+ Pimp<ERepository>(this, p),
+ _imp(Pimp<ERepository>::_imp)
{
_add_metadata_keys();
}
@@ -784,7 +784,7 @@ ERepository::sync(const std::shared_ptr<OutputManager> & output_manager) const
void
ERepository::invalidate()
{
- _imp.reset(new Implementation<ERepository>(this, _imp->params, _imp->mutexes));
+ _imp.reset(new Imp<ERepository>(this, _imp->params, _imp->mutexes));
_add_metadata_keys();
}
diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh
index 218abf043..e2345c929 100644
--- a/paludis/repositories/e/e_repository.hh
+++ b/paludis/repositories/e/e_repository.hh
@@ -24,7 +24,7 @@
#include <paludis/package_database.hh>
#include <paludis/mask-fwd.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/repositories/e/e_repository_id.hh>
#include <paludis/repositories/e/profile.hh>
@@ -56,10 +56,10 @@ namespace paludis
public RepositoryDestinationInterface,
public RepositoryManifestInterface,
public std::enable_shared_from_this<ERepository>,
- private PrivateImplementationPattern<ERepository>
+ private Pimp<ERepository>
{
private:
- PrivateImplementationPattern<ERepository>::ImpPtr & _imp;
+ Pimp<ERepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_mirrors() const;
diff --git a/paludis/repositories/e/e_repository_mask_file.cc b/paludis/repositories/e/e_repository_mask_file.cc
index 3af26c463..0c9e41103 100644
--- a/paludis/repositories/e/e_repository_mask_file.cc
+++ b/paludis/repositories/e/e_repository_mask_file.cc
@@ -18,7 +18,7 @@
*/
#include "e_repository_mask_file.hh"
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/options.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -39,7 +39,7 @@ typedef std::list<std::pair<const std::string, std::shared_ptr<const RepositoryM
namespace paludis
{
template <>
- struct Implementation<MaskFile>
+ struct Imp<MaskFile>
{
MaskFileLines lines;
};
@@ -52,7 +52,7 @@ namespace paludis
}
MaskFile::MaskFile(const FSEntry & f, const LineConfigFileOptions & opts) :
- PrivateImplementationPattern<MaskFile>()
+ Pimp<MaskFile>()
{
LineConfigFileOptions myopts(opts);
myopts += lcfo_disallow_comments;
diff --git a/paludis/repositories/e/e_repository_mask_file.hh b/paludis/repositories/e/e_repository_mask_file.hh
index d1c4a3b96..fdb7fd88f 100644
--- a/paludis/repositories/e/e_repository_mask_file.hh
+++ b/paludis/repositories/e/e_repository_mask_file.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_MASK_FILE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_MASK_FILE_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/config_file.hh>
@@ -39,7 +39,7 @@ namespace paludis
* \ingroup grperepository
*/
class PALUDIS_VISIBLE MaskFile :
- private PrivateImplementationPattern<MaskFile>
+ private Pimp<MaskFile>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index 30f9a4ec4..ce6e1c440 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -28,7 +28,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/log.hh>
#include <paludis/util/strip.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence-impl.hh>
#include <paludis/util/options.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -55,12 +55,12 @@ typedef std::list<std::string> DisplayIfList;
namespace paludis
{
/**
- * Implementation data for ERepositoryNews.
+ * Imp data for ERepositoryNews.
*
* \ingroup grperepository
*/
template<>
- struct Implementation<ERepositoryNews>
+ struct Imp<ERepositoryNews>
{
const Environment * const environment;
const ERepository * const e_repository;
@@ -70,7 +70,7 @@ namespace paludis
const FSEntry skip_file;
const FSEntry unread_file;
- Implementation(const Environment * const e, const ERepository * const p,
+ Imp(const Environment * const e, const ERepository * const p,
const erepository::ERepositoryParams & k) :
environment(e),
e_repository(p),
@@ -107,7 +107,7 @@ namespace paludis
ERepositoryNews::ERepositoryNews(const Environment * const e, const ERepository * const p,
const erepository::ERepositoryParams & k) :
- PrivateImplementationPattern<ERepositoryNews>(e, p, k)
+ Pimp<ERepositoryNews>(e, p, k)
{
}
@@ -253,12 +253,12 @@ ERepositoryNews::update_news() const
namespace paludis
{
/**
- * Implementation data for NewsFile.
+ * Imp data for NewsFile.
*
* \ingroup grpnewsconfigfile
*/
template<>
- struct Implementation<NewsFile>
+ struct Imp<NewsFile>
{
DisplayIfList display_if_installed;
DisplayIfList display_if_keyword;
@@ -267,7 +267,7 @@ namespace paludis
}
NewsFile::NewsFile(const FSEntry & our_filename) :
- PrivateImplementationPattern<NewsFile>()
+ Pimp<NewsFile>()
{
Context context("When parsing GLEP 42 news file '" + stringify(our_filename) + "':");
diff --git a/paludis/repositories/e/e_repository_news.hh b/paludis/repositories/e/e_repository_news.hh
index 81b46b6a1..cb15a4533 100644
--- a/paludis/repositories/e/e_repository_news.hh
+++ b/paludis/repositories/e/e_repository_news.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_NEWS_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_NEWS_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
@@ -43,7 +43,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ERepositoryNews :
- private PrivateImplementationPattern<ERepositoryNews>
+ private Pimp<ERepositoryNews>
{
public:
///\name Basic operations
@@ -75,7 +75,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE NewsFile :
- private PrivateImplementationPattern<NewsFile>
+ private Pimp<NewsFile>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index c551fefa9..0b3ba46e7 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -38,7 +38,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/strip.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
@@ -66,18 +66,18 @@ using namespace paludis::erepository;
namespace paludis
{
/**
- * Implementation data for ERepositorySets.
+ * Imp data for ERepositorySets.
*
* \ingroup grperepository
*/
template<>
- struct Implementation<ERepositorySets>
+ struct Imp<ERepositorySets>
{
const Environment * const environment;
const ERepository * const e_repository;
const erepository::ERepositoryParams params;
- Implementation(const Environment * const e, const ERepository * const p,
+ Imp(const Environment * const e, const ERepository * const p,
const erepository::ERepositoryParams & k) :
environment(e),
e_repository(p),
@@ -89,7 +89,7 @@ namespace paludis
ERepositorySets::ERepositorySets(const Environment * const e, const ERepository * const p,
const erepository::ERepositoryParams & k) :
- PrivateImplementationPattern<ERepositorySets>(e, p, k)
+ Pimp<ERepositorySets>(e, p, k)
{
}
diff --git a/paludis/repositories/e/e_repository_sets.hh b/paludis/repositories/e/e_repository_sets.hh
index 38906b2ae..e0e596130 100644
--- a/paludis/repositories/e/e_repository_sets.hh
+++ b/paludis/repositories/e/e_repository_sets.hh
@@ -42,7 +42,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ERepositorySets :
- private PrivateImplementationPattern<ERepositorySets>
+ private Pimp<ERepositorySets>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/e_stripper.cc b/paludis/repositories/e/e_stripper.cc
index 7ead11dd8..922b78c78 100644
--- a/paludis/repositories/e/e_stripper.cc
+++ b/paludis/repositories/e/e_stripper.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/e/e_stripper.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/output_manager.hh>
#include <ostream>
@@ -30,11 +30,11 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<EStripper>
+ struct Imp<EStripper>
{
EStripperOptions options;
- Implementation(const EStripperOptions & o) :
+ Imp(const EStripperOptions & o) :
options(o)
{
}
@@ -48,8 +48,8 @@ EStripper::EStripper(const EStripperOptions & options) :
n::split() = options.split(),
n::strip() = options.strip()
)),
- PrivateImplementationPattern<EStripper>(options),
- _imp(PrivateImplementationPattern<EStripper>::_imp)
+ Pimp<EStripper>(options),
+ _imp(Pimp<EStripper>::_imp)
{
}
diff --git a/paludis/repositories/e/e_stripper.hh b/paludis/repositories/e/e_stripper.hh
index ca82cc2a8..1d7c01236 100644
--- a/paludis/repositories/e/e_stripper.hh
+++ b/paludis/repositories/e/e_stripper.hh
@@ -52,10 +52,10 @@ namespace paludis
class EStripper :
public Stripper,
- private PrivateImplementationPattern<EStripper>
+ private Pimp<EStripper>
{
private:
- PrivateImplementationPattern<EStripper>::ImpPtr & _imp;
+ Pimp<EStripper>::ImpPtr & _imp;
protected:
virtual void on_strip(const FSEntry &);
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 20739567f..c4993cb7b 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -29,7 +29,7 @@
#include <paludis/util/map.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/wrapped_output_iterator.hh>
@@ -338,11 +338,11 @@ namespace
namespace paludis
{
template<>
- struct Implementation<EAPIData>
+ struct Imp<EAPIData>
{
std::unordered_map<std::string, std::shared_ptr<const EAPI>, Hash<std::string> > values;
- Implementation()
+ Imp()
{
Context c("When loading EAPI data:");
@@ -381,7 +381,7 @@ EAPIConfigurationError::EAPIConfigurationError(const std::string & s) throw () :
}
EAPIData::EAPIData() :
- PrivateImplementationPattern<EAPIData>()
+ Pimp<EAPIData>()
{
}
@@ -416,14 +416,14 @@ EAPIData::unknown_eapi() const
namespace paludis
{
template <>
- struct Implementation<EAPILabels>
+ struct Imp<EAPILabels>
{
std::map<std::string, std::string> v;
};
}
EAPILabels::EAPILabels(const std::string & s) :
- PrivateImplementationPattern<EAPILabels>()
+ Pimp<EAPILabels>()
{
std::vector<std::string> tokens;
@@ -444,7 +444,7 @@ EAPILabels::EAPILabels(const std::string & s) :
}
EAPILabels::EAPILabels(const EAPILabels & other) :
- PrivateImplementationPattern<EAPILabels>(*other._imp.operator-> ())
+ Pimp<EAPILabels>(*other._imp.operator-> ())
{
}
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 278de16b9..40127bbf1 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -24,7 +24,7 @@
#include <paludis/repositories/e/dep_parser-fwd.hh>
#include <paludis/repositories/e/iuse.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/options.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/singleton.hh>
@@ -195,7 +195,7 @@ namespace paludis
namespace erepository
{
class PALUDIS_VISIBLE EAPILabels :
- private PrivateImplementationPattern<EAPILabels>
+ private Pimp<EAPILabels>
{
public:
EAPILabels(const std::string &);
@@ -228,7 +228,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE EAPIData :
- private PrivateImplementationPattern<EAPIData>,
+ private Pimp<EAPIData>,
public Singleton<EAPIData>
{
friend class Singleton<EAPIData>;
diff --git a/paludis/repositories/e/eapi_phase.cc b/paludis/repositories/e/eapi_phase.cc
index 431551616..692f00814 100644
--- a/paludis/repositories/e/eapi_phase.cc
+++ b/paludis/repositories/e/eapi_phase.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/e/eapi_phase.hh>
#include <paludis/repositories/e/eapi.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -36,14 +36,14 @@ typedef std::list<std::shared_ptr<const EAPIPhase> > EAPIPhasesList;
namespace paludis
{
template <>
- struct Implementation<EAPIPhase>
+ struct Imp<EAPIPhase>
{
std::set<std::string> options;
std::list<std::string> commands;
};
template <>
- struct Implementation<EAPIPhases>
+ struct Imp<EAPIPhases>
{
EAPIPhasesList phases;
};
@@ -62,7 +62,7 @@ namespace paludis
}
EAPIPhase::EAPIPhase(const std::string & s) :
- PrivateImplementationPattern<EAPIPhase>()
+ Pimp<EAPIPhase>()
{
Context c("When parsing EAPI phase '" + s + "'");
@@ -111,7 +111,7 @@ EAPIPhase::end_commands() const
}
EAPIPhases::EAPIPhases(const std::string & s) :
- PrivateImplementationPattern<EAPIPhases>()
+ Pimp<EAPIPhases>()
{
Context c("When parsing EAPI phases '" + s + "'");
diff --git a/paludis/repositories/e/eapi_phase.hh b/paludis/repositories/e/eapi_phase.hh
index a1ebebcb4..86bb324bf 100644
--- a/paludis/repositories/e/eapi_phase.hh
+++ b/paludis/repositories/e/eapi_phase.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EAPI_PHASE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EAPI_PHASE_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <string>
@@ -36,7 +36,7 @@ namespace paludis
* \ingroup grpeapi
*/
class EAPIPhase :
- private PrivateImplementationPattern<EAPIPhase>
+ private Pimp<EAPIPhase>
{
public:
///\name Basic operations
@@ -69,7 +69,7 @@ namespace paludis
* \ingroup grpeapi
*/
class EAPIPhases :
- private PrivateImplementationPattern<EAPIPhases>
+ private Pimp<EAPIPhases>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 7b3e48549..2b7b2cdc7 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -61,7 +61,7 @@
#include "config.h"
/** \file
- * Implementation for ebuild.hh things.
+ * Imp for ebuild.hh things.
*
* \ingroup grpebuildinterface
*/
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index a497b7205..ec440681f 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -33,7 +33,7 @@
#include <paludis/repositories/e/dependencies_rewriter.hh>
#include <paludis/stringify_formatter.hh>
#include <paludis/repositories/e/eapi.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <set>
#include <map>
#include <list>
@@ -51,7 +51,7 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<EbuildFlatMetadataCache>
+ struct Imp<EbuildFlatMetadataCache>
{
const Environment * const env;
FSEntry & filename;
@@ -60,7 +60,7 @@ namespace paludis
std::shared_ptr<const EclassMtimes> eclass_mtimes;
bool silent;
- Implementation(const Environment * const e, FSEntry & f, const FSEntry & eb,
+ Imp(const Environment * const e, FSEntry & f, const FSEntry & eb,
std::time_t m, const std::shared_ptr<const EclassMtimes> em, bool s) :
env(e),
filename(f),
@@ -76,7 +76,7 @@ namespace paludis
namespace
{
bool load_flat_list(
- const std::shared_ptr<const EbuildID> & id, const std::vector<std::string> & lines, Implementation<EbuildFlatMetadataCache> * _imp)
+ const std::shared_ptr<const EbuildID> & id, const std::vector<std::string> & lines, Imp<EbuildFlatMetadataCache> * _imp)
{
Context ctx("When loading flat_list format cache file:");
@@ -288,7 +288,7 @@ namespace
EbuildFlatMetadataCache::EbuildFlatMetadataCache(const Environment * const v, FSEntry & f,
const FSEntry & e, std::time_t t, const std::shared_ptr<const EclassMtimes> & m, bool s) :
- PrivateImplementationPattern<EbuildFlatMetadataCache>(v, f, e, t, m, s)
+ Pimp<EbuildFlatMetadataCache>(v, f, e, t, m, s)
{
}
@@ -849,5 +849,5 @@ EbuildFlatMetadataCache::save(const std::shared_ptr<const EbuildID> & id)
}
}
-template class PrivateImplementationPattern<EbuildFlatMetadataCache>;
+template class Pimp<EbuildFlatMetadataCache>;
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.hh b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
index aa7cc1a81..6f5c56139 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.hh
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
@@ -24,7 +24,7 @@
#include <paludis/repositories/e/ebuild_id.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/repositories/e/eclass_mtimes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -40,7 +40,7 @@ namespace paludis
* \nosubgrouping
*/
class EbuildFlatMetadataCache :
- private PrivateImplementationPattern<EbuildFlatMetadataCache>
+ private Pimp<EbuildFlatMetadataCache>
{
public:
///\name Basic operations
@@ -62,7 +62,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<erepository::EbuildFlatMetadataCache>;
+ extern template class Pimp<erepository::EbuildFlatMetadataCache>;
}
#endif
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 611e95582..3e9099d20 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -45,7 +45,7 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/save.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/tribool.hh>
@@ -64,7 +64,7 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<EbuildID>
+ struct Imp<EbuildID>
{
Mutex mutex;
@@ -119,7 +119,7 @@ namespace paludis
std::shared_ptr<DependenciesLabelSequence> run_dependencies_labels;
std::shared_ptr<DependenciesLabelSequence> post_dependencies_labels;
- Implementation(const QualifiedPackageName & q, const VersionSpec & v,
+ Imp(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
const std::shared_ptr<const ERepository> r, const FSEntry & f, const std::string & g,
const time_t t, const std::shared_ptr<const EclassMtimes> & m) :
@@ -160,8 +160,8 @@ EbuildID::EbuildID(const QualifiedPackageName & q, const VersionSpec & v,
const std::string & g,
const time_t t,
const std::shared_ptr<const EclassMtimes> & m) :
- PrivateImplementationPattern<EbuildID>(q, v, e, r, f, g.empty() ? r->params().eapi_when_unknown() : g, t, m),
- _imp(PrivateImplementationPattern<EbuildID>::_imp)
+ Pimp<EbuildID>(q, v, e, r, f, g.empty() ? r->params().eapi_when_unknown() : g, t, m),
+ _imp(Pimp<EbuildID>::_imp)
{
}
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index 6ee633cc8..5fea7b2e9 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -36,10 +36,10 @@ namespace paludis
class EbuildID :
public ERepositoryID,
public std::enable_shared_from_this<EbuildID>,
- private PrivateImplementationPattern<EbuildID>
+ private Pimp<EbuildID>
{
private:
- PrivateImplementationPattern<EbuildID>::ImpPtr & _imp;
+ Pimp<EbuildID>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/repositories/e/eclass_mtimes.cc b/paludis/repositories/e/eclass_mtimes.cc
index 4910ad5a0..059b99237 100644
--- a/paludis/repositories/e/eclass_mtimes.cc
+++ b/paludis/repositories/e/eclass_mtimes.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/e/e_repository.hh>
#include <paludis/repositories/e/layout.hh>
#include <paludis/name.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/mutex.hh>
@@ -67,14 +67,14 @@ namespace
namespace paludis
{
template<>
- struct Implementation<EclassMtimes>
+ struct Imp<EclassMtimes>
{
const ERepository * repo;
mutable Cache eclasses;
mutable std::unordered_map<QualifiedPackageName, Cache, Hash<QualifiedPackageName> > exlibs;
mutable Mutex mutex;
- Implementation(const ERepository * r, const std::shared_ptr<const FSEntrySequence> & d) :
+ Imp(const ERepository * r, const std::shared_ptr<const FSEntrySequence> & d) :
repo(r),
eclasses(d)
{
@@ -83,7 +83,7 @@ namespace paludis
}
EclassMtimes::EclassMtimes(const ERepository * r, const std::shared_ptr<const FSEntrySequence> & d) :
- PrivateImplementationPattern<EclassMtimes>(r, d)
+ Pimp<EclassMtimes>(r, d)
{
}
diff --git a/paludis/repositories/e/eclass_mtimes.hh b/paludis/repositories/e/eclass_mtimes.hh
index 5ab0fbc8c..74d938754 100644
--- a/paludis/repositories/e/eclass_mtimes.hh
+++ b/paludis/repositories/e/eclass_mtimes.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_ECLASS_MTIMES_HH 1
#include <paludis/name-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <memory>
@@ -37,7 +37,7 @@ namespace paludis
* \nosubgrouping
*/
class EclassMtimes :
- private PrivateImplementationPattern<EclassMtimes>
+ private Pimp<EclassMtimes>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 15cb88b62..c4c26d27b 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -25,7 +25,7 @@
#include <paludis/package_database.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/map.hh>
@@ -56,7 +56,7 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace paludis
{
template<>
- struct Implementation<ExheresLayout>
+ struct Imp<ExheresLayout>
{
const ERepository * const repository;
const FSEntry tree_root;
@@ -78,7 +78,7 @@ namespace paludis
std::shared_ptr<FSEntrySequence> info_packages_files;
std::shared_ptr<UseDescFileInfoSequence> use_desc_files;
- Implementation(const ERepository * const n, const FSEntry & t) :
+ Imp(const ERepository * const n, const FSEntry & t) :
repository(n),
tree_root(t),
has_category_names(false),
@@ -97,7 +97,7 @@ namespace paludis
ExheresLayout::ExheresLayout(const ERepository * const r, const FSEntry & tree_root,
const std::shared_ptr<const FSEntrySequence> & f) :
Layout(f),
- PrivateImplementationPattern<ExheresLayout>(r, tree_root)
+ Pimp<ExheresLayout>(r, tree_root)
{
if (master_repositories_locations())
{
diff --git a/paludis/repositories/e/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh
index f1d5805e1..27c1c4296 100644
--- a/paludis/repositories/e/exheres_layout.hh
+++ b/paludis/repositories/e/exheres_layout.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EXHERES_LAYOUT_HH 1
#include <paludis/repositories/e/layout.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -35,7 +35,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE ExheresLayout :
public Layout,
- private PrivateImplementationPattern<ExheresLayout>
+ private Pimp<ExheresLayout>
{
private:
void need_category_names() const;
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index abedc1991..3550a61ed 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -26,7 +26,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/config_file.hh>
@@ -69,7 +69,7 @@ namespace
namespace paludis
{
template<>
- struct Implementation<ExheresProfile>
+ struct Imp<ExheresProfile>
{
const Environment * const env;
const ERepository * const repository;
@@ -93,7 +93,7 @@ namespace paludis
const std::shared_ptr<SetSpecTree> system_packages;
const std::shared_ptr<GeneralSetDepTag> system_tag;
- Implementation(const Environment * const e, const ERepository * const p,
+ Imp(const Environment * const e, const ERepository * const p,
const RepositoryName & name, const FSEntrySequence &,
const std::string &, const bool) :
env(e),
@@ -125,7 +125,7 @@ ExheresProfile::ExheresProfile(
const Environment * const env, const ERepository * const p, const RepositoryName & name,
const FSEntrySequence & location,
const std::string & arch_var_if_special, const bool x) :
- PrivateImplementationPattern<ExheresProfile>(env, p, name, location, arch_var_if_special, x)
+ Pimp<ExheresProfile>(env, p, name, location, arch_var_if_special, x)
{
for (FSEntrySequence::ConstIterator l(location.begin()), l_end(location.end()) ;
l != l_end ; ++l)
diff --git a/paludis/repositories/e/exheres_profile.hh b/paludis/repositories/e/exheres_profile.hh
index 9d53b63f4..9aff0e29d 100644
--- a/paludis/repositories/e/exheres_profile.hh
+++ b/paludis/repositories/e/exheres_profile.hh
@@ -29,7 +29,7 @@ namespace paludis
namespace erepository
{
class PALUDIS_VISIBLE ExheresProfile :
- private PrivateImplementationPattern<ExheresProfile>,
+ private Pimp<ExheresProfile>,
public Profile
{
private:
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index b1daffe8d..6ca2933ea 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -24,7 +24,7 @@
#include <paludis/repositories/e/eapi_phase.hh>
#include <paludis/repositories/e/extra_distribution_data.hh>
#include <paludis/repositories/e/can_skip_phase.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -62,7 +62,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<ExndbamRepository>
+ struct Imp<ExndbamRepository>
{
ExndbamRepositoryParams params;
mutable NDBAM ndbam;
@@ -73,7 +73,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
std::shared_ptr<const MetadataValueKey<std::string> > eapi_when_unknown_key;
- Implementation(const ExndbamRepositoryParams & p) :
+ Imp(const ExndbamRepositoryParams & p) :
params(p),
ndbam(params.location(), &supported_exndbam, "exndbam-1",
EAPIData::get_instance()->eapi_from_string(
@@ -109,8 +109,8 @@ ExndbamRepository::ExndbamRepository(const RepositoryName & n, const ExndbamRepo
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<ExndbamRepository>(p),
- _imp(PrivateImplementationPattern<ExndbamRepository>::_imp)
+ Pimp<ExndbamRepository>(p),
+ _imp(Pimp<ExndbamRepository>::_imp)
{
_add_metadata_keys();
}
@@ -195,7 +195,7 @@ ExndbamRepository::repository_factory_dependencies(
void
ExndbamRepository::invalidate()
{
- _imp.reset(new Implementation<ExndbamRepository>(_imp->params));
+ _imp.reset(new Imp<ExndbamRepository>(_imp->params));
_add_metadata_keys();
}
diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh
index 7c328b2f6..d250cffaa 100644
--- a/paludis/repositories/e/exndbam_repository.hh
+++ b/paludis/repositories/e/exndbam_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/e/e_installed_repository.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/map.hh>
#include <paludis/repository.hh>
#include <memory>
@@ -55,10 +55,10 @@ namespace paludis
class PALUDIS_VISIBLE ExndbamRepository :
public erepository::EInstalledRepository,
public std::enable_shared_from_this<ExndbamRepository>,
- public PrivateImplementationPattern<ExndbamRepository>
+ public Pimp<ExndbamRepository>
{
private:
- PrivateImplementationPattern<ExndbamRepository>::ImpPtr & _imp;
+ Pimp<ExndbamRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
protected:
diff --git a/paludis/repositories/e/fetch_visitor.cc b/paludis/repositories/e/fetch_visitor.cc
index 4c4346a8b..e85d4b71e 100644
--- a/paludis/repositories/e/fetch_visitor.cc
+++ b/paludis/repositories/e/fetch_visitor.cc
@@ -29,7 +29,7 @@
#include <paludis/repository.hh>
#include <paludis/about.hh>
#include <paludis/util/system.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/log.hh>
#include <paludis/util/join.hh>
@@ -44,7 +44,7 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<FetchVisitor>
+ struct Imp<FetchVisitor>
{
const Environment * const env;
const std::shared_ptr<const PackageID> id;
@@ -60,7 +60,7 @@ namespace paludis
std::list<const URILabel *> labels;
- Implementation(
+ Imp(
const Environment * const e,
const std::shared_ptr<const PackageID> & i,
const EAPI & p,
@@ -101,7 +101,7 @@ FetchVisitor::FetchVisitor(
const bool sr,
const std::shared_ptr<OutputManager> & md,
const GetMirrorsFunction & g) :
- PrivateImplementationPattern<FetchVisitor>(e, i, p, d, f, u, m, n, sr, md, g)
+ Pimp<FetchVisitor>(e, i, p, d, f, u, m, n, sr, md, g)
{
}
diff --git a/paludis/repositories/e/fetch_visitor.hh b/paludis/repositories/e/fetch_visitor.hh
index ca9a2e981..81fcc1914 100644
--- a/paludis/repositories/e/fetch_visitor.hh
+++ b/paludis/repositories/e/fetch_visitor.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/e/eapi-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/dep_spec.hh>
@@ -39,7 +39,7 @@ namespace paludis
typedef std::function<std::shared_ptr<const MirrorsSequence> (const std::string &)> GetMirrorsFunction;
class PALUDIS_VISIBLE FetchVisitor :
- private PrivateImplementationPattern<FetchVisitor>
+ private Pimp<FetchVisitor>
{
public:
FetchVisitor(
diff --git a/paludis/repositories/e/glsa.cc b/paludis/repositories/e/glsa.cc
index ebaacbac6..ee240c844 100644
--- a/paludis/repositories/e/glsa.cc
+++ b/paludis/repositories/e/glsa.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/e/glsa.hh>
#include <paludis/repositories/e/xml_things_handle.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -39,21 +39,21 @@ typedef std::list<std::shared_ptr<const GLSAPackage> > Packages;
namespace paludis
{
template<>
- struct Implementation<GLSAPackage>
+ struct Imp<GLSAPackage>
{
QualifiedPackageName name;
Archs archs;
Ranges unaffected;
Ranges vulnerable;
- Implementation(const QualifiedPackageName & n) :
+ Imp(const QualifiedPackageName & n) :
name(n)
{
}
};
template<>
- struct Implementation<GLSA>
+ struct Imp<GLSA>
{
std::string id;
std::string title;
@@ -80,7 +80,7 @@ namespace paludis
}
GLSAPackage::GLSAPackage(const QualifiedPackageName & n) :
- PrivateImplementationPattern<GLSAPackage>(n)
+ Pimp<GLSAPackage>(n)
{
}
@@ -149,7 +149,7 @@ GLSAPackage::name() const
}
GLSA::GLSA() :
- PrivateImplementationPattern<GLSA>()
+ Pimp<GLSA>()
{
}
diff --git a/paludis/repositories/e/glsa.hh b/paludis/repositories/e/glsa.hh
index 25fc16228..6d4517038 100644
--- a/paludis/repositories/e/glsa.hh
+++ b/paludis/repositories/e/glsa.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_GLSA_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_GLSA_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/util/named_value.hh>
#include <paludis/name.hh>
@@ -74,7 +74,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE GLSAPackage :
- private PrivateImplementationPattern<GLSAPackage>
+ private Pimp<GLSAPackage>
{
public:
///\name Basic operations
@@ -135,7 +135,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE GLSA :
- private PrivateImplementationPattern<GLSA>
+ private Pimp<GLSA>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/info_metadata_key.cc b/paludis/repositories/e/info_metadata_key.cc
index 599f6e64b..2396412cb 100644
--- a/paludis/repositories/e/info_metadata_key.cc
+++ b/paludis/repositories/e/info_metadata_key.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/e/info_metadata_key.hh>
#include <paludis/repositories/e/eapi.hh>
#include <paludis/repositories/e/e_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/config_file.hh>
@@ -50,21 +50,21 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<InfoVarsMetadataKey>
+ struct Imp<InfoVarsMetadataKey>
{
const std::shared_ptr<const FSEntrySequence> locations;
mutable Mutex mutex;
mutable std::shared_ptr<Set<std::string> > value;
- Implementation(const std::shared_ptr<const FSEntrySequence> & l) :
+ Imp(const std::shared_ptr<const FSEntrySequence> & l) :
locations(l)
{
}
};
template <>
- struct Implementation<InfoPkgsMetadataKey>
+ struct Imp<InfoPkgsMetadataKey>
{
const Environment * const env;
const std::shared_ptr<const FSEntrySequence> locations;
@@ -73,7 +73,7 @@ namespace paludis
mutable Mutex mutex;
mutable bool added;
- Implementation(const Environment * const e, const std::shared_ptr<const FSEntrySequence> & l,
+ Imp(const Environment * const e, const std::shared_ptr<const FSEntrySequence> & l,
const ERepository * const r) :
env(e),
locations(l),
@@ -85,7 +85,7 @@ namespace paludis
}
InfoVarsMetadataKey::InfoVarsMetadataKey(const std::shared_ptr<const FSEntrySequence> & f) :
- PrivateImplementationPattern<InfoVarsMetadataKey>(f)
+ Pimp<InfoVarsMetadataKey>(f)
{
}
@@ -140,8 +140,8 @@ InfoVarsMetadataKey::type() const
InfoPkgsMetadataKey::InfoPkgsMetadataKey(const Environment * const e,
const std::shared_ptr<const FSEntrySequence> & f,
const ERepository * const r) :
- PrivateImplementationPattern<InfoPkgsMetadataKey>(e, f, r),
- _imp(PrivateImplementationPattern<InfoPkgsMetadataKey>::_imp)
+ Pimp<InfoPkgsMetadataKey>(e, f, r),
+ _imp(Pimp<InfoPkgsMetadataKey>::_imp)
{
}
@@ -240,6 +240,6 @@ InfoPkgsMetadataKey::type() const
}
-template class PrivateImplementationPattern<InfoPkgsMetadataKey>;
-template class PrivateImplementationPattern<InfoVarsMetadataKey>;
+template class Pimp<InfoPkgsMetadataKey>;
+template class Pimp<InfoVarsMetadataKey>;
diff --git a/paludis/repositories/e/info_metadata_key.hh b/paludis/repositories/e/info_metadata_key.hh
index 240ed755f..71b207c13 100644
--- a/paludis/repositories/e/info_metadata_key.hh
+++ b/paludis/repositories/e/info_metadata_key.hh
@@ -7,7 +7,7 @@
#include <paludis/environment-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/util/set.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -17,10 +17,10 @@ namespace paludis
{
class InfoPkgsMetadataKey :
public MetadataSectionKey,
- private PrivateImplementationPattern<InfoPkgsMetadataKey>
+ private Pimp<InfoPkgsMetadataKey>
{
private:
- PrivateImplementationPattern<InfoPkgsMetadataKey>::ImpPtr & _imp;
+ Pimp<InfoPkgsMetadataKey>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
@@ -38,7 +38,7 @@ namespace paludis
class InfoVarsMetadataKey :
public MetadataCollectionKey<Set<std::string> >,
- private PrivateImplementationPattern<InfoVarsMetadataKey>
+ private Pimp<InfoVarsMetadataKey>
{
public:
InfoVarsMetadataKey(const std::shared_ptr<const FSEntrySequence> &);
@@ -54,8 +54,8 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<erepository::InfoPkgsMetadataKey>;
- extern template class PrivateImplementationPattern<erepository::InfoVarsMetadataKey>;
+ extern template class Pimp<erepository::InfoPkgsMetadataKey>;
+ extern template class Pimp<erepository::InfoVarsMetadataKey>;
}
#endif
diff --git a/paludis/repositories/e/manifest2_reader.cc b/paludis/repositories/e/manifest2_reader.cc
index 1e88c035a..aa45fe5c0 100644
--- a/paludis/repositories/e/manifest2_reader.cc
+++ b/paludis/repositories/e/manifest2_reader.cc
@@ -26,7 +26,7 @@
#include <paludis/util/create_iterator-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/member_iterator-impl.hh>
#include <paludis/util/make_named_values.hh>
@@ -41,12 +41,12 @@ typedef std::map<std::pair<std::string, std::string>, Manifest2Entry> Entries;
namespace paludis
{
template <>
- struct Implementation<Manifest2Reader>
+ struct Imp<Manifest2Reader>
{
FSEntry manifest;
Entries entries;
- Implementation(const FSEntry & f) :
+ Imp(const FSEntry & f) :
manifest(f)
{
}
@@ -65,7 +65,7 @@ Manifest2Error::Manifest2Error(const std::string & msg) throw () :
}
Manifest2Reader::Manifest2Reader(const FSEntry & f) :
- PrivateImplementationPattern<Manifest2Reader>(f)
+ Pimp<Manifest2Reader>(f)
{
if (! f.exists())
return;
diff --git a/paludis/repositories/e/manifest2_reader.hh b/paludis/repositories/e/manifest2_reader.hh
index 803a7902b..afd7d13a4 100644
--- a/paludis/repositories/e/manifest2_reader.hh
+++ b/paludis/repositories/e/manifest2_reader.hh
@@ -78,7 +78,7 @@ namespace paludis
* \ingroup grpmanifest2reader
*/
class PALUDIS_VISIBLE Manifest2Reader :
- private PrivateImplementationPattern<Manifest2Reader>
+ private Pimp<Manifest2Reader>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/memoised_hashes.cc b/paludis/repositories/e/memoised_hashes.cc
index 4f0abf35e..00552c16b 100644
--- a/paludis/repositories/e/memoised_hashes.cc
+++ b/paludis/repositories/e/memoised_hashes.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/e/memoised_hashes.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/util/fs_entry.hh>
@@ -40,19 +40,19 @@ namespace paludis
typedef std::map<std::pair<std::string, int>, std::pair<Timestamp, std::string> > HashesMap;
template <>
- struct Implementation<MemoisedHashes>
+ struct Imp<MemoisedHashes>
{
mutable Mutex mutex;
mutable HashesMap hashes;
- Implementation()
+ Imp()
{
}
};
}
MemoisedHashes::MemoisedHashes() :
- PrivateImplementationPattern<MemoisedHashes>()
+ Pimp<MemoisedHashes>()
{
}
@@ -126,6 +126,6 @@ template const std::string MemoisedHashes::get<SHA1>(const FSEntry &, SafeIFStre
template const std::string MemoisedHashes::get<SHA256>(const FSEntry &, SafeIFStream &) const;
template const std::string MemoisedHashes::get<MD5>(const FSEntry &, SafeIFStream &) const;
-template class PrivateImplementationPattern<MemoisedHashes>;
+template class Pimp<MemoisedHashes>;
template class Singleton<MemoisedHashes>;
diff --git a/paludis/repositories/e/memoised_hashes.hh b/paludis/repositories/e/memoised_hashes.hh
index 5458965e5..a20f0fe4a 100644
--- a/paludis/repositories/e/memoised_hashes.hh
+++ b/paludis/repositories/e/memoised_hashes.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_MEMOISED_HASHES_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_MEMOISED_HASHES_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/singleton.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/util/safe_ifstream-fwd.hh>
@@ -31,7 +31,7 @@ namespace paludis
{
class PALUDIS_VISIBLE MemoisedHashes :
public Singleton<MemoisedHashes>,
- private PrivateImplementationPattern<MemoisedHashes>
+ private Pimp<MemoisedHashes>
{
friend class Singleton<MemoisedHashes>;
@@ -44,7 +44,7 @@ namespace paludis
~MemoisedHashes();
};
}
- extern template class PrivateImplementationPattern<erepository::MemoisedHashes>;
+ extern template class Pimp<erepository::MemoisedHashes>;
extern template class Singleton<erepository::MemoisedHashes>;
}
diff --git a/paludis/repositories/e/metadata_xml.cc b/paludis/repositories/e/metadata_xml.cc
index 8b0c02291..44c8ae12f 100644
--- a/paludis/repositories/e/metadata_xml.cc
+++ b/paludis/repositories/e/metadata_xml.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/e/metadata_xml.hh>
#include <paludis/repositories/e/xml_things_handle.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/map-impl.hh>
#include <paludis/util/mutex.hh>
@@ -38,7 +38,7 @@ typedef std::unordered_map<FSEntry, std::shared_ptr<MetadataXML>, Hash<FSEntry>
namespace paludis
{
template <>
- struct Implementation<MetadataXMLPool>
+ struct Imp<MetadataXMLPool>
{
mutable Mutex mutex;
mutable Store store;
@@ -46,7 +46,7 @@ namespace paludis
}
MetadataXMLPool::MetadataXMLPool() :
- PrivateImplementationPattern<MetadataXMLPool>()
+ Pimp<MetadataXMLPool>()
{
}
@@ -85,6 +85,6 @@ MetadataXMLPool::metadata_if_exists(const FSEntry & f) const
}
template class Map<ChoiceNameWithPrefix, std::string>;
-template class PrivateImplementationPattern<MetadataXMLPool>;
+template class Pimp<MetadataXMLPool>;
template class Singleton<MetadataXMLPool>;
diff --git a/paludis/repositories/e/metadata_xml.hh b/paludis/repositories/e/metadata_xml.hh
index 924a1e812..03a4b051e 100644
--- a/paludis/repositories/e/metadata_xml.hh
+++ b/paludis/repositories/e/metadata_xml.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/named_value.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/singleton.hh>
#include <paludis/util/sequence-fwd.hh>
#include <paludis/util/map-fwd.hh>
@@ -51,7 +51,7 @@ namespace paludis
};
class PALUDIS_VISIBLE MetadataXMLPool :
- private PrivateImplementationPattern<MetadataXMLPool>,
+ private Pimp<MetadataXMLPool>,
public Singleton<MetadataXMLPool>
{
friend class Singleton<MetadataXMLPool>;
@@ -65,7 +65,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<erepository::MetadataXMLPool>;
+ extern template class Pimp<erepository::MetadataXMLPool>;
extern template class Singleton<erepository::MetadataXMLPool>;
}
diff --git a/paludis/repositories/e/myoptions_requirements_verifier.cc b/paludis/repositories/e/myoptions_requirements_verifier.cc
index ad33dfa03..75801a655 100644
--- a/paludis/repositories/e/myoptions_requirements_verifier.cc
+++ b/paludis/repositories/e/myoptions_requirements_verifier.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/e/e_repository_id.hh>
#include <paludis/repositories/e/eapi.hh>
#include <paludis/repositories/e/myoption.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/tokeniser.hh>
@@ -42,7 +42,7 @@ typedef std::list<std::pair<ChoicePrefixName, std::string> > ChildrenList;
namespace paludis
{
template <>
- struct Implementation<MyOptionsRequirementsVerifier>
+ struct Imp<MyOptionsRequirementsVerifier>
{
const std::shared_ptr<const ERepositoryID> id;
@@ -51,7 +51,7 @@ namespace paludis
std::list<ChildrenList> current_children_stack;
std::list<int> number_enabled_stack;
- Implementation(const std::shared_ptr<const ERepositoryID> & i) :
+ Imp(const std::shared_ptr<const ERepositoryID> & i) :
id(i),
unmet_requirements(new Sequence<std::string>)
{
@@ -63,7 +63,7 @@ namespace paludis
}
MyOptionsRequirementsVerifier::MyOptionsRequirementsVerifier(const std::shared_ptr<const ERepositoryID> & id) :
- PrivateImplementationPattern<MyOptionsRequirementsVerifier>(id)
+ Pimp<MyOptionsRequirementsVerifier>(id)
{
}
@@ -346,5 +346,5 @@ MyOptionsRequirementsVerifier::visit(const PlainTextSpecTree::NodeType<AllDepSpe
_imp->current_prefix_stack.pop_front();
}
-template class PrivateImplementationPattern<MyOptionsRequirementsVerifier>;
+template class Pimp<MyOptionsRequirementsVerifier>;
diff --git a/paludis/repositories/e/myoptions_requirements_verifier.hh b/paludis/repositories/e/myoptions_requirements_verifier.hh
index db266da77..6c81f6c26 100644
--- a/paludis/repositories/e/myoptions_requirements_verifier.hh
+++ b/paludis/repositories/e/myoptions_requirements_verifier.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/e/e_repository_id.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
#include <paludis/dep_spec.hh>
#include <paludis/spec_tree.hh>
@@ -33,7 +33,7 @@ namespace paludis
namespace erepository
{
class PALUDIS_VISIBLE MyOptionsRequirementsVerifier :
- private PrivateImplementationPattern<MyOptionsRequirementsVerifier>
+ private Pimp<MyOptionsRequirementsVerifier>
{
private:
void verify_one(const ChoicePrefixName &, const std::string &,
@@ -52,7 +52,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<erepository::MyOptionsRequirementsVerifier>;
+ extern template class Pimp<erepository::MyOptionsRequirementsVerifier>;
}
#endif
diff --git a/paludis/repositories/e/pretend_fetch_visitor.cc b/paludis/repositories/e/pretend_fetch_visitor.cc
index 86db37954..48e46f12f 100644
--- a/paludis/repositories/e/pretend_fetch_visitor.cc
+++ b/paludis/repositories/e/pretend_fetch_visitor.cc
@@ -25,7 +25,7 @@
#include <paludis/package_id.hh>
#include <paludis/action.hh>
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/log.hh>
#include <paludis/util/stringify.hh>
@@ -39,7 +39,7 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<PretendFetchVisitor>
+ struct Imp<PretendFetchVisitor>
{
const Environment * const env;
const std::shared_ptr<const PackageID> id;
@@ -53,7 +53,7 @@ namespace paludis
std::list<const URILabel *> labels;
Manifest2Reader manifest;
- Implementation(
+ Imp(
const Environment * const e,
const std::shared_ptr<const PackageID> & i,
const EAPI & p,
@@ -83,7 +83,7 @@ PretendFetchVisitor::PretendFetchVisitor(
const bool f,
const std::shared_ptr<const URILabel> & n,
PretendFetchAction & a) :
- PrivateImplementationPattern<PretendFetchVisitor>(e, i, p, d, f, n, a)
+ Pimp<PretendFetchVisitor>(e, i, p, d, f, n, a)
{
}
diff --git a/paludis/repositories/e/pretend_fetch_visitor.hh b/paludis/repositories/e/pretend_fetch_visitor.hh
index 5e411e24c..d9755413c 100644
--- a/paludis/repositories/e/pretend_fetch_visitor.hh
+++ b/paludis/repositories/e/pretend_fetch_visitor.hh
@@ -27,14 +27,14 @@
#include <paludis/package_id-fwd.hh>
#include <paludis/repositories/e/eapi-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
namespace erepository
{
class PALUDIS_VISIBLE PretendFetchVisitor :
- private PrivateImplementationPattern<PretendFetchVisitor>
+ private Pimp<PretendFetchVisitor>
{
public:
PretendFetchVisitor(
diff --git a/paludis/repositories/e/profile_file.cc b/paludis/repositories/e/profile_file.cc
index 5f70c6f9d..30fbebcb8 100644
--- a/paludis/repositories/e/profile_file.cc
+++ b/paludis/repositories/e/profile_file.cc
@@ -26,7 +26,7 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/options.hh>
#include <paludis/mask.hh>
#include <list>
@@ -81,7 +81,7 @@ namespace
namespace paludis
{
template <typename F_>
- struct Implementation<ProfileFile<F_> >
+ struct Imp<ProfileFile<F_> >
{
const ERepository * const repository;
@@ -91,7 +91,7 @@ namespace paludis
std::set<std::string> removed;
- Implementation(const ERepository * const r) :
+ Imp(const ERepository * const r) :
repository(r)
{
}
@@ -133,7 +133,7 @@ ProfileFile<F_>::add_file(const FSEntry & f)
const std::string key(FileEntryTraits<const typename std::remove_reference<typename F_::ConstIterator::value_type>::type>::extract_key(*line));
if (0 == key.compare(0, 1, "-", 0, 1))
{
- typename Implementation<ProfileFile>::Lines::iterator i(
+ typename Imp<ProfileFile>::Lines::iterator i(
std::find_if(this->_imp->lines.begin(), this->_imp->lines.end(),
MatchesKey<std::string>(key.substr(1))));
if (this->_imp->lines.end() == i)
@@ -164,7 +164,7 @@ ProfileFile<F_>::add_file(const FSEntry & f)
template <typename F_>
ProfileFile<F_>::ProfileFile(const ERepository * const r) :
- PrivateImplementationPattern<ProfileFile>(r)
+ Pimp<ProfileFile>(r)
{
}
diff --git a/paludis/repositories/e/profile_file.hh b/paludis/repositories/e/profile_file.hh
index ca2efd252..eae514008 100644
--- a/paludis/repositories/e/profile_file.hh
+++ b/paludis/repositories/e/profile_file.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_PROFILE_FILE_HH 1
#include <paludis/repositories/e/eapi-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
@@ -36,7 +36,7 @@ namespace paludis
{
template <typename F_>
class PALUDIS_VISIBLE ProfileFile :
- private PrivateImplementationPattern<ProfileFile<F_> >
+ private Pimp<ProfileFile<F_> >
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/source_uri_finder.cc b/paludis/repositories/e/source_uri_finder.cc
index b10b94b18..8c2ff9bc4 100644
--- a/paludis/repositories/e/source_uri_finder.cc
+++ b/paludis/repositories/e/source_uri_finder.cc
@@ -27,7 +27,7 @@
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/sequence-impl.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <list>
@@ -39,7 +39,7 @@ typedef std::list<std::pair<std::string, std::string> > Items;
namespace paludis
{
template <>
- struct Implementation<SourceURIFinder>
+ struct Imp<SourceURIFinder>
{
const Environment * const env;
const Repository * const repo;
@@ -50,7 +50,7 @@ namespace paludis
Items items;
- Implementation(const Environment * const e, const Repository * const r, const std::string & u, const std::string & f,
+ Imp(const Environment * const e, const Repository * const r, const std::string & u, const std::string & f,
const std::string & m, const GetMirrorsFunction & g) :
env(e),
repo(r),
@@ -71,7 +71,7 @@ namespace paludis
SourceURIFinder::SourceURIFinder(const Environment * const e, const Repository * const repo,
const std::string & u, const std::string & f, const std::string & m, const GetMirrorsFunction & g) :
- PrivateImplementationPattern<SourceURIFinder>(e, repo, u, f, m, g)
+ Pimp<SourceURIFinder>(e, repo, u, f, m, g)
{
}
diff --git a/paludis/repositories/e/source_uri_finder.hh b/paludis/repositories/e/source_uri_finder.hh
index e4c55cfa9..7281bab46 100644
--- a/paludis/repositories/e/source_uri_finder.hh
+++ b/paludis/repositories/e/source_uri_finder.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_SOURCE_URI_FINDER_HH 1
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/dep_label.hh>
#include <paludis/environment-fwd.hh>
@@ -35,7 +35,7 @@ namespace paludis
typedef std::function<std::shared_ptr<const MirrorsSequence> (const std::string &)> GetMirrorsFunction;
class PALUDIS_VISIBLE SourceURIFinder :
- private PrivateImplementationPattern<SourceURIFinder>
+ private Pimp<SourceURIFinder>
{
private:
void add_local_mirrors();
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index dcc1fea3e..05d654165 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -25,7 +25,7 @@
#include <paludis/package_database.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/log.hh>
#include <paludis/util/stringify.hh>
@@ -56,7 +56,7 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace paludis
{
template<>
- struct Implementation<TraditionalLayout>
+ struct Imp<TraditionalLayout>
{
const ERepository * const repository;
const FSEntry tree_root;
@@ -78,7 +78,7 @@ namespace paludis
std::shared_ptr<FSEntrySequence> info_variables_files;
std::shared_ptr<UseDescFileInfoSequence> use_desc_files;
- Implementation(const ERepository * const r, const FSEntry & t) :
+ Imp(const ERepository * const r, const FSEntry & t) :
repository(r),
tree_root(t),
has_category_names(false),
@@ -97,7 +97,7 @@ namespace paludis
TraditionalLayout::TraditionalLayout(const ERepository * const repo, const FSEntry & tree_root,
const std::shared_ptr<const FSEntrySequence> & f) :
Layout(f),
- PrivateImplementationPattern<TraditionalLayout>(repo, tree_root)
+ Pimp<TraditionalLayout>(repo, tree_root)
{
if (master_repositories_locations())
{
diff --git a/paludis/repositories/e/traditional_layout.hh b/paludis/repositories/e/traditional_layout.hh
index b7009eced..eb3d1139b 100644
--- a/paludis/repositories/e/traditional_layout.hh
+++ b/paludis/repositories/e/traditional_layout.hh
@@ -22,7 +22,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_TRADITIONAL_LAYOUT_HH 1
#include <paludis/repositories/e/layout.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -36,7 +36,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE TraditionalLayout :
public Layout,
- private PrivateImplementationPattern<TraditionalLayout>
+ private Pimp<TraditionalLayout>
{
private:
void need_category_names() const;
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index fcdf0f6dc..1e33aa3c0 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -26,7 +26,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/save.hh>
#include <paludis/util/system.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -96,13 +96,13 @@ namespace
namespace paludis
{
/**
- * Implementation for TraditionalProfile.
+ * Imp for TraditionalProfile.
*
* \ingroup grperepository
* \see TraditionalProfile
*/
template<>
- class Implementation<TraditionalProfile>
+ class Imp<TraditionalProfile>
{
private:
void load_environment();
@@ -185,7 +185,7 @@ namespace paludis
///\name Basic operations
///\{
- Implementation(const Environment * const e, const ERepository * const p,
+ Imp(const Environment * const e, const ERepository * const p,
const RepositoryName & name, const FSEntrySequence & dirs,
const std::string & arch_var_if_special, const bool profiles_explicitly_set) :
packages_file(p),
@@ -232,7 +232,7 @@ namespace paludis
handle_profile_arch_var(arch_var_if_special);
}
- ~Implementation()
+ ~Imp()
{
}
@@ -241,14 +241,14 @@ namespace paludis
}
void
-Implementation<TraditionalProfile>::load_environment()
+Imp<TraditionalProfile>::load_environment()
{
environment_variables["CONFIG_PROTECT"] = getenv_with_default("CONFIG_PROTECT", "/etc");
environment_variables["CONFIG_PROTECT_MASK"] = getenv_with_default("CONFIG_PROTECT_MASK", "");
}
void
-Implementation<TraditionalProfile>::load_profile_directory_recursively(const FSEntry & dir)
+Imp<TraditionalProfile>::load_profile_directory_recursively(const FSEntry & dir)
{
Context context("When adding profile directory '" + stringify(dir) + ":");
@@ -286,7 +286,7 @@ Implementation<TraditionalProfile>::load_profile_directory_recursively(const FSE
}
void
-Implementation<TraditionalProfile>::load_profile_parent(const FSEntry & dir)
+Imp<TraditionalProfile>::load_profile_parent(const FSEntry & dir)
{
Context context("When handling parent file for profile directory '" + stringify(dir) + ":");
@@ -332,7 +332,7 @@ Implementation<TraditionalProfile>::load_profile_parent(const FSEntry & dir)
}
void
-Implementation<TraditionalProfile>::load_profile_make_defaults(const FSEntry & dir)
+Imp<TraditionalProfile>::load_profile_make_defaults(const FSEntry & dir)
{
Context context("When handling make.defaults file for profile directory '" + stringify(dir) + ":");
@@ -480,7 +480,7 @@ Implementation<TraditionalProfile>::load_profile_make_defaults(const FSEntry & d
}
void
-Implementation<TraditionalProfile>::load_special_make_defaults_vars(const FSEntry & dir)
+Imp<TraditionalProfile>::load_special_make_defaults_vars(const FSEntry & dir)
{
const std::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(
repository->eapi_for_file(dir / "make.defaults")));
@@ -548,7 +548,7 @@ Implementation<TraditionalProfile>::load_special_make_defaults_vars(const FSEntr
}
bool
-Implementation<TraditionalProfile>::is_incremental(const EAPI & e, const std::string & s) const
+Imp<TraditionalProfile>::is_incremental(const EAPI & e, const std::string & s) const
{
Context c("When checking whether '" + s + "' is incremental:");
@@ -564,7 +564,7 @@ Implementation<TraditionalProfile>::is_incremental(const EAPI & e, const std::st
}
void
-Implementation<TraditionalProfile>::make_vars_from_file_vars()
+Imp<TraditionalProfile>::make_vars_from_file_vars()
{
try
{
@@ -661,7 +661,7 @@ Implementation<TraditionalProfile>::make_vars_from_file_vars()
}
void
-Implementation<TraditionalProfile>::load_basic_use_file(const FSEntry & file, FlagStatusMap & m)
+Imp<TraditionalProfile>::load_basic_use_file(const FSEntry & file, FlagStatusMap & m)
{
if (! file.exists())
return;
@@ -700,7 +700,7 @@ Implementation<TraditionalProfile>::load_basic_use_file(const FSEntry & file, Fl
}
void
-Implementation<TraditionalProfile>::load_spec_use_file(const EAPI & eapi, const FSEntry & file, PackageFlagStatusMapList & m)
+Imp<TraditionalProfile>::load_spec_use_file(const EAPI & eapi, const FSEntry & file, PackageFlagStatusMapList & m)
{
if (! file.exists())
return;
@@ -756,7 +756,7 @@ Implementation<TraditionalProfile>::load_spec_use_file(const EAPI & eapi, const
}
void
-Implementation<TraditionalProfile>::add_use_expand_to_use()
+Imp<TraditionalProfile>::add_use_expand_to_use()
{
Context context("When adding USE_EXPAND to USE:");
@@ -777,7 +777,7 @@ Implementation<TraditionalProfile>::add_use_expand_to_use()
}
void
-Implementation<TraditionalProfile>::fish_out_use_expand_names()
+Imp<TraditionalProfile>::fish_out_use_expand_names()
{
Context context("When finding all known USE_EXPAND names:");
@@ -803,7 +803,7 @@ Implementation<TraditionalProfile>::fish_out_use_expand_names()
}
void
-Implementation<TraditionalProfile>::handle_profile_arch_var(const std::string & s)
+Imp<TraditionalProfile>::handle_profile_arch_var(const std::string & s)
{
Context context("When handling profile " + s + " variable:");
@@ -833,7 +833,7 @@ TraditionalProfile::TraditionalProfile(
const Environment * const env, const ERepository * const p, const RepositoryName & name,
const FSEntrySequence & location,
const std::string & arch_var_if_special, const bool x) :
- PrivateImplementationPattern<TraditionalProfile>(env, p, name, location, arch_var_if_special, x)
+ Pimp<TraditionalProfile>(env, p, name, location, arch_var_if_special, x)
{
}
diff --git a/paludis/repositories/e/traditional_profile.hh b/paludis/repositories/e/traditional_profile.hh
index 2b0369741..aeae22de7 100644
--- a/paludis/repositories/e/traditional_profile.hh
+++ b/paludis/repositories/e/traditional_profile.hh
@@ -29,7 +29,7 @@ namespace paludis
namespace erepository
{
class PALUDIS_VISIBLE TraditionalProfile :
- private PrivateImplementationPattern<TraditionalProfile>,
+ private Pimp<TraditionalProfile>,
public Profile
{
public:
diff --git a/paludis/repositories/e/use_desc.cc b/paludis/repositories/e/use_desc.cc
index 8982419bc..51bb9ca10 100644
--- a/paludis/repositories/e/use_desc.cc
+++ b/paludis/repositories/e/use_desc.cc
@@ -23,7 +23,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -42,7 +42,7 @@ typedef std::unordered_map<std::pair<ChoicePrefixName, UnprefixedChoiceName>, st
namespace paludis
{
template<>
- struct Implementation<UseDesc>
+ struct Imp<UseDesc>
{
std::unordered_map<QualifiedPackageName, UseDescs, Hash<QualifiedPackageName> > local_descs;
UseDescs global_descs;
@@ -69,7 +69,7 @@ namespace paludis
}
}
- Implementation(const std::shared_ptr<const UseDescFileInfoSequence> & f)
+ Imp(const std::shared_ptr<const UseDescFileInfoSequence> & f)
{
for (UseDescFileInfoSequence::ConstIterator ff(f->begin()), ff_end(f->end()) ;
ff != ff_end ; ++ff)
@@ -79,7 +79,7 @@ namespace paludis
}
UseDesc::UseDesc(const std::shared_ptr<const UseDescFileInfoSequence> & f) :
- PrivateImplementationPattern<UseDesc>(f)
+ Pimp<UseDesc>(f)
{
}
diff --git a/paludis/repositories/e/use_desc.hh b/paludis/repositories/e/use_desc.hh
index f15e1fd90..521e89835 100644
--- a/paludis/repositories/e/use_desc.hh
+++ b/paludis/repositories/e/use_desc.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_PALUDIS_REPOSITORIES_E_USE_DESC_HH
#define PALUDIS_GUARD_PALUDIS_PALUDIS_REPOSITORIES_E_USE_DESC_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -38,7 +38,7 @@ namespace paludis
* \ingroup grperepository
*/
class UseDesc :
- private PrivateImplementationPattern<UseDesc>
+ private Pimp<UseDesc>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/e/vdb_merger.cc b/paludis/repositories/e/vdb_merger.cc
index 364b68f9a..4ef716b0a 100644
--- a/paludis/repositories/e/vdb_merger.cc
+++ b/paludis/repositories/e/vdb_merger.cc
@@ -23,7 +23,7 @@
#include <paludis/util/system.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/join.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/strip.hh>
@@ -48,7 +48,7 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<VDBMerger>
+ struct Imp<VDBMerger>
{
VDBMergerParams params;
FSEntry realroot;
@@ -57,7 +57,7 @@ namespace paludis
std::list<std::string> config_protect;
std::list<std::string> config_protect_mask;
- Implementation(const VDBMergerParams & p) :
+ Imp(const VDBMergerParams & p) :
params(p),
realroot(params.root().realpath())
{
@@ -91,8 +91,8 @@ VDBMerger::VDBMerger(const VDBMergerParams & p) :
n::options() = p.options(),
n::root() = p.root()
)),
- PrivateImplementationPattern<VDBMerger>(p),
- _imp(PrivateImplementationPattern<VDBMerger>::_imp)
+ Pimp<VDBMerger>(p),
+ _imp(Pimp<VDBMerger>::_imp)
{
}
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index f8465d6ea..214141af6 100644
--- a/paludis/repositories/e/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -22,7 +22,7 @@
#include <paludis/merger.hh>
#include <paludis/package_id-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/output_manager-fwd.hh>
namespace paludis
@@ -75,13 +75,13 @@ namespace paludis
*/
class PALUDIS_VISIBLE VDBMerger :
public Merger,
- private PrivateImplementationPattern<VDBMerger>
+ private Pimp<VDBMerger>
{
private:
void display_override(const std::string &) const;
std::string make_arrows(const MergeStatusFlags &) const;
- PrivateImplementationPattern<VDBMerger>::ImpPtr & _imp;
+ Pimp<VDBMerger>::ImpPtr & _imp;
public:
///\name Basic operations
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 83ee8841d..0408d8527 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -79,7 +79,7 @@
#include <paludis/util/timestamp.hh>
#include <paludis/util/destringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/create_iterator-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -103,7 +103,7 @@ typedef std::map<std::pair<QualifiedPackageName, VersionSpec>, std::shared_ptr<s
namespace paludis
{
template <>
- struct Implementation<VDBRepository>
+ struct Imp<VDBRepository>
{
VDBRepositoryParams params;
@@ -118,8 +118,8 @@ namespace paludis
mutable bool tried_provides_cache, used_provides_cache;
std::shared_ptr<RepositoryNameCache> names_cache;
- Implementation(const VDBRepository * const, const VDBRepositoryParams &, std::shared_ptr<Mutex> = std::make_shared<Mutex>());
- ~Implementation();
+ Imp(const VDBRepository * const, const VDBRepositoryParams &, std::shared_ptr<Mutex> = std::make_shared<Mutex>());
+ ~Imp();
std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
@@ -130,7 +130,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<std::string> > eapi_when_unknown_key;
};
- Implementation<VDBRepository>::Implementation(const VDBRepository * const r,
+ Imp<VDBRepository>::Imp(const VDBRepository * const r,
const VDBRepositoryParams & p, std::shared_ptr<Mutex> m) :
params(p),
big_nasty_mutex(m),
@@ -155,7 +155,7 @@ namespace paludis
{
}
- Implementation<VDBRepository>::~Implementation()
+ Imp<VDBRepository>::~Imp()
{
}
}
@@ -176,8 +176,8 @@ VDBRepository::VDBRepository(const VDBRepositoryParams & p) :
n::provides_interface() = this,
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<VDBRepository>(this, p),
- _imp(PrivateImplementationPattern<VDBRepository>::_imp)
+ Pimp<VDBRepository>(this, p),
+ _imp(Pimp<VDBRepository>::_imp)
{
_add_metadata_keys();
}
@@ -565,7 +565,7 @@ void
VDBRepository::invalidate()
{
Lock l(*_imp->big_nasty_mutex);
- _imp.reset(new Implementation<VDBRepository>(this, _imp->params, _imp->big_nasty_mutex));
+ _imp.reset(new Imp<VDBRepository>(this, _imp->params, _imp->big_nasty_mutex));
_add_metadata_keys();
}
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index e17349525..9b2f21050 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -24,7 +24,7 @@
#include <paludis/repository.hh>
#include <paludis/action-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/map.hh>
#include <paludis/repositories/e/e_repository_id.hh>
@@ -77,10 +77,10 @@ namespace paludis
public erepository::EInstalledRepository,
public RepositoryProvidesInterface,
public std::enable_shared_from_this<VDBRepository>,
- public PrivateImplementationPattern<VDBRepository>
+ public Pimp<VDBRepository>
{
private:
- PrivateImplementationPattern<VDBRepository>::ImpPtr & _imp;
+ Pimp<VDBRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
bool load_provided_using_cache() const;
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index 12b11dbd1..447e9dea4 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -34,7 +34,7 @@ using namespace paludis;
#include <paludis/util/join.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/strip.hh>
@@ -52,14 +52,14 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<VDBUnmerger>
+ struct Imp<VDBUnmerger>
{
VDBUnmergerOptions options;
std::list<std::string> config_protect;
std::list<std::string> config_protect_mask;
- Implementation(const VDBUnmergerOptions & o) :
+ Imp(const VDBUnmergerOptions & o) :
options(o)
{
tokenise_whitespace(o.config_protect(), std::back_inserter(config_protect));
@@ -74,8 +74,8 @@ VDBUnmerger::VDBUnmerger(const VDBUnmergerOptions & o) :
n::ignore() = o.ignore(),
n::root() = o.root()
)),
- PrivateImplementationPattern<VDBUnmerger>(o),
- _imp(PrivateImplementationPattern<VDBUnmerger>::_imp.get())
+ Pimp<VDBUnmerger>(o),
+ _imp(Pimp<VDBUnmerger>::_imp.get())
{
}
diff --git a/paludis/repositories/e/vdb_unmerger.hh b/paludis/repositories/e/vdb_unmerger.hh
index b510d2c50..529d1f44a 100644
--- a/paludis/repositories/e/vdb_unmerger.hh
+++ b/paludis/repositories/e/vdb_unmerger.hh
@@ -22,7 +22,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_VDB_UNMERGER_HH 1
#include <paludis/repository.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/unmerger.hh>
@@ -86,10 +86,10 @@ namespace paludis
*/
class PALUDIS_VISIBLE VDBUnmerger :
public Unmerger,
- private PrivateImplementationPattern<VDBUnmerger>
+ private Pimp<VDBUnmerger>
{
private:
- Implementation<VDBUnmerger> * _imp;
+ Imp<VDBUnmerger> * _imp;
protected:
bool config_protected(const FSEntry &) const;
diff --git a/paludis/repositories/e/xml_things_handle.cc b/paludis/repositories/e/xml_things_handle.cc
index 81d16dc71..443432257 100644
--- a/paludis/repositories/e/xml_things_handle.cc
+++ b/paludis/repositories/e/xml_things_handle.cc
@@ -21,7 +21,7 @@
#include <paludis/about.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/system.hh>
#include "config.h"
@@ -36,7 +36,7 @@ using namespace paludis::erepository;
namespace paludis
{
template <>
- struct Implementation<XMLThingsHandle>
+ struct Imp<XMLThingsHandle>
{
void * paludis_handle;
void * handle;
@@ -49,7 +49,7 @@ namespace paludis
InitPtr init;
CleanupPtr cleanup;
- Implementation() :
+ Imp() :
paludis_handle(0),
handle(0),
create_glsa_from_xml_file(0),
@@ -123,7 +123,7 @@ namespace paludis
}
XMLThingsHandle::XMLThingsHandle() :
- PrivateImplementationPattern<XMLThingsHandle>()
+ Pimp<XMLThingsHandle>()
{
}
@@ -149,6 +149,6 @@ XMLThingsHandle::create_metadata_xml_from_xml_file() const
return _imp->create_metadata_xml_from_xml_file;
}
-template class PrivateImplementationPattern<XMLThingsHandle>;
+template class Pimp<XMLThingsHandle>;
template class Singleton<XMLThingsHandle>;
diff --git a/paludis/repositories/e/xml_things_handle.hh b/paludis/repositories/e/xml_things_handle.hh
index 1d56ab894..034688777 100644
--- a/paludis/repositories/e/xml_things_handle.hh
+++ b/paludis/repositories/e/xml_things_handle.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/e/glsa.hh>
#include <paludis/repositories/e/metadata_xml.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/singleton.hh>
#include <paludis/util/fs_entry-fwd.hh>
@@ -31,7 +31,7 @@ namespace paludis
namespace erepository
{
class PALUDIS_VISIBLE XMLThingsHandle :
- private PrivateImplementationPattern<XMLThingsHandle>,
+ private Pimp<XMLThingsHandle>,
public Singleton<XMLThingsHandle>
{
friend class Singleton<XMLThingsHandle>;
@@ -51,7 +51,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<erepository::XMLThingsHandle>;
+ extern template class Pimp<erepository::XMLThingsHandle>;
extern template class Singleton<erepository::XMLThingsHandle>;
}
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index bb0f1112f..2d84b83c4 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -32,21 +32,21 @@
#include <paludis/action.hh>
#include <paludis/literal_metadata_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<FakeInstalledRepository>
+ struct Imp<FakeInstalledRepository>
{
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key;
const bool supports_uninstall;
const bool is_suitable_destination;
- Implementation(const bool s, const bool b) :
+ Imp(const bool s, const bool b) :
format_key(new LiteralMetadataValueKey<std::string> (
"format", "format", mkt_significant, "installed_fake")),
installed_root_key(new LiteralMetadataValueKey<FSEntry> (
@@ -67,8 +67,8 @@ FakeInstalledRepository::FakeInstalledRepository(const FakeInstalledRepositoryPa
n::provides_interface() = this,
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<FakeInstalledRepository>(p.supports_uninstall(), p.suitable_destination()),
- _imp(PrivateImplementationPattern<FakeInstalledRepository>::_imp)
+ Pimp<FakeInstalledRepository>(p.supports_uninstall(), p.suitable_destination()),
+ _imp(Pimp<FakeInstalledRepository>::_imp)
{
add_metadata_key(_imp->format_key);
add_metadata_key(_imp->installed_root_key);
diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh
index c0d50fbad..9306cc609 100644
--- a/paludis/repositories/fake/fake_installed_repository.hh
+++ b/paludis/repositories/fake/fake_installed_repository.hh
@@ -52,10 +52,10 @@ namespace paludis
public FakeRepositoryBase,
public RepositoryDestinationInterface,
public RepositoryProvidesInterface,
- private PrivateImplementationPattern<FakeInstalledRepository>
+ private Pimp<FakeInstalledRepository>
{
private:
- PrivateImplementationPattern<FakeInstalledRepository>::ImpPtr & _imp;
+ Pimp<FakeInstalledRepository>::ImpPtr & _imp;
protected:
/* RepositoryDestinationInterface */
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 24498284a..f70efeb6c 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -31,7 +31,7 @@
#include <paludis/user_dep_spec.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/set.hh>
#include <paludis/util/create_iterator-impl.hh>
@@ -53,14 +53,14 @@ using namespace paludis::fakerepository;
namespace paludis
{
template <typename C_>
- struct Implementation<FakeMetadataValueKey<C_> >
+ struct Imp<FakeMetadataValueKey<C_> >
{
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
C_ value;
- Implementation(const std::string & r, const std::string & h, const MetadataKeyType t, const C_ & c) :
+ Imp(const std::string & r, const std::string & h, const MetadataKeyType t, const C_ & c) :
raw_name(r),
human_name(h),
type(t),
@@ -73,8 +73,8 @@ namespace paludis
template <typename C_>
FakeMetadataValueKey<C_>::FakeMetadataValueKey(
const std::string & r, const std::string & h, const MetadataKeyType t, const C_ & c) :
- PrivateImplementationPattern<FakeMetadataValueKey<C_> >(r, h, t, c),
- _imp(PrivateImplementationPattern<FakeMetadataValueKey<C_> >::_imp)
+ Pimp<FakeMetadataValueKey<C_> >(r, h, t, c),
+ _imp(Pimp<FakeMetadataValueKey<C_> >::_imp)
{
}
@@ -128,7 +128,7 @@ FakeMetadataValueKey<C_>::set_value(const C_ & c)
namespace paludis
{
template <typename C_>
- struct Implementation<FakeMetadataCollectionKey<C_> >
+ struct Imp<FakeMetadataCollectionKey<C_> >
{
std::shared_ptr<C_> collection;
const PackageID * const id;
@@ -138,7 +138,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const PackageID * const i, const Environment * const e,
+ Imp(const PackageID * const i, const Environment * const e,
const std::string & r, const std::string & h, const MetadataKeyType t) :
id(i),
env(e),
@@ -154,8 +154,8 @@ template <typename C_>
FakeMetadataCollectionKey<C_>::FakeMetadataCollectionKey(
const std::string & r, const std::string & h, const MetadataKeyType t, const PackageID * const i,
const Environment * const e) :
- PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >(i, e, r, h, t),
- _imp(PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >::_imp)
+ Pimp<FakeMetadataCollectionKey<C_> >(i, e, r, h, t),
+ _imp(Pimp<FakeMetadataCollectionKey<C_> >::_imp)
{
}
@@ -210,7 +210,7 @@ FakeMetadataKeywordSetKey::set_from_string(const std::string & s)
namespace paludis
{
template <typename C_>
- struct Implementation<FakeMetadataSpecTreeKey<C_> >
+ struct Imp<FakeMetadataSpecTreeKey<C_> >
{
std::shared_ptr<const C_> value;
std::string string_value;
@@ -220,7 +220,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::function<const std::shared_ptr<const C_> (const std::string &)> & f,
+ Imp(const std::function<const std::shared_ptr<const C_> (const std::string &)> & f,
const std::string & r, const std::string & h, const MetadataKeyType t) :
func(f),
raw_name(r),
@@ -231,7 +231,7 @@ namespace paludis
};
template <>
- struct Implementation<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
+ struct Imp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
{
std::shared_ptr<const FetchableURISpecTree> value;
std::string string_value;
@@ -242,7 +242,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::function<const std::shared_ptr<const FetchableURISpecTree> (const std::string &)> & f,
+ Imp(const std::function<const std::shared_ptr<const FetchableURISpecTree> (const std::string &)> & f,
const std::string & r, const std::string & h, const MetadataKeyType t) :
func(f),
initial_label(new URIListedThenMirrorsLabel("listed-then-mirrors")),
@@ -254,7 +254,7 @@ namespace paludis
};
template <>
- struct Implementation<FakeMetadataSpecTreeKey<DependencySpecTree> >
+ struct Imp<FakeMetadataSpecTreeKey<DependencySpecTree> >
{
std::shared_ptr<const DependencySpecTree> value;
std::string string_value;
@@ -265,7 +265,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::function<const std::shared_ptr<const DependencySpecTree> (const std::string &)> & f,
+ Imp(const std::function<const std::shared_ptr<const DependencySpecTree> (const std::string &)> & f,
const std::shared_ptr<const DependenciesLabelSequence> & s,
const std::string & r, const std::string & h, const MetadataKeyType t) :
func(f),
@@ -281,8 +281,8 @@ namespace paludis
template <typename C_>
FakeMetadataSpecTreeKey<C_>::FakeMetadataSpecTreeKey(const std::string & r, const std::string & h, const std::string & v,
const std::function<const std::shared_ptr<const C_> (const std::string &)> & f, const MetadataKeyType t) :
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<C_> >(f, r, h, t),
- _imp(PrivateImplementationPattern<FakeMetadataSpecTreeKey<C_> >::_imp)
+ Pimp<FakeMetadataSpecTreeKey<C_> >(f, r, h, t),
+ _imp(Pimp<FakeMetadataSpecTreeKey<C_> >::_imp)
{
set_from_string(v);
}
@@ -344,8 +344,8 @@ FakeMetadataSpecTreeKey<C_>::pretty_print_flat(const typename C_::ItemFormatter
FakeMetadataSpecTreeKey<FetchableURISpecTree>::FakeMetadataSpecTreeKey(const std::string & r, const std::string & h, const std::string & v,
const std::function<const std::shared_ptr<const FetchableURISpecTree> (const std::string &)> & f, const MetadataKeyType t) :
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<FetchableURISpecTree> >(f, r, h, t),
- _imp(PrivateImplementationPattern<FakeMetadataSpecTreeKey<FetchableURISpecTree> >::_imp)
+ Pimp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >(f, r, h, t),
+ _imp(Pimp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >::_imp)
{
set_from_string(v);
}
@@ -406,8 +406,8 @@ FakeMetadataSpecTreeKey<FetchableURISpecTree>::initial_label() const
FakeMetadataSpecTreeKey<DependencySpecTree>::FakeMetadataSpecTreeKey(const std::string & r, const std::string & h, const std::string & v,
const std::function<const std::shared_ptr<const DependencySpecTree> (const std::string &)> & f,
const std::shared_ptr<const DependenciesLabelSequence> & s, const MetadataKeyType t) :
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<DependencySpecTree> >(f, s, r, h, t),
- _imp(PrivateImplementationPattern<FakeMetadataSpecTreeKey<DependencySpecTree> >::_imp)
+ Pimp<FakeMetadataSpecTreeKey<DependencySpecTree> >(f, s, r, h, t),
+ _imp(Pimp<FakeMetadataSpecTreeKey<DependencySpecTree> >::_imp)
{
set_from_string(v);
}
@@ -468,14 +468,14 @@ FakeMetadataSpecTreeKey<DependencySpecTree>::type() const
namespace paludis
{
template <>
- struct Implementation<FakeMetadataChoicesKey>
+ struct Imp<FakeMetadataChoicesKey>
{
const Environment * const env;
const std::shared_ptr<const PackageID> id;
std::shared_ptr<Choices> value;
std::map<std::string, std::shared_ptr<Choice> > choices;
- Implementation(const Environment * const e, const std::shared_ptr<const PackageID> & i) :
+ Imp(const Environment * const e, const std::shared_ptr<const PackageID> & i) :
env(e),
id(i),
value(new Choices)
@@ -550,8 +550,8 @@ namespace
FakeMetadataChoicesKey::FakeMetadataChoicesKey(const Environment * const e,
const std::shared_ptr<const PackageID> & i) :
- PrivateImplementationPattern<FakeMetadataChoicesKey>(e, i),
- _imp(PrivateImplementationPattern<FakeMetadataChoicesKey>::_imp)
+ Pimp<FakeMetadataChoicesKey>(e, i),
+ _imp(Pimp<FakeMetadataChoicesKey>::_imp)
{
}
@@ -608,13 +608,13 @@ FakeMetadataChoicesKey::type() const
namespace paludis
{
template <>
- struct Implementation<FakeUnacceptedMask>
+ struct Imp<FakeUnacceptedMask>
{
const char key;
const std::string description;
const std::shared_ptr<const MetadataKey> unaccepted_key;
- Implementation(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
+ Imp(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
key(k),
description(d),
unaccepted_key(u)
@@ -624,7 +624,7 @@ namespace paludis
}
FakeUnacceptedMask::FakeUnacceptedMask(const char c, const std::string & s, const std::shared_ptr<const MetadataKey> & k) :
- PrivateImplementationPattern<FakeUnacceptedMask>(c, s, k)
+ Pimp<FakeUnacceptedMask>(c, s, k)
{
}
@@ -681,7 +681,7 @@ namespace paludis
using namespace std::placeholders;
template <>
- struct Implementation<FakePackageID>
+ struct Imp<FakePackageID>
{
mutable Mutex mutex;
@@ -717,7 +717,7 @@ namespace paludis
std::shared_ptr<Mask> unsupported_mask;
mutable bool has_masks;
- Implementation(const Environment * const e, const std::shared_ptr<const FakeRepositoryBase> & r,
+ Imp(const Environment * const e, const std::shared_ptr<const FakeRepositoryBase> & r,
const QualifiedPackageName & q, const VersionSpec & v, const PackageID * const id) :
env(e),
repository(r),
@@ -746,8 +746,8 @@ namespace paludis
FakePackageID::FakePackageID(const Environment * const e, const std::shared_ptr<const FakeRepositoryBase> & r,
const QualifiedPackageName & q, const VersionSpec & v) :
- PrivateImplementationPattern<FakePackageID>(e, r, q, v, this),
- _imp(PrivateImplementationPattern<FakePackageID>::_imp)
+ Pimp<FakePackageID>(e, r, q, v, this),
+ _imp(Pimp<FakePackageID>::_imp)
{
add_metadata_key(_imp->keywords);
}
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index e4e44946f..a0b17fbf0 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -33,10 +33,10 @@ namespace paludis
template <typename C_>
class PALUDIS_VISIBLE FakeMetadataValueKey :
public MetadataValueKey<C_>,
- private PrivateImplementationPattern<FakeMetadataValueKey<C_> >
+ private Pimp<FakeMetadataValueKey<C_> >
{
protected:
- typename PrivateImplementationPattern<FakeMetadataValueKey<C_> >::ImpPtr & _imp;
+ typename Pimp<FakeMetadataValueKey<C_> >::ImpPtr & _imp;
public:
FakeMetadataValueKey(const std::string &, const std::string &, const MetadataKeyType,
@@ -58,10 +58,10 @@ namespace paludis
template <typename C_>
class PALUDIS_VISIBLE FakeMetadataCollectionKey :
public MetadataCollectionKey<C_>,
- private PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >
+ private Pimp<FakeMetadataCollectionKey<C_> >
{
protected:
- typename PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >::ImpPtr & _imp;
+ typename Pimp<FakeMetadataCollectionKey<C_> >::ImpPtr & _imp;
FakeMetadataCollectionKey(const std::string &, const std::string &, const MetadataKeyType,
const PackageID * const, const Environment * const);
@@ -92,10 +92,10 @@ namespace paludis
template <typename C_>
class PALUDIS_VISIBLE FakeMetadataSpecTreeKey :
public MetadataSpecTreeKey<C_>,
- private PrivateImplementationPattern<FakeMetadataSpecTreeKey<C_> >
+ private Pimp<FakeMetadataSpecTreeKey<C_> >
{
private:
- typename PrivateImplementationPattern<FakeMetadataSpecTreeKey<C_> >::ImpPtr & _imp;
+ typename Pimp<FakeMetadataSpecTreeKey<C_> >::ImpPtr & _imp;
public:
FakeMetadataSpecTreeKey(const std::string &, const std::string &, const std::string &,
@@ -121,10 +121,10 @@ namespace paludis
template <>
class PALUDIS_VISIBLE FakeMetadataSpecTreeKey<FetchableURISpecTree> :
public MetadataSpecTreeKey<FetchableURISpecTree>,
- private PrivateImplementationPattern<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
+ private Pimp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
{
private:
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<FetchableURISpecTree> >::ImpPtr & _imp;
+ Pimp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >::ImpPtr & _imp;
public:
FakeMetadataSpecTreeKey(const std::string &, const std::string &, const std::string &,
@@ -154,10 +154,10 @@ namespace paludis
template <>
class PALUDIS_VISIBLE FakeMetadataSpecTreeKey<DependencySpecTree> :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<FakeMetadataSpecTreeKey<DependencySpecTree> >
+ private Pimp<FakeMetadataSpecTreeKey<DependencySpecTree> >
{
private:
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<DependencySpecTree> >::ImpPtr & _imp;
+ Pimp<FakeMetadataSpecTreeKey<DependencySpecTree> >::ImpPtr & _imp;
public:
FakeMetadataSpecTreeKey(const std::string &, const std::string &, const std::string &,
@@ -187,10 +187,10 @@ namespace paludis
class PALUDIS_VISIBLE FakeMetadataChoicesKey :
public MetadataValueKey<std::shared_ptr<const Choices> >,
- private PrivateImplementationPattern<FakeMetadataChoicesKey>
+ private Pimp<FakeMetadataChoicesKey>
{
private:
- PrivateImplementationPattern<FakeMetadataChoicesKey>::ImpPtr & _imp;
+ Pimp<FakeMetadataChoicesKey>::ImpPtr & _imp;
public:
FakeMetadataChoicesKey(
@@ -208,7 +208,7 @@ namespace paludis
class PALUDIS_VISIBLE FakeUnacceptedMask :
public UnacceptedMask,
- private PrivateImplementationPattern<FakeUnacceptedMask>
+ private Pimp<FakeUnacceptedMask>
{
public:
FakeUnacceptedMask(const char, const std::string &, const std::shared_ptr<const MetadataKey> &);
@@ -241,11 +241,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE FakePackageID :
public PackageID,
- private PrivateImplementationPattern<FakePackageID>,
+ private Pimp<FakePackageID>,
public std::enable_shared_from_this<FakePackageID>
{
private:
- PrivateImplementationPattern<FakePackageID>::ImpPtr & _imp;
+ Pimp<FakePackageID>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index 83bb4478e..fa61e2911 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/repositories/fake/fake_package_id.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -38,12 +38,12 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<FakeRepository>
+ struct Imp<FakeRepository>
{
std::shared_ptr<FakeRepository::VirtualsSequence> virtual_packages;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation() :
+ Imp() :
virtual_packages(new FakeRepository::VirtualsSequence),
format_key(new LiteralMetadataValueKey<std::string> (
"format", "format", mkt_significant, "fake"))
@@ -53,7 +53,7 @@ namespace paludis
}
FakeRepository::FakeRepository(const FakeRepositoryParams & params) :
- PrivateImplementationPattern<FakeRepository>(),
+ Pimp<FakeRepository>(),
FakeRepositoryBase(params.environment(), params.name(), make_named_values<RepositoryCapabilities>(
n::destination_interface() = static_cast<RepositoryDestinationInterface *>(0),
n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
@@ -63,7 +63,7 @@ FakeRepository::FakeRepository(const FakeRepositoryParams & params) :
n::virtuals_interface() = (*DistributionData::get_instance()->distribution_from_string(
params.environment()->distribution())).support_old_style_virtuals() ? this : 0
)),
- _imp(PrivateImplementationPattern<FakeRepository>::_imp)
+ _imp(Pimp<FakeRepository>::_imp)
{
add_metadata_key(_imp->format_key);
}
diff --git a/paludis/repositories/fake/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh
index 77272af22..8b9c886aa 100644
--- a/paludis/repositories/fake/fake_repository.hh
+++ b/paludis/repositories/fake/fake_repository.hh
@@ -51,12 +51,12 @@ namespace paludis
* \ingroup grpfakerepository
*/
class PALUDIS_VISIBLE FakeRepository :
- private PrivateImplementationPattern<FakeRepository>,
+ private Pimp<FakeRepository>,
public FakeRepositoryBase,
public RepositoryVirtualsInterface
{
private:
- PrivateImplementationPattern<FakeRepository>::ImpPtr & _imp;
+ Pimp<FakeRepository>::ImpPtr & _imp;
public:
///\name Basic operations
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index 2b28bdfd6..8f9a97e68 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/fake/fake_repository_base.hh>
#include <paludis/repositories/fake/fake_package_id.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
@@ -33,7 +33,7 @@
#include <algorithm>
/** \file
- * Implementation for FakeRepositoryBase.
+ * Imp for FakeRepositoryBase.
*
* \ingroup grpfakerepository
*/
@@ -43,7 +43,7 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<FakeRepositoryBase>
+ struct Imp<FakeRepositoryBase>
{
std::shared_ptr<CategoryNamePartSet> category_names;
std::map<CategoryNamePart, std::shared_ptr<PackageNamePartSet> > package_names;
@@ -51,10 +51,10 @@ namespace paludis
const Environment * const env;
- Implementation(const Environment * const);
+ Imp(const Environment * const);
};
- Implementation<FakeRepositoryBase>::Implementation(const Environment * const e) :
+ Imp<FakeRepositoryBase>::Imp(const Environment * const e) :
category_names(new CategoryNamePartSet),
env(e)
{
@@ -64,8 +64,8 @@ namespace paludis
FakeRepositoryBase::FakeRepositoryBase(const Environment * const e,
const RepositoryName & our_name, const RepositoryCapabilities & caps) :
Repository(e, our_name, caps),
- PrivateImplementationPattern<FakeRepositoryBase>(e),
- _imp(PrivateImplementationPattern<FakeRepositoryBase>::_imp)
+ Pimp<FakeRepositoryBase>(e),
+ _imp(Pimp<FakeRepositoryBase>::_imp)
{
}
diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh
index 762c5c7d6..83bd07b60 100644
--- a/paludis/repositories/fake/fake_repository_base.hh
+++ b/paludis/repositories/fake/fake_repository_base.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/action-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
/** \file
* Declarations for the FakeRepositoryBase class.
@@ -44,11 +44,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE FakeRepositoryBase :
public Repository,
- private PrivateImplementationPattern<FakeRepositoryBase>,
+ private Pimp<FakeRepositoryBase>,
public std::enable_shared_from_this<FakeRepositoryBase>
{
private:
- PrivateImplementationPattern<FakeRepositoryBase>::ImpPtr & _imp;
+ Pimp<FakeRepositoryBase>::ImpPtr & _imp;
protected:
/**
diff --git a/paludis/repositories/gems/gem_specification.cc b/paludis/repositories/gems/gem_specification.cc
index a223bd6b5..961a01cde 100644
--- a/paludis/repositories/gems/gem_specification.cc
+++ b/paludis/repositories/gems/gem_specification.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/gems/gem_specification.hh>
#include <paludis/repositories/gems/yaml.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/make_named_values.hh>
@@ -41,7 +41,7 @@ using namespace paludis::gems;
namespace paludis
{
template <>
- struct Implementation<GemSpecification>
+ struct Imp<GemSpecification>
{
mutable Mutex mutex;
@@ -65,7 +65,7 @@ namespace paludis
mutable bool has_masks;
- Implementation(const Environment * const e, const std::shared_ptr<const Repository> & r) :
+ Imp(const Environment * const e, const std::shared_ptr<const Repository> & r) :
environment(e),
repository(r),
has_masks(false)
@@ -195,9 +195,9 @@ namespace
struct TopVisitor
{
- Implementation<GemSpecification> * const _imp;
+ Imp<GemSpecification> * const _imp;
- TopVisitor(Implementation<GemSpecification> * const i) :
+ TopVisitor(Imp<GemSpecification> * const i) :
_imp(i)
{
}
@@ -245,8 +245,8 @@ namespace
GemSpecification::GemSpecification(const Environment * const e,
const std::shared_ptr<const Repository> & r, const yaml::Node & node) :
- PrivateImplementationPattern<GemSpecification>(e, r),
- _imp(PrivateImplementationPattern<GemSpecification>::_imp)
+ Pimp<GemSpecification>(e, r),
+ _imp(Pimp<GemSpecification>::_imp)
{
TopVisitor v(_imp.get());
node.accept(v);
@@ -267,8 +267,8 @@ GemSpecification::GemSpecification(const Environment * const e,
GemSpecification::GemSpecification(const Environment * const e, const std::shared_ptr<const Repository> & r,
const PackageNamePart & q, const VersionSpec & v, const FSEntry & f) :
- PrivateImplementationPattern<GemSpecification>(e, r),
- _imp(PrivateImplementationPattern<GemSpecification>::_imp)
+ Pimp<GemSpecification>(e, r),
+ _imp(Pimp<GemSpecification>::_imp)
{
_imp->name_part = stringify(q);
_imp->version = stringify(v);
diff --git a/paludis/repositories/gems/gem_specification.hh b/paludis/repositories/gems/gem_specification.hh
index c6bd9581e..26f44c035 100644
--- a/paludis/repositories/gems/gem_specification.hh
+++ b/paludis/repositories/gems/gem_specification.hh
@@ -25,7 +25,7 @@
#include <paludis/package_id.hh>
#include <paludis/name-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <string>
@@ -60,11 +60,11 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE GemSpecification :
- private PrivateImplementationPattern<GemSpecification>,
+ private Pimp<GemSpecification>,
public PackageID
{
private:
- PrivateImplementationPattern<GemSpecification>::ImpPtr & _imp;
+ Pimp<GemSpecification>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/gems/gem_specifications.cc b/paludis/repositories/gems/gem_specifications.cc
index 4ed784800..9516275b5 100644
--- a/paludis/repositories/gems/gem_specifications.cc
+++ b/paludis/repositories/gems/gem_specifications.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/gems/yaml.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -38,7 +38,7 @@ typedef std::unordered_map<std::pair<QualifiedPackageName, VersionSpec>, std::sh
namespace paludis
{
template <>
- struct Implementation<GemSpecifications>
+ struct Imp<GemSpecifications>
{
Specs specs;
};
@@ -103,12 +103,12 @@ namespace
struct GemsVisitor
{
- Implementation<GemSpecifications> * const _imp;
+ Imp<GemSpecifications> * const _imp;
const Environment * const environment;
const std::shared_ptr<const Repository> repository;
GemsVisitor(const Environment * const e,
- const std::shared_ptr<const Repository> & r, Implementation<GemSpecifications> * const i) :
+ const std::shared_ptr<const Repository> & r, Imp<GemSpecifications> * const i) :
_imp(i),
environment(e),
repository(r)
@@ -156,12 +156,12 @@ namespace
struct TopVisitor
{
- Implementation<GemSpecifications> * const _imp;
+ Imp<GemSpecifications> * const _imp;
const Environment * const environment;
const std::shared_ptr<const Repository> repository;
TopVisitor(const Environment * const e,
- const std::shared_ptr<const Repository> & r, Implementation<GemSpecifications> * const i) :
+ const std::shared_ptr<const Repository> & r, Imp<GemSpecifications> * const i) :
_imp(i),
environment(e),
repository(r)
@@ -196,7 +196,7 @@ namespace
GemSpecifications::GemSpecifications(const Environment * const e,
const std::shared_ptr<const Repository> & r, const yaml::Node & n) :
- PrivateImplementationPattern<GemSpecifications>()
+ Pimp<GemSpecifications>()
{
TopVisitor v(e, r, _imp.get());
n.accept(v);
diff --git a/paludis/repositories/gems/gem_specifications.hh b/paludis/repositories/gems/gem_specifications.hh
index 96b613a05..c767d69ac 100644
--- a/paludis/repositories/gems/gem_specifications.hh
+++ b/paludis/repositories/gems/gem_specifications.hh
@@ -23,7 +23,7 @@
#include <paludis/repositories/gems/gem_specification-fwd.hh>
#include <paludis/repositories/gems/yaml-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/name-fwd.hh>
@@ -44,7 +44,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE GemSpecifications :
- private PrivateImplementationPattern<GemSpecifications>
+ private Pimp<GemSpecifications>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/gems/gems_repository.cc b/paludis/repositories/gems/gems_repository.cc
index 45c1fffa5..48163ed22 100644
--- a/paludis/repositories/gems/gems_repository.cc
+++ b/paludis/repositories/gems/gems_repository.cc
@@ -25,7 +25,7 @@
#include <paludis/repositories/gems/exceptions.hh>
#include <paludis/repositories/gems/extra_distribution_data.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/system.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
@@ -47,7 +47,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<GemsRepository>
+ struct Imp<GemsRepository>
{
const gems::RepositoryParams params;
@@ -67,7 +67,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<std::string> > sync_options_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const gems::RepositoryParams p, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
+ Imp(const gems::RepositoryParams p, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
params(p),
big_nasty_mutex(m),
has_category_names(false),
@@ -99,8 +99,8 @@ GemsRepository::GemsRepository(const gems::RepositoryParams & params) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<GemsRepository>(params),
- _imp(PrivateImplementationPattern<GemsRepository>::_imp)
+ Pimp<GemsRepository>(params),
+ _imp(Pimp<GemsRepository>::_imp)
{
_add_metadata_keys();
}
@@ -126,7 +126,7 @@ GemsRepository::invalidate()
{
Lock l(*_imp->big_nasty_mutex);
- _imp.reset(new Implementation<GemsRepository>(_imp->params, _imp->big_nasty_mutex));
+ _imp.reset(new Imp<GemsRepository>(_imp->params, _imp->big_nasty_mutex));
_add_metadata_keys();
}
diff --git a/paludis/repositories/gems/gems_repository.hh b/paludis/repositories/gems/gems_repository.hh
index cac9353d1..d9e0152dc 100644
--- a/paludis/repositories/gems/gems_repository.hh
+++ b/paludis/repositories/gems/gems_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/repositories/gems/params-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
namespace paludis
@@ -35,11 +35,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE GemsRepository :
public Repository,
- private PrivateImplementationPattern<GemsRepository>,
+ private Pimp<GemsRepository>,
public std::enable_shared_from_this<GemsRepository>
{
private:
- PrivateImplementationPattern<GemsRepository>::ImpPtr & _imp;
+ Pimp<GemsRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_category_names() const;
diff --git a/paludis/repositories/gems/installed_gems_repository.cc b/paludis/repositories/gems/installed_gems_repository.cc
index 3fd9448f9..27deb5b1f 100644
--- a/paludis/repositories/gems/installed_gems_repository.cc
+++ b/paludis/repositories/gems/installed_gems_repository.cc
@@ -26,7 +26,7 @@
#include <paludis/package_database.hh>
#include <paludis/environment.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
@@ -56,7 +56,7 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace paludis
{
template <>
- struct Implementation<InstalledGemsRepository>
+ struct Imp<InstalledGemsRepository>
{
const std::shared_ptr<Mutex> big_nasty_mutex;
@@ -74,7 +74,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const gems::InstalledRepositoryParams p,
+ Imp(const gems::InstalledRepositoryParams p,
std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
big_nasty_mutex(m),
params(p),
@@ -104,8 +104,8 @@ InstalledGemsRepository::InstalledGemsRepository(const gems::InstalledRepository
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<InstalledGemsRepository>(params),
- _imp(PrivateImplementationPattern<InstalledGemsRepository>::_imp)
+ Pimp<InstalledGemsRepository>(params),
+ _imp(Pimp<InstalledGemsRepository>::_imp)
{
_add_metadata_keys();
}
@@ -128,7 +128,7 @@ void
InstalledGemsRepository::invalidate()
{
Lock l(*_imp->big_nasty_mutex);
- _imp.reset(new Implementation<InstalledGemsRepository>(_imp->params, _imp->big_nasty_mutex));
+ _imp.reset(new Imp<InstalledGemsRepository>(_imp->params, _imp->big_nasty_mutex));
_add_metadata_keys();
}
diff --git a/paludis/repositories/gems/installed_gems_repository.hh b/paludis/repositories/gems/installed_gems_repository.hh
index 7d1f0f0bc..cd7bdce5f 100644
--- a/paludis/repositories/gems/installed_gems_repository.hh
+++ b/paludis/repositories/gems/installed_gems_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/repositories/gems/params-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
namespace paludis
@@ -37,10 +37,10 @@ namespace paludis
public Repository,
public RepositoryDestinationInterface,
public std::enable_shared_from_this<InstalledGemsRepository>,
- private PrivateImplementationPattern<InstalledGemsRepository>
+ private Pimp<InstalledGemsRepository>
{
private:
- PrivateImplementationPattern<InstalledGemsRepository>::ImpPtr & _imp;
+ Pimp<InstalledGemsRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_category_names() const;
diff --git a/paludis/repositories/gems/yaml.cc b/paludis/repositories/gems/yaml.cc
index 23eecdcf7..d4f28271a 100644
--- a/paludis/repositories/gems/yaml.cc
+++ b/paludis/repositories/gems/yaml.cc
@@ -18,7 +18,7 @@
*/
#include "yaml.hh"
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <functional>
@@ -38,11 +38,11 @@ Node::~Node()
namespace paludis
{
template <>
- struct Implementation<StringNode>
+ struct Imp<StringNode>
{
const std::string text;
- Implementation(const std::string & t) :
+ Imp(const std::string & t) :
text(t)
{
}
@@ -62,7 +62,7 @@ namespace paludis
}
StringNode::StringNode(const std::string & t) :
- PrivateImplementationPattern<StringNode>(t)
+ Pimp<StringNode>(t)
{
}
@@ -79,14 +79,14 @@ StringNode::text() const
namespace paludis
{
template <>
- struct Implementation<SequenceNode>
+ struct Imp<SequenceNode>
{
std::list<const Node *> nodes;
};
}
SequenceNode::SequenceNode() :
- PrivateImplementationPattern<SequenceNode>()
+ Pimp<SequenceNode>()
{
}
@@ -115,14 +115,14 @@ SequenceNode::end() const
namespace paludis
{
template <>
- struct Implementation<MapNode>
+ struct Imp<MapNode>
{
std::list<std::pair<const Node *, const Node *> > nodes;
};
}
MapNode::MapNode() :
- PrivateImplementationPattern<MapNode>()
+ Pimp<MapNode>()
{
}
@@ -278,13 +278,13 @@ namespace
namespace paludis
{
template <>
- struct Implementation<Document>
+ struct Imp<Document>
{
struct Register
{
- Implementation<Document> * _imp;
+ Imp<Document> * _imp;
- Register(Implementation<Document> * imp) :
+ Register(Imp<Document> * imp) :
_imp(imp)
{
NodeManager::get_instance()->register_document(_imp->parser.get());
@@ -303,7 +303,7 @@ namespace paludis
Register reg;
- Implementation(const std::string & s) :
+ Imp(const std::string & s) :
top(0),
parser(syck_new_parser(), call_unless_null(syck_free_parser)),
data(strdup(s.c_str()), call_unless_null(std::free)),
@@ -315,7 +315,7 @@ namespace paludis
}
Document::Document(const std::string & s) :
- PrivateImplementationPattern<Document>(s)
+ Pimp<Document>(s)
{
Context c("When parsing yaml document:");
@@ -353,14 +353,14 @@ Document::top() const
namespace paludis
{
template <>
- struct Implementation<NodeManager>
+ struct Imp<NodeManager>
{
std::map<const void *, std::list<std::shared_ptr<const Node> > > store;
};
}
NodeManager::NodeManager() :
- PrivateImplementationPattern<NodeManager>()
+ Pimp<NodeManager>()
{
}
diff --git a/paludis/repositories/gems/yaml.hh b/paludis/repositories/gems/yaml.hh
index cedfc6335..c36f6b9ef 100644
--- a/paludis/repositories/gems/yaml.hh
+++ b/paludis/repositories/gems/yaml.hh
@@ -24,7 +24,7 @@
#include <paludis/util/simple_visitor.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/singleton.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/type_list.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -66,7 +66,7 @@ namespace paludis
class PALUDIS_VISIBLE StringNode :
public Node,
public ImplementAcceptMethods<Node, StringNode>,
- private PrivateImplementationPattern<StringNode>
+ private Pimp<StringNode>
{
public:
///\name Basic operations
@@ -92,7 +92,7 @@ namespace paludis
class PALUDIS_VISIBLE SequenceNode :
public Node,
public ImplementAcceptMethods<Node, SequenceNode>,
- private PrivateImplementationPattern<SequenceNode>
+ private Pimp<SequenceNode>
{
public:
///\name Basic operations
@@ -128,7 +128,7 @@ namespace paludis
class PALUDIS_VISIBLE MapNode :
public Node,
public ImplementAcceptMethods<Node, MapNode>,
- private PrivateImplementationPattern<MapNode>
+ private Pimp<MapNode>
{
public:
///\name Basic operations
@@ -163,7 +163,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE Document :
- private PrivateImplementationPattern<Document>
+ private Pimp<Document>
{
public:
///\name Basic operations
@@ -188,7 +188,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE NodeManager :
- private PrivateImplementationPattern<NodeManager>,
+ private Pimp<NodeManager>,
public Singleton<NodeManager>
{
friend class Singleton<NodeManager>;
diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc
index c52077cbb..40cd0edab 100644
--- a/paludis/repositories/repository/repository_id.cc
+++ b/paludis/repositories/repository/repository_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/repository/repository_id.hh>
#include <paludis/repositories/repository/repository_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
@@ -40,7 +40,7 @@ using namespace paludis::repository_repository;
namespace paludis
{
template <>
- struct Implementation<RepositoryID>
+ struct Imp<RepositoryID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -50,7 +50,7 @@ namespace paludis
const std::shared_ptr<LiteralMetadataStringSetKey> behaviours_key;
static const std::shared_ptr<Set<std::string> > behaviours_set;
- Implementation(const RepositoryIDParams & e) :
+ Imp(const RepositoryIDParams & e) :
env(e.environment()),
name(e.name()),
version("0", VersionSpecOptions()),
@@ -72,11 +72,11 @@ namespace
}
}
-const std::shared_ptr<Set<std::string> > Implementation<RepositoryID>::behaviours_set = make_behaviours();
+const std::shared_ptr<Set<std::string> > Imp<RepositoryID>::behaviours_set = make_behaviours();
RepositoryID::RepositoryID(const RepositoryIDParams & entry) :
- PrivateImplementationPattern<RepositoryID>(entry),
- _imp(PrivateImplementationPattern<RepositoryID>::_imp)
+ Pimp<RepositoryID>(entry),
+ _imp(Pimp<RepositoryID>::_imp)
{
add_metadata_key(_imp->behaviours_key);
}
@@ -302,5 +302,5 @@ RepositoryID::slot_key() const
return make_null_shared_ptr();
}
-template class PrivateImplementationPattern<RepositoryID>;
+template class Pimp<RepositoryID>;
diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh
index 0ca206279..93898462b 100644
--- a/paludis/repositories/repository/repository_id.hh
+++ b/paludis/repositories/repository/repository_id.hh
@@ -45,10 +45,10 @@ namespace paludis
class PALUDIS_VISIBLE RepositoryID :
public PackageID,
- private PrivateImplementationPattern<RepositoryID>
+ private Pimp<RepositoryID>
{
private:
- PrivateImplementationPattern<RepositoryID>::ImpPtr & _imp;
+ Pimp<RepositoryID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/repository/repository_repository.cc b/paludis/repositories/repository/repository_repository.cc
index 2ae486a1f..052f93ba3 100644
--- a/paludis/repositories/repository/repository_repository.cc
+++ b/paludis/repositories/repository/repository_repository.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/repository/repository_repository.hh>
#include <paludis/repositories/repository/repository_repository_store.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/active_object_ptr.hh>
#include <paludis/util/deferred_construction_ptr.hh>
#include <paludis/util/stringify.hh>
@@ -54,7 +54,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<RepositoryRepository>
+ struct Imp<RepositoryRepository>
{
const RepositoryRepositoryParams params;
@@ -66,7 +66,7 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<
std::shared_ptr<RepositoryRepositoryStore> > > store;
- Implementation(const RepositoryRepository * const repo, const RepositoryRepositoryParams & p) :
+ Imp(const RepositoryRepository * const repo, const RepositoryRepositoryParams & p) :
params(p),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format",
mkt_significant, "repository")),
@@ -88,7 +88,7 @@ RepositoryRepositoryConfigurationError::RepositoryRepositoryConfigurationError(c
}
RepositoryRepository::RepositoryRepository(const RepositoryRepositoryParams & p) :
- PrivateImplementationPattern<RepositoryRepository>(this, p),
+ Pimp<RepositoryRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -100,7 +100,7 @@ RepositoryRepository::RepositoryRepository(const RepositoryRepositoryParams & p)
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<RepositoryRepository>::_imp)
+ _imp(Pimp<RepositoryRepository>::_imp)
{
_add_metadata_keys();
}
@@ -157,7 +157,7 @@ RepositoryRepository::installed_root_key() const
void
RepositoryRepository::invalidate()
{
- _imp.reset(new Implementation<RepositoryRepository>(this, _imp->params));
+ _imp.reset(new Imp<RepositoryRepository>(this, _imp->params));
_add_metadata_keys();
}
@@ -494,5 +494,5 @@ RepositoryRepository::merge(const MergeParams & m)
}
}
-template class PrivateImplementationPattern<repository_repository::RepositoryRepository>;
+template class Pimp<repository_repository::RepositoryRepository>;
diff --git a/paludis/repositories/repository/repository_repository.hh b/paludis/repositories/repository/repository_repository.hh
index 0257eadf4..c86ac15d3 100644
--- a/paludis/repositories/repository/repository_repository.hh
+++ b/paludis/repositories/repository/repository_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/repository/repository_repository-fwd.hh>
#include <paludis/repository.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
namespace paludis
@@ -55,13 +55,13 @@ namespace paludis
};
class PALUDIS_VISIBLE RepositoryRepository :
- private PrivateImplementationPattern<RepositoryRepository>,
+ private Pimp<RepositoryRepository>,
public Repository,
public RepositoryDestinationInterface,
public std::enable_shared_from_this<RepositoryRepository>
{
private:
- PrivateImplementationPattern<RepositoryRepository>::ImpPtr & _imp;
+ Pimp<RepositoryRepository>::ImpPtr & _imp;
void _add_metadata_keys();
@@ -138,7 +138,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<repository_repository::RepositoryRepository>;
+ extern template class Pimp<repository_repository::RepositoryRepository>;
}
#endif
diff --git a/paludis/repositories/repository/repository_repository_store.cc b/paludis/repositories/repository/repository_repository_store.cc
index 0669af480..6a532716d 100644
--- a/paludis/repositories/repository/repository_repository_store.cc
+++ b/paludis/repositories/repository/repository_repository_store.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/repository/repository_repository_store.hh>
#include <paludis/repositories/repository/repository_id.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/set.hh>
@@ -52,7 +52,7 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Implementation<RepositoryRepositoryStore>
+ struct Imp<RepositoryRepositoryStore>
{
const Environment * const env;
const RepositoryRepository * const repo;
@@ -60,7 +60,7 @@ namespace paludis
mutable PackageNames package_names;
mutable IDs ids;
- Implementation(const Environment * const e, const RepositoryRepository * const r) :
+ Imp(const Environment * const e, const RepositoryRepository * const r) :
env(e),
repo(r),
categories(new CategoryNamePartSet)
@@ -72,7 +72,7 @@ namespace paludis
RepositoryRepositoryStore::RepositoryRepositoryStore(
const Environment * const env,
const RepositoryRepository * const repo) :
- PrivateImplementationPattern<RepositoryRepositoryStore>(env, repo)
+ Pimp<RepositoryRepositoryStore>(env, repo)
{
_populate();
}
@@ -158,5 +158,5 @@ RepositoryRepositoryStore::package_ids(const QualifiedPackageName & p) const
return i->second;
}
-template class PrivateImplementationPattern<repository_repository::RepositoryRepositoryStore>;
+template class Pimp<repository_repository::RepositoryRepositoryStore>;
diff --git a/paludis/repositories/repository/repository_repository_store.hh b/paludis/repositories/repository/repository_repository_store.hh
index a19ce0d6e..17388ee7a 100644
--- a/paludis/repositories/repository/repository_repository_store.hh
+++ b/paludis/repositories/repository/repository_repository_store.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_REPOSITORY_REPOSITORY_REPOSITORY_STORE_HH 1
#include <paludis/repositories/repository/repository_repository-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -33,7 +33,7 @@ namespace paludis
namespace repository_repository
{
class PALUDIS_VISIBLE RepositoryRepositoryStore :
- private PrivateImplementationPattern<RepositoryRepositoryStore>
+ private Pimp<RepositoryRepositoryStore>
{
private:
void _populate();
@@ -65,7 +65,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<repository_repository::RepositoryRepositoryStore>;
+ extern template class Pimp<repository_repository::RepositoryRepositoryStore>;
}
#endif
diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index f620676a5..3fb8625be 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -19,7 +19,7 @@
#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/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
@@ -40,7 +40,7 @@ using namespace paludis::unavailable_repository;
namespace paludis
{
template <>
- struct Implementation<UnavailablePackageID>
+ struct Imp<UnavailablePackageID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -54,7 +54,7 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key;
const std::shared_ptr<const Mask> mask;
- Implementation(
+ Imp(
const UnavailablePackageIDParams & e) :
env(e.environment()),
name(e.name()),
@@ -73,8 +73,8 @@ namespace paludis
}
UnavailablePackageID::UnavailablePackageID(const UnavailablePackageIDParams & entry) :
- PrivateImplementationPattern<UnavailablePackageID>(entry),
- _imp(PrivateImplementationPattern<UnavailablePackageID>::_imp)
+ Pimp<UnavailablePackageID>(entry),
+ _imp(Pimp<UnavailablePackageID>::_imp)
{
add_metadata_key(_imp->slot_key);
add_metadata_key(_imp->description_key);
@@ -329,5 +329,5 @@ UnavailablePackageID::slot_key() const
return _imp->slot_key;
}
-template class PrivateImplementationPattern<UnavailablePackageID>;
+template class Pimp<UnavailablePackageID>;
diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index 45fe75fd8..f19af1e20 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -59,10 +59,10 @@ namespace paludis
class PALUDIS_VISIBLE UnavailablePackageID :
public PackageID,
- private PrivateImplementationPattern<UnavailablePackageID>
+ private Pimp<UnavailablePackageID>
{
private:
- PrivateImplementationPattern<UnavailablePackageID>::ImpPtr & _imp;
+ Pimp<UnavailablePackageID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unavailable/unavailable_repository.cc b/paludis/repositories/unavailable/unavailable_repository.cc
index 22b5235a4..b86468a4a 100644
--- a/paludis/repositories/unavailable/unavailable_repository.cc
+++ b/paludis/repositories/unavailable/unavailable_repository.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unavailable/unavailable_repository.hh>
#include <paludis/repositories/unavailable/unavailable_repository_store.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/active_object_ptr.hh>
#include <paludis/util/deferred_construction_ptr.hh>
#include <paludis/util/stringify.hh>
@@ -48,7 +48,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<UnavailableRepository>
+ struct Imp<UnavailableRepository>
{
const UnavailableRepositoryParams params;
@@ -61,7 +61,7 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<
std::shared_ptr<UnavailableRepositoryStore> > > store;
- Implementation(const UnavailableRepository * const repo, const UnavailableRepositoryParams & p) :
+ Imp(const UnavailableRepository * const repo, const UnavailableRepositoryParams & p) :
params(p),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format",
mkt_significant, "unavailable")),
@@ -85,7 +85,7 @@ UnavailableRepositoryConfigurationError::UnavailableRepositoryConfigurationError
}
UnavailableRepository::UnavailableRepository(const UnavailableRepositoryParams & p) :
- PrivateImplementationPattern<UnavailableRepository>(this, p),
+ Pimp<UnavailableRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -97,7 +97,7 @@ UnavailableRepository::UnavailableRepository(const UnavailableRepositoryParams &
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<UnavailableRepository>::_imp)
+ _imp(Pimp<UnavailableRepository>::_imp)
{
_add_metadata_keys();
}
@@ -155,7 +155,7 @@ UnavailableRepository::installed_root_key() const
void
UnavailableRepository::invalidate()
{
- _imp.reset(new Implementation<UnavailableRepository>(this, _imp->params));
+ _imp.reset(new Imp<UnavailableRepository>(this, _imp->params));
_add_metadata_keys();
}
@@ -375,5 +375,5 @@ UnavailableRepository::sync_host_key() const
return _imp->sync_host_key;
}
-template class PrivateImplementationPattern<unavailable_repository::UnavailableRepository>;
+template class Pimp<unavailable_repository::UnavailableRepository>;
diff --git a/paludis/repositories/unavailable/unavailable_repository.hh b/paludis/repositories/unavailable/unavailable_repository.hh
index 28eba47ca..c20635891 100644
--- a/paludis/repositories/unavailable/unavailable_repository.hh
+++ b/paludis/repositories/unavailable/unavailable_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/unavailable/unavailable_repository-fwd.hh>
#include <paludis/repository.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
namespace paludis
@@ -55,12 +55,12 @@ namespace paludis
};
class PALUDIS_VISIBLE UnavailableRepository :
- private PrivateImplementationPattern<UnavailableRepository>,
+ private Pimp<UnavailableRepository>,
public Repository,
public std::enable_shared_from_this<UnavailableRepository>
{
private:
- PrivateImplementationPattern<UnavailableRepository>::ImpPtr & _imp;
+ Pimp<UnavailableRepository>::ImpPtr & _imp;
void _add_metadata_keys();
@@ -126,7 +126,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unavailable_repository::UnavailableRepository>;
+ extern template class Pimp<unavailable_repository::UnavailableRepository>;
}
#endif
diff --git a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
index 381fbc450..d70b6a7e4 100644
--- a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/set.hh>
#include <paludis/util/make_named_values.hh>
@@ -34,7 +34,7 @@ using namespace paludis::unavailable_repository;
namespace paludis
{
template <>
- struct Implementation<UnavailableRepositoryDependenciesKey>
+ struct Imp<UnavailableRepositoryDependenciesKey>
{
const Environment * const env;
const std::shared_ptr<const DependencySpecTree> value;
@@ -44,7 +44,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const std::string & r, const std::string & h, const MetadataKeyType t,
const std::string & v) :
env(e),
@@ -62,7 +62,7 @@ namespace paludis
UnavailableRepositoryDependenciesKey::UnavailableRepositoryDependenciesKey(const Environment * const env,
const std::string & r, const std::string & h, const MetadataKeyType t,
const std::string & v) :
- PrivateImplementationPattern<UnavailableRepositoryDependenciesKey>(env, r, h, t, v)
+ Pimp<UnavailableRepositoryDependenciesKey>(env, r, h, t, v)
{
}
diff --git a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh
index 31fe8cc8a..02e33a3c6 100644
--- a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_REPOSITORY_DEPENDENCIES_KEY_HH 1
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -29,7 +29,7 @@ namespace paludis
{
class UnavailableRepositoryDependenciesKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<UnavailableRepositoryDependenciesKey>
+ private Pimp<UnavailableRepositoryDependenciesKey>
{
public:
UnavailableRepositoryDependenciesKey(
diff --git a/paludis/repositories/unavailable/unavailable_repository_file.cc b/paludis/repositories/unavailable/unavailable_repository_file.cc
index 00e5d7851..ff624a368 100644
--- a/paludis/repositories/unavailable/unavailable_repository_file.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_file.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unavailable/unavailable_repository_file.hh>
#include <paludis/repositories/unavailable/unavailable_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
#include <paludis/util/simple_parser.hh>
@@ -40,13 +40,13 @@ typedef std::list<UnavailableRepositoryFileEntry> Entries;
namespace paludis
{
template <>
- struct Implementation<UnavailableRepositoryFile>
+ struct Imp<UnavailableRepositoryFile>
{
std::string repo_name, homepage, description, sync, repo_format, dependencies;
bool autoconfigurable;
Entries entries;
- Implementation() :
+ Imp() :
autoconfigurable(false)
{
}
@@ -60,7 +60,7 @@ namespace paludis
}
UnavailableRepositoryFile::UnavailableRepositoryFile(const FSEntry & f) :
- PrivateImplementationPattern<UnavailableRepositoryFile>()
+ Pimp<UnavailableRepositoryFile>()
{
_load(f);
}
@@ -269,7 +269,7 @@ UnavailableRepositoryFile::autoconfigurable() const
return _imp->autoconfigurable;
}
-template class PrivateImplementationPattern<UnavailableRepositoryFile>;
+template class Pimp<UnavailableRepositoryFile>;
template class WrappedForwardIterator<UnavailableRepositoryFile::ConstIteratorTag,
const UnavailableRepositoryFileEntry>;
diff --git a/paludis/repositories/unavailable/unavailable_repository_file.hh b/paludis/repositories/unavailable/unavailable_repository_file.hh
index e013efed1..0729e5fa1 100644
--- a/paludis/repositories/unavailable/unavailable_repository_file.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_file.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_REPOSITORY_FILE_HH 1
#include <paludis/repositories/unavailable/unavailable_repository_file-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/fs_entry.hh>
@@ -30,7 +30,7 @@ namespace paludis
namespace unavailable_repository
{
class PALUDIS_VISIBLE UnavailableRepositoryFile :
- private PrivateImplementationPattern<UnavailableRepositoryFile>
+ private Pimp<UnavailableRepositoryFile>
{
private:
void _load(const FSEntry &);
@@ -54,7 +54,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unavailable_repository::UnavailableRepositoryFile>;
+ extern template class Pimp<unavailable_repository::UnavailableRepositoryFile>;
}
#endif
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index dd8420419..5786d2ebd 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unavailable/unavailable_repository_id.hh>
#include <paludis/repositories/unavailable/unavailable_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
@@ -42,7 +42,7 @@ using namespace paludis::unavailable_repository;
namespace paludis
{
template <>
- struct Implementation<UnavailableRepositoryID>
+ struct Imp<UnavailableRepositoryID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -56,7 +56,7 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<std::string> > format_key;
const std::shared_ptr<const Mask> mask;
- Implementation(
+ Imp(
const UnavailableRepositoryIDParams & e) :
env(e.environment()),
name(e.name()),
@@ -74,8 +74,8 @@ namespace paludis
}
UnavailableRepositoryID::UnavailableRepositoryID(const UnavailableRepositoryIDParams & entry) :
- PrivateImplementationPattern<UnavailableRepositoryID>(entry),
- _imp(PrivateImplementationPattern<UnavailableRepositoryID>::_imp)
+ Pimp<UnavailableRepositoryID>(entry),
+ _imp(Pimp<UnavailableRepositoryID>::_imp)
{
if (_imp->dependencies_key)
add_metadata_key(_imp->dependencies_key);
@@ -392,5 +392,5 @@ UnavailableRepositoryID::slot_key() const
return make_null_shared_ptr();
}
-template class PrivateImplementationPattern<UnavailableRepositoryID>;
+template class Pimp<UnavailableRepositoryID>;
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh
index 0e5585339..bb935190b 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_id.hh
@@ -58,11 +58,11 @@ namespace paludis
class PALUDIS_VISIBLE UnavailableRepositoryID :
public PackageID,
- private PrivateImplementationPattern<UnavailableRepositoryID>,
+ private Pimp<UnavailableRepositoryID>,
public std::enable_shared_from_this<UnavailableRepositoryID>
{
private:
- PrivateImplementationPattern<UnavailableRepositoryID>::ImpPtr & _imp;
+ Pimp<UnavailableRepositoryID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unavailable/unavailable_repository_store.cc b/paludis/repositories/unavailable/unavailable_repository_store.cc
index a4629ff62..7d7cee7e6 100644
--- a/paludis/repositories/unavailable/unavailable_repository_store.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_store.cc
@@ -23,7 +23,7 @@
#include <paludis/repositories/unavailable/unavailable_repository_id.hh>
#include <paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh>
#include <paludis/repositories/unavailable/unavailable_mask.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/dir_iterator.hh>
@@ -58,7 +58,7 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Implementation<UnavailableRepositoryStore>
+ struct Imp<UnavailableRepositoryStore>
{
const UnavailableRepository * const repo;
mutable std::shared_ptr<CategoryNamePartSet> categories;
@@ -67,7 +67,7 @@ namespace paludis
std::set<std::string> seen_repo_names;
- Implementation(const UnavailableRepository * const r) :
+ Imp(const UnavailableRepository * const r) :
repo(r),
categories(new CategoryNamePartSet)
{
@@ -79,7 +79,7 @@ UnavailableRepositoryStore::UnavailableRepositoryStore(
const Environment * const env,
const UnavailableRepository * const repo,
const FSEntry & f) :
- PrivateImplementationPattern<UnavailableRepositoryStore>(repo)
+ Pimp<UnavailableRepositoryStore>(repo)
{
_populate(env, f);
}
@@ -272,5 +272,5 @@ UnavailableRepositoryStore::package_ids(const QualifiedPackageName & p) const
return i->second;
}
-template class PrivateImplementationPattern<unavailable_repository::UnavailableRepositoryStore>;
+template class Pimp<unavailable_repository::UnavailableRepositoryStore>;
diff --git a/paludis/repositories/unavailable/unavailable_repository_store.hh b/paludis/repositories/unavailable/unavailable_repository_store.hh
index 2d23c949f..917b3d42f 100644
--- a/paludis/repositories/unavailable/unavailable_repository_store.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_store.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_REPOSITORY_STORE_HH 1
#include <paludis/repositories/unavailable/unavailable_repository-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -33,7 +33,7 @@ namespace paludis
namespace unavailable_repository
{
class PALUDIS_VISIBLE UnavailableRepositoryStore :
- private PrivateImplementationPattern<UnavailableRepositoryStore>
+ private Pimp<UnavailableRepositoryStore>
{
private:
void _populate(const Environment * const env, const FSEntry & f);
@@ -66,7 +66,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unavailable_repository::UnavailableRepositoryStore>;
+ extern template class Pimp<unavailable_repository::UnavailableRepositoryStore>;
}
#endif
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index a4a2313a9..1b0be76b6 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/unpackaged/installed_repository.hh>
#include <paludis/ndbam.hh>
#include <paludis/ndbam_unmerger.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/system.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
@@ -384,7 +384,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<InstalledUnpackagedID>
+ struct Imp<InstalledUnpackagedID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -408,7 +408,7 @@ namespace paludis
static const std::shared_ptr<Set<std::string> > behaviours_set;
- Implementation(
+ Imp(
const Environment * const e,
const PackageID * const id,
const QualifiedPackageName & q,
@@ -474,13 +474,13 @@ namespace
}
}
-const std::shared_ptr<Set<std::string> > Implementation<InstalledUnpackagedID>::behaviours_set = make_behaviours();
+const std::shared_ptr<Set<std::string> > Imp<InstalledUnpackagedID>::behaviours_set = make_behaviours();
InstalledUnpackagedID::InstalledUnpackagedID(const Environment * const e, const QualifiedPackageName & q,
const VersionSpec & v, const SlotName & s, const RepositoryName & n, const FSEntry & l,
const std::string &, const FSEntry & ro, const NDBAM * const d) :
- PrivateImplementationPattern<InstalledUnpackagedID>(e, this, q, v, s, n, l, ro, d),
- _imp(PrivateImplementationPattern<InstalledUnpackagedID>::_imp)
+ Pimp<InstalledUnpackagedID>(e, this, q, v, s, n, l, ro, d),
+ _imp(Pimp<InstalledUnpackagedID>::_imp)
{
add_metadata_key(_imp->fs_location_key);
add_metadata_key(_imp->slot_key);
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index 7cb5bbaff..afefc9b85 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -24,7 +24,7 @@
#include <paludis/name-fwd.hh>
#include <paludis/action-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/ndbam-fwd.hh>
#include <memory>
@@ -35,11 +35,11 @@ namespace paludis
{
class InstalledUnpackagedID :
public PackageID,
- private PrivateImplementationPattern<InstalledUnpackagedID>,
+ private Pimp<InstalledUnpackagedID>,
public std::enable_shared_from_this<InstalledUnpackagedID>
{
private:
- PrivateImplementationPattern<InstalledUnpackagedID>::ImpPtr & _imp;
+ Pimp<InstalledUnpackagedID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index e37da7668..42c7d9ce5 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/unpackaged/exceptions.hh>
#include <paludis/ndbam.hh>
#include <paludis/ndbam_merger.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/set.hh>
@@ -65,7 +65,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<InstalledUnpackagedRepository>
+ struct Imp<InstalledUnpackagedRepository>
{
const InstalledUnpackagedRepositoryParams params;
mutable NDBAM ndbam;
@@ -74,7 +74,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const InstalledUnpackagedRepositoryParams & p) :
+ Imp(const InstalledUnpackagedRepositoryParams & p) :
params(p),
ndbam(p.location(), &supported_installed_unpackaged, "installed_unpackaged-1", user_version_spec_options()),
location_key(new LiteralMetadataValueKey<FSEntry> ("location", "location",
@@ -90,7 +90,7 @@ namespace paludis
InstalledUnpackagedRepository::InstalledUnpackagedRepository(
const RepositoryName & n, const InstalledUnpackagedRepositoryParams & p) :
- PrivateImplementationPattern<InstalledUnpackagedRepository>(p),
+ Pimp<InstalledUnpackagedRepository>(p),
Repository(p.environment(), n, make_named_values<RepositoryCapabilities>(
n::destination_interface() = this,
n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
@@ -99,7 +99,7 @@ InstalledUnpackagedRepository::InstalledUnpackagedRepository(
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<InstalledUnpackagedRepository>::_imp)
+ _imp(Pimp<InstalledUnpackagedRepository>::_imp)
{
_add_metadata_keys();
}
@@ -412,7 +412,7 @@ InstalledUnpackagedRepository::want_pre_post_phases() const
void
InstalledUnpackagedRepository::invalidate()
{
- _imp.reset(new Implementation<InstalledUnpackagedRepository>(_imp->params));
+ _imp.reset(new Imp<InstalledUnpackagedRepository>(_imp->params));
_add_metadata_keys();
}
diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh
index adf9281c7..fbc1d1a92 100644
--- a/paludis/repositories/unpackaged/installed_repository.hh
+++ b/paludis/repositories/unpackaged/installed_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/named_value.hh>
namespace paludis
@@ -45,12 +45,12 @@ namespace paludis
}
class PALUDIS_VISIBLE InstalledUnpackagedRepository :
- private PrivateImplementationPattern<InstalledUnpackagedRepository>,
+ private Pimp<InstalledUnpackagedRepository>,
public Repository,
public RepositoryDestinationInterface
{
private:
- PrivateImplementationPattern<InstalledUnpackagedRepository>::ImpPtr & _imp;
+ Pimp<InstalledUnpackagedRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
protected:
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 9bfc395d0..6e7506a2a 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/unpackaged/unpackaged_id.hh>
#include <paludis/repositories/unpackaged/unpackaged_key.hh>
#include <paludis/repositories/unpackaged/unpackaged_stripper.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
@@ -47,7 +47,7 @@ using namespace paludis::unpackaged_repositories;
namespace paludis
{
template <>
- struct Implementation<UnpackagedID>
+ struct Imp<UnpackagedID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -64,7 +64,7 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<std::string> > description_key;
const std::shared_ptr<const UnpackagedChoicesKey> choices_key;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const QualifiedPackageName & q,
const VersionSpec & v,
const SlotName & s,
@@ -100,8 +100,8 @@ namespace paludis
UnpackagedID::UnpackagedID(const Environment * const e, const QualifiedPackageName & q,
const VersionSpec & v, const SlotName & s, const RepositoryName & n, const FSEntry & l,
const std::string & b, const std::string & r, const std::string & d) :
- PrivateImplementationPattern<UnpackagedID>(e, q, v, s, n, l, b, r, d, this),
- _imp(PrivateImplementationPattern<UnpackagedID>::_imp)
+ Pimp<UnpackagedID>(e, q, v, s, n, l, b, r, d, this),
+ _imp(Pimp<UnpackagedID>::_imp)
{
add_metadata_key(_imp->slot_key);
add_metadata_key(_imp->fs_location_key);
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index ce1e91d7f..c1a732f64 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -23,7 +23,7 @@
#include <paludis/package_id.hh>
#include <paludis/name-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
namespace paludis
@@ -32,11 +32,11 @@ namespace paludis
{
class UnpackagedID :
public PackageID,
- private PrivateImplementationPattern<UnpackagedID>,
+ private Pimp<UnpackagedID>,
public std::enable_shared_from_this<UnpackagedID>
{
private:
- PrivateImplementationPattern<UnpackagedID>::ImpPtr & _imp;
+ Pimp<UnpackagedID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unpackaged/unpackaged_key.cc b/paludis/repositories/unpackaged/unpackaged_key.cc
index d9069a5d3..7a4fe4628 100644
--- a/paludis/repositories/unpackaged/unpackaged_key.cc
+++ b/paludis/repositories/unpackaged/unpackaged_key.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unpackaged/unpackaged_key.hh>
#include <paludis/repositories/unpackaged/unpackaged_id.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/set.hh>
@@ -36,7 +36,7 @@ using namespace paludis::unpackaged_repositories;
namespace paludis
{
template <>
- struct Implementation<UnpackagedDependencyKey>
+ struct Imp<UnpackagedDependencyKey>
{
const Environment * const env;
const std::shared_ptr<const DependencySpecTree> value;
@@ -46,7 +46,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::string & v,
+ Imp(const Environment * const e, const std::string & v,
const std::shared_ptr<const DependenciesLabelSequence> & l,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
@@ -64,7 +64,7 @@ UnpackagedDependencyKey::UnpackagedDependencyKey(const Environment * const env,
const std::string & r, const std::string & h, const MetadataKeyType t,
const std::shared_ptr<const DependenciesLabelSequence> & l,
const std::string & v) :
- PrivateImplementationPattern<UnpackagedDependencyKey>(env, v, l, r, h, t)
+ Pimp<UnpackagedDependencyKey>(env, v, l, r, h, t)
{
}
@@ -121,7 +121,7 @@ UnpackagedDependencyKey::initial_labels() const
namespace paludis
{
template <>
- struct Implementation<UnpackagedChoicesKey>
+ struct Imp<UnpackagedChoicesKey>
{
const Environment * const env;
const UnpackagedID * const id;
@@ -133,7 +133,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const UnpackagedID * const i,
+ Imp(const Environment * const e, const UnpackagedID * const i,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
id(i),
@@ -147,7 +147,7 @@ namespace paludis
UnpackagedChoicesKey::UnpackagedChoicesKey(const Environment * const env, const std::string & r, const std::string & h,
const MetadataKeyType t, const UnpackagedID * const id) :
- PrivateImplementationPattern<UnpackagedChoicesKey>(env, id, r, h, t)
+ Pimp<UnpackagedChoicesKey>(env, id, r, h, t)
{
}
diff --git a/paludis/repositories/unpackaged/unpackaged_key.hh b/paludis/repositories/unpackaged/unpackaged_key.hh
index 9173ed608..ffcb0760f 100644
--- a/paludis/repositories/unpackaged/unpackaged_key.hh
+++ b/paludis/repositories/unpackaged/unpackaged_key.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNPACKAGED_UNPACKAGED_KEY_HH 1
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -31,7 +31,7 @@ namespace paludis
class UnpackagedDependencyKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<UnpackagedDependencyKey>
+ private Pimp<UnpackagedDependencyKey>
{
public:
UnpackagedDependencyKey(const Environment * const env,
@@ -56,7 +56,7 @@ namespace paludis
class UnpackagedChoicesKey :
public MetadataValueKey<std::shared_ptr<const Choices> >,
- private PrivateImplementationPattern<UnpackagedChoicesKey>
+ private Pimp<UnpackagedChoicesKey>
{
public:
UnpackagedChoicesKey(const Environment * const env,
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.cc b/paludis/repositories/unpackaged/unpackaged_repository.cc
index c3f6d1415..06fa3e6c2 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/unpackaged/exceptions.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/destringify.hh>
@@ -40,7 +40,7 @@ using namespace paludis::unpackaged_repositories;
namespace paludis
{
template <>
- struct Implementation<UnpackagedRepository>
+ struct Imp<UnpackagedRepository>
{
const UnpackagedRepositoryParams params;
std::shared_ptr<const PackageID> id;
@@ -58,7 +58,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<std::string> > run_dependencies_key;
std::shared_ptr<const MetadataValueKey<std::string> > description_key;
- Implementation(const RepositoryName & n,
+ Imp(const RepositoryName & n,
const UnpackagedRepositoryParams & p) :
params(p),
id(new UnpackagedID(params.environment(), params.name(), params.version(), params.slot(), n, params.location(),
@@ -94,7 +94,7 @@ namespace paludis
UnpackagedRepository::UnpackagedRepository(const RepositoryName & n,
const UnpackagedRepositoryParams & params) :
- PrivateImplementationPattern<UnpackagedRepository>(n, params),
+ Pimp<UnpackagedRepository>(n, params),
Repository(params.environment(), n, make_named_values<RepositoryCapabilities>(
n::destination_interface() = static_cast<RepositoryDestinationInterface *>(0),
n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
@@ -103,7 +103,7 @@ UnpackagedRepository::UnpackagedRepository(const RepositoryName & n,
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<UnpackagedRepository>::_imp)
+ _imp(Pimp<UnpackagedRepository>::_imp)
{
_add_metadata_keys();
}
@@ -184,7 +184,7 @@ UnpackagedRepository::is_unimportant() const
void
UnpackagedRepository::invalidate()
{
- _imp.reset(new Implementation<UnpackagedRepository>(name(), _imp->params));
+ _imp.reset(new Imp<UnpackagedRepository>(name(), _imp->params));
_add_metadata_keys();
}
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh
index b8b435fe9..0e73ffc22 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.hh
+++ b/paludis/repositories/unpackaged/unpackaged_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -58,11 +58,11 @@ namespace paludis
}
class PALUDIS_VISIBLE UnpackagedRepository :
- private PrivateImplementationPattern<UnpackagedRepository>,
+ private Pimp<UnpackagedRepository>,
public Repository
{
private:
- PrivateImplementationPattern<UnpackagedRepository>::ImpPtr & _imp;
+ Pimp<UnpackagedRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
protected:
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.cc b/paludis/repositories/unpackaged/unpackaged_stripper.cc
index 0dd34bb72..244357a51 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.cc
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unpackaged/unpackaged_stripper.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/output_manager.hh>
#include <ostream>
@@ -30,11 +30,11 @@ using namespace paludis::unpackaged_repositories;
namespace paludis
{
template <>
- struct Implementation<UnpackagedStripper>
+ struct Imp<UnpackagedStripper>
{
UnpackagedStripperOptions options;
- Implementation(const UnpackagedStripperOptions & o) :
+ Imp(const UnpackagedStripperOptions & o) :
options(o)
{
}
@@ -48,8 +48,8 @@ UnpackagedStripper::UnpackagedStripper(const UnpackagedStripperOptions & options
n::split() = options.split(),
n::strip() = options.strip()
)),
- PrivateImplementationPattern<UnpackagedStripper>(options),
- _imp(PrivateImplementationPattern<UnpackagedStripper>::_imp)
+ Pimp<UnpackagedStripper>(options),
+ _imp(Pimp<UnpackagedStripper>::_imp)
{
}
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.hh b/paludis/repositories/unpackaged/unpackaged_stripper.hh
index c948e6dd9..846ba1568 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.hh
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.hh
@@ -51,10 +51,10 @@ namespace paludis
class UnpackagedStripper :
public Stripper,
- private PrivateImplementationPattern<UnpackagedStripper>
+ private Pimp<UnpackagedStripper>
{
private:
- PrivateImplementationPattern<UnpackagedStripper>::ImpPtr & _imp;
+ Pimp<UnpackagedStripper>::ImpPtr & _imp;
protected:
virtual void on_strip(const FSEntry &);
diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc
index 596b50b99..9edaaa74d 100644
--- a/paludis/repositories/unwritten/unwritten_id.cc
+++ b/paludis/repositories/unwritten/unwritten_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unwritten/unwritten_id.hh>
#include <paludis/repositories/unwritten/unwritten_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
@@ -38,7 +38,7 @@ using namespace paludis::unwritten_repository;
namespace paludis
{
template <>
- struct Implementation<UnwrittenID>
+ struct Imp<UnwrittenID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -55,7 +55,7 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key;
const std::shared_ptr<const Mask> mask;
- Implementation(
+ Imp(
const UnwrittenIDParams & e) :
env(e.environment()),
name(e.name()),
@@ -76,8 +76,8 @@ namespace paludis
}
UnwrittenID::UnwrittenID(const UnwrittenIDParams & entry) :
- PrivateImplementationPattern<UnwrittenID>(entry),
- _imp(PrivateImplementationPattern<UnwrittenID>::_imp)
+ Pimp<UnwrittenID>(entry),
+ _imp(Pimp<UnwrittenID>::_imp)
{
if (_imp->slot_key)
add_metadata_key(_imp->slot_key);
@@ -319,5 +319,5 @@ UnwrittenID::choices_key() const
return _imp->choices_key;
}
-template class PrivateImplementationPattern<UnwrittenID>;
+template class Pimp<UnwrittenID>;
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index ebd327dba..374d657ea 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -65,10 +65,10 @@ namespace paludis
class PALUDIS_VISIBLE UnwrittenID :
public PackageID,
- private PrivateImplementationPattern<UnwrittenID>
+ private Pimp<UnwrittenID>
{
private:
- PrivateImplementationPattern<UnwrittenID>::ImpPtr & _imp;
+ Pimp<UnwrittenID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unwritten/unwritten_repository.cc b/paludis/repositories/unwritten/unwritten_repository.cc
index fcdfb4ad7..46a2ed562 100644
--- a/paludis/repositories/unwritten/unwritten_repository.cc
+++ b/paludis/repositories/unwritten/unwritten_repository.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unwritten/unwritten_repository.hh>
#include <paludis/repositories/unwritten/unwritten_repository_store.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/active_object_ptr.hh>
#include <paludis/util/deferred_construction_ptr.hh>
#include <paludis/util/stringify.hh>
@@ -48,7 +48,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<UnwrittenRepository>
+ struct Imp<UnwrittenRepository>
{
const UnwrittenRepositoryParams params;
@@ -61,7 +61,7 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<
std::shared_ptr<UnwrittenRepositoryStore> > > store;
- Implementation(const UnwrittenRepository * const repo, const UnwrittenRepositoryParams & p) :
+ Imp(const UnwrittenRepository * const repo, const UnwrittenRepositoryParams & p) :
params(p),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format",
mkt_significant, "unwritten")),
@@ -85,7 +85,7 @@ UnwrittenRepositoryConfigurationError::UnwrittenRepositoryConfigurationError(con
}
UnwrittenRepository::UnwrittenRepository(const UnwrittenRepositoryParams & p) :
- PrivateImplementationPattern<UnwrittenRepository>(this, p),
+ Pimp<UnwrittenRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -97,7 +97,7 @@ UnwrittenRepository::UnwrittenRepository(const UnwrittenRepositoryParams & p) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<UnwrittenRepository>::_imp)
+ _imp(Pimp<UnwrittenRepository>::_imp)
{
_add_metadata_keys();
}
@@ -155,7 +155,7 @@ UnwrittenRepository::installed_root_key() const
void
UnwrittenRepository::invalidate()
{
- _imp.reset(new Implementation<UnwrittenRepository>(this, _imp->params));
+ _imp.reset(new Imp<UnwrittenRepository>(this, _imp->params));
_add_metadata_keys();
}
@@ -375,5 +375,5 @@ UnwrittenRepository::sync_host_key() const
return _imp->sync_host_key;
}
-template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepository>;
+template class Pimp<unwritten_repository::UnwrittenRepository>;
diff --git a/paludis/repositories/unwritten/unwritten_repository.hh b/paludis/repositories/unwritten/unwritten_repository.hh
index b49c01b71..31a22e3f7 100644
--- a/paludis/repositories/unwritten/unwritten_repository.hh
+++ b/paludis/repositories/unwritten/unwritten_repository.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_HH 1
#include <paludis/repository.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
namespace paludis
@@ -54,12 +54,12 @@ namespace paludis
};
class PALUDIS_VISIBLE UnwrittenRepository :
- private PrivateImplementationPattern<UnwrittenRepository>,
+ private Pimp<UnwrittenRepository>,
public Repository,
public std::enable_shared_from_this<UnwrittenRepository>
{
private:
- PrivateImplementationPattern<UnwrittenRepository>::ImpPtr & _imp;
+ Pimp<UnwrittenRepository>::ImpPtr & _imp;
void _add_metadata_keys();
@@ -125,7 +125,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepository>;
+ extern template class Pimp<unwritten_repository::UnwrittenRepository>;
}
#endif
diff --git a/paludis/repositories/unwritten/unwritten_repository_file.cc b/paludis/repositories/unwritten/unwritten_repository_file.cc
index 04dedd41f..5b19e37c2 100644
--- a/paludis/repositories/unwritten/unwritten_repository_file.cc
+++ b/paludis/repositories/unwritten/unwritten_repository_file.cc
@@ -36,7 +36,7 @@
#include <paludis/user_dep_spec.hh>
#include <paludis/spec_tree.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -50,7 +50,7 @@ typedef std::list<UnwrittenRepositoryFileEntry> Entries;
namespace paludis
{
template <>
- struct Implementation<UnwrittenRepositoryFile>
+ struct Imp<UnwrittenRepositoryFile>
{
Entries entries;
};
@@ -63,7 +63,7 @@ namespace paludis
}
UnwrittenRepositoryFile::UnwrittenRepositoryFile(const FSEntry & f) :
- PrivateImplementationPattern<UnwrittenRepositoryFile>()
+ Pimp<UnwrittenRepositoryFile>()
{
_load(f);
}
@@ -349,7 +349,7 @@ UnwrittenRepositoryFile::_load(const FSEntry & f)
_imp->entries.push_back(*entry);
}
-template class PrivateImplementationPattern<UnwrittenRepositoryFile>;
+template class Pimp<UnwrittenRepositoryFile>;
template class WrappedForwardIterator<UnwrittenRepositoryFile::ConstIteratorTag,
const UnwrittenRepositoryFileEntry>;
diff --git a/paludis/repositories/unwritten/unwritten_repository_file.hh b/paludis/repositories/unwritten/unwritten_repository_file.hh
index 544860865..c7fc0aaa1 100644
--- a/paludis/repositories/unwritten/unwritten_repository_file.hh
+++ b/paludis/repositories/unwritten/unwritten_repository_file.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_FILE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_FILE_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/named_value.hh>
@@ -62,7 +62,7 @@ namespace paludis
};
class PALUDIS_VISIBLE UnwrittenRepositoryFile :
- private PrivateImplementationPattern<UnwrittenRepositoryFile>
+ private Pimp<UnwrittenRepositoryFile>
{
private:
void _load(const FSEntry &);
@@ -78,7 +78,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepositoryFile>;
+ extern template class Pimp<unwritten_repository::UnwrittenRepositoryFile>;
}
#endif
diff --git a/paludis/repositories/unwritten/unwritten_repository_store.cc b/paludis/repositories/unwritten/unwritten_repository_store.cc
index 63164e502..a7dc6cad2 100644
--- a/paludis/repositories/unwritten/unwritten_repository_store.cc
+++ b/paludis/repositories/unwritten/unwritten_repository_store.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/unwritten/unwritten_repository_file.hh>
#include <paludis/repositories/unwritten/unwritten_id.hh>
#include <paludis/repositories/unwritten/unwritten_mask.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/dir_iterator.hh>
@@ -55,14 +55,14 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Implementation<UnwrittenRepositoryStore>
+ struct Imp<UnwrittenRepositoryStore>
{
const UnwrittenRepository * const repo;
mutable std::shared_ptr<CategoryNamePartSet> categories;
mutable PackageNames package_names;
mutable IDs ids;
- Implementation(const UnwrittenRepository * const r) :
+ Imp(const UnwrittenRepository * const r) :
repo(r),
categories(new CategoryNamePartSet)
{
@@ -74,7 +74,7 @@ UnwrittenRepositoryStore::UnwrittenRepositoryStore(
const Environment * const env,
const UnwrittenRepository * const repo,
const FSEntry & f) :
- PrivateImplementationPattern<UnwrittenRepositoryStore>(repo)
+ Pimp<UnwrittenRepositoryStore>(repo)
{
_populate(env, f);
}
@@ -197,5 +197,5 @@ UnwrittenRepositoryStore::package_ids(const QualifiedPackageName & p) const
return i->second;
}
-template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepositoryStore>;
+template class Pimp<unwritten_repository::UnwrittenRepositoryStore>;
diff --git a/paludis/repositories/unwritten/unwritten_repository_store.hh b/paludis/repositories/unwritten/unwritten_repository_store.hh
index 06f9a7641..73517babb 100644
--- a/paludis/repositories/unwritten/unwritten_repository_store.hh
+++ b/paludis/repositories/unwritten/unwritten_repository_store.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_STORE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_STORE_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -34,7 +34,7 @@ namespace paludis
struct UnwrittenRepository;
class PALUDIS_VISIBLE UnwrittenRepositoryStore :
- private PrivateImplementationPattern<UnwrittenRepositoryStore>
+ private Pimp<UnwrittenRepositoryStore>
{
private:
void _populate_one(const Environment * const env, const FSEntry & f);
@@ -67,7 +67,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepositoryStore>;
+ extern template class Pimp<unwritten_repository::UnwrittenRepositoryStore>;
}
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 677c8c740..cf6afff2a 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -26,7 +26,7 @@
#include <paludis/literal_metadata_key.hh>
#include <paludis/action.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
#include <paludis/util/map.hh>
@@ -49,7 +49,7 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace paludis
{
template<>
- struct Implementation<InstalledVirtualsRepository>
+ struct Imp<InstalledVirtualsRepository>
{
const Environment * const env;
const FSEntry root;
@@ -61,7 +61,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const Environment * const e, const FSEntry & r, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
+ Imp(const Environment * const e, const FSEntry & r, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
env(e),
root(r),
ids_mutex(m),
@@ -117,8 +117,8 @@ InstalledVirtualsRepository::InstalledVirtualsRepository(const Environment * con
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<InstalledVirtualsRepository>(env, r),
- _imp(PrivateImplementationPattern<InstalledVirtualsRepository>::_imp)
+ Pimp<InstalledVirtualsRepository>(env, r),
+ _imp(Pimp<InstalledVirtualsRepository>::_imp)
{
add_metadata_key(_imp->root_key);
add_metadata_key(_imp->format_key);
@@ -222,7 +222,7 @@ InstalledVirtualsRepository::has_category_named(const CategoryNamePart & c) cons
void
InstalledVirtualsRepository::invalidate()
{
- _imp.reset(new Implementation<InstalledVirtualsRepository>(_imp->env, _imp->root, _imp->ids_mutex));
+ _imp.reset(new Imp<InstalledVirtualsRepository>(_imp->env, _imp->root, _imp->ids_mutex));
}
void
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index d14386a69..a3ad32f7a 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -36,10 +36,10 @@ namespace paludis
public Repository,
public RepositoryDestinationInterface,
public std::enable_shared_from_this<InstalledVirtualsRepository>,
- private PrivateImplementationPattern<InstalledVirtualsRepository>
+ private Pimp<InstalledVirtualsRepository>
{
private:
- PrivateImplementationPattern<InstalledVirtualsRepository>::ImpPtr & _imp;
+ Pimp<InstalledVirtualsRepository>::ImpPtr & _imp;
void need_ids() const;
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 19b679b56..b6f617f78 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/virtuals/installed_virtuals_repository.hh>
#include <paludis/repositories/virtuals/virtuals_repository.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/make_named_values.hh>
@@ -50,7 +50,7 @@ using namespace paludis::virtuals;
namespace paludis
{
template <>
- struct Implementation<VirtualsDepKey>
+ struct Imp<VirtualsDepKey>
{
const Environment * const env;
const std::shared_ptr<DependencySpecTree> value;
@@ -60,7 +60,7 @@ namespace paludis
const std::string raw_name;
const std::string human_name;
- Implementation(const Environment * const e, const std::shared_ptr<const PackageID> & v,
+ Imp(const Environment * const e, const std::shared_ptr<const PackageID> & v,
const std::shared_ptr<const DependenciesLabelSequence> & l,
bool exact, const std::string & h, const std::string & r) :
env(e),
@@ -94,8 +94,8 @@ VirtualsDepKey::VirtualsDepKey(const Environment * const e, const std::string &
const std::shared_ptr<const PackageID> & v,
const std::shared_ptr<const DependenciesLabelSequence> & l,
const bool exact) :
- PrivateImplementationPattern<VirtualsDepKey>(e, v, l, exact, r, h),
- _imp(PrivateImplementationPattern<VirtualsDepKey>::_imp)
+ Pimp<VirtualsDepKey>(e, v, l, exact, r, h),
+ _imp(Pimp<VirtualsDepKey>::_imp)
{
}
@@ -160,7 +160,7 @@ VirtualsDepKey::initial_labels() const
namespace paludis
{
template <>
- struct Implementation<VirtualsPackageID>
+ struct Imp<VirtualsPackageID>
{
const Environment * const env;
const std::shared_ptr<const Repository> repository;
@@ -174,7 +174,7 @@ namespace paludis
mutable bool has_masks;
mutable Mutex mutex;
- Implementation(
+ Imp(
const Environment * const e,
const std::shared_ptr<const Repository> & o,
const QualifiedPackageName & n,
@@ -205,8 +205,8 @@ VirtualsPackageID::VirtualsPackageID(
const QualifiedPackageName & virtual_name,
const std::shared_ptr<const PackageID> & virtual_for,
const bool exact) :
- PrivateImplementationPattern<VirtualsPackageID>(e, owner, virtual_name, virtual_for, exact),
- _imp(PrivateImplementationPattern<VirtualsPackageID>::_imp)
+ Pimp<VirtualsPackageID>(e, owner, virtual_name, virtual_for, exact),
+ _imp(Pimp<VirtualsPackageID>::_imp)
{
add_metadata_key(_imp->virtual_for);
add_metadata_key(_imp->bdep);
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index 5bf39c7e0..d7744682a 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_VIRTUALS_PACKAGE_ID_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_VIRTUALS_PACKAGE_ID_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
@@ -30,10 +30,10 @@ namespace paludis
{
class VirtualsDepKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<VirtualsDepKey>
+ private Pimp<VirtualsDepKey>
{
private:
- PrivateImplementationPattern<VirtualsDepKey>::ImpPtr & _imp;
+ Pimp<VirtualsDepKey>::ImpPtr & _imp;
public:
VirtualsDepKey(const Environment * const, const std::string &, const std::string &,
@@ -60,11 +60,11 @@ namespace paludis
};
class VirtualsPackageID :
- private PrivateImplementationPattern<VirtualsPackageID>,
+ private Pimp<VirtualsPackageID>,
public PackageID
{
private:
- PrivateImplementationPattern<VirtualsPackageID>::ImpPtr & _imp;
+ Pimp<VirtualsPackageID>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index ff1e6f06b..0f5096030 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -33,7 +33,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/operators.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/map.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
@@ -57,7 +57,7 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace paludis
{
template<>
- struct Implementation<VirtualsRepository>
+ struct Imp<VirtualsRepository>
{
const Environment * const env;
@@ -71,7 +71,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const Environment * const e, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
+ Imp(const Environment * const e, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
env(e),
big_nasty_mutex(m),
has_names(false),
@@ -129,8 +129,8 @@ VirtualsRepository::VirtualsRepository(const Environment * const env) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<VirtualsRepository>(env),
- _imp(PrivateImplementationPattern<VirtualsRepository>::_imp)
+ Pimp<VirtualsRepository>(env),
+ _imp(Pimp<VirtualsRepository>::_imp)
{
add_metadata_key(_imp->format_key);
}
@@ -314,7 +314,7 @@ void
VirtualsRepository::invalidate()
{
Lock l(*_imp->big_nasty_mutex);
- _imp.reset(new Implementation<VirtualsRepository>(_imp->env, _imp->big_nasty_mutex));
+ _imp.reset(new Imp<VirtualsRepository>(_imp->env, _imp->big_nasty_mutex));
}
void
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index e284f80aa..fed3c2eff 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -34,11 +34,11 @@ namespace paludis
class PALUDIS_VISIBLE VirtualsRepository :
public Repository,
public RepositoryMakeVirtualsInterface,
- private PrivateImplementationPattern<VirtualsRepository>,
+ private Pimp<VirtualsRepository>,
public std::enable_shared_from_this<VirtualsRepository>
{
private:
- PrivateImplementationPattern<VirtualsRepository>::ImpPtr & _imp;
+ Pimp<VirtualsRepository>::ImpPtr & _imp;
void need_names() const;
void need_ids() const;