aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/e')
-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
79 files changed, 356 insertions, 356 deletions
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>;
}