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