aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/accounts
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/accounts
parent4209b95ecc83365718b3dd5556a6866a662e95c5 (diff)
downloadpaludis-dd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a.tar.gz
paludis-dd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a.tar.xz
PrivateImplementationPattern -> Pimp, Implementation -> Imp
Diffstat (limited to 'paludis/repositories/accounts')
-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
10 files changed, 45 insertions, 45 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;