aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-23 08:54:11 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-23 08:54:11 +0100
commitdd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a (patch)
treeba2da539f103634b8ddb52a477bbace3b4a52c57
parent4209b95ecc83365718b3dd5556a6866a662e95c5 (diff)
downloadpaludis-dd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a.tar.gz
paludis-dd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a.tar.xz
PrivateImplementationPattern -> Pimp, Implementation -> Imp
-rw-r--r--paludis/about_metadata.cc12
-rw-r--r--paludis/about_metadata.hh8
-rw-r--r--paludis/action.cc56
-rw-r--r--paludis/action.hh30
-rw-r--r--paludis/args/args_group.cc8
-rw-r--r--paludis/args/args_group.hh4
-rw-r--r--paludis/args/args_handler.cc10
-rw-r--r--paludis/args/args_handler.hh4
-rw-r--r--paludis/args/args_option.cc30
-rw-r--r--paludis/args/args_option.hh12
-rw-r--r--paludis/args/args_section.cc10
-rw-r--r--paludis/args/args_section.hh6
-rw-r--r--paludis/args/args_visitor.cc8
-rw-r--r--paludis/args/args_visitor.hh4
-rw-r--r--paludis/broken_linkage_configuration.cc16
-rw-r--r--paludis/broken_linkage_configuration.hh4
-rw-r--r--paludis/broken_linkage_finder.cc26
-rw-r--r--paludis/broken_linkage_finder.hh4
-rw-r--r--paludis/buffer_output_manager.cc10
-rw-r--r--paludis/buffer_output_manager.hh6
-rw-r--r--paludis/choice.cc16
-rw-r--r--paludis/choice.hh10
-rw-r--r--paludis/comma_separated_dep_printer.cc8
-rw-r--r--paludis/comma_separated_dep_printer.hh4
-rw-r--r--paludis/contents.cc28
-rw-r--r--paludis/contents.hh18
-rw-r--r--paludis/create_output_manager_info.cc20
-rw-r--r--paludis/create_output_manager_info.hh6
-rw-r--r--paludis/dep_label.hh2
-rw-r--r--paludis/dep_list.cc12
-rw-r--r--paludis/dep_list.hh6
-rw-r--r--paludis/dep_spec.cc66
-rw-r--r--paludis/dep_spec.hh32
-rw-r--r--paludis/dep_spec_flattener.cc10
-rw-r--r--paludis/dep_spec_flattener.hh6
-rw-r--r--paludis/dep_tag.cc18
-rw-r--r--paludis/dep_tag.hh8
-rw-r--r--paludis/distribution-impl.hh6
-rw-r--r--paludis/distribution.cc8
-rw-r--r--paludis/distribution.hh6
-rw-r--r--paludis/elf_linkage_checker.cc14
-rw-r--r--paludis/elf_linkage_checker.hh4
-rw-r--r--paludis/elike_annotations.cc8
-rw-r--r--paludis/elike_annotations.hh6
-rw-r--r--paludis/environment.hh6
-rw-r--r--paludis/environment_factory.cc8
-rw-r--r--paludis/environment_factory.hh6
-rw-r--r--paludis/environment_implementation.cc10
-rw-r--r--paludis/environment_implementation.hh4
-rw-r--r--paludis/environments/no_config/no_config_environment.cc14
-rw-r--r--paludis/environments/no_config/no_config_environment.hh6
-rw-r--r--paludis/environments/paludis/keywords_conf.cc8
-rw-r--r--paludis/environments/paludis/keywords_conf.hh4
-rw-r--r--paludis/environments/paludis/licenses_conf.cc8
-rw-r--r--paludis/environments/paludis/licenses_conf.hh4
-rw-r--r--paludis/environments/paludis/mirrors_conf.cc8
-rw-r--r--paludis/environments/paludis/mirrors_conf.hh4
-rw-r--r--paludis/environments/paludis/output_conf.cc10
-rw-r--r--paludis/environments/paludis/output_conf.hh6
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc8
-rw-r--r--paludis/environments/paludis/package_mask_conf.hh4
-rw-r--r--paludis/environments/paludis/paludis_config.cc16
-rw-r--r--paludis/environments/paludis/paludis_config.hh2
-rw-r--r--paludis/environments/paludis/paludis_environment.cc10
-rw-r--r--paludis/environments/paludis/paludis_environment.hh4
-rw-r--r--paludis/environments/paludis/use_conf.cc8
-rw-r--r--paludis/environments/paludis/use_conf.hh4
-rw-r--r--paludis/environments/paludis/world.cc8
-rw-r--r--paludis/environments/paludis/world.hh4
-rw-r--r--paludis/environments/portage/portage_environment.cc10
-rw-r--r--paludis/environments/portage/portage_environment.hh6
-rw-r--r--paludis/environments/test/test_environment.cc14
-rw-r--r--paludis/environments/test/test_environment.hh6
-rw-r--r--paludis/file_output_manager.cc10
-rw-r--r--paludis/file_output_manager.hh6
-rw-r--r--paludis/filter.cc12
-rw-r--r--paludis/filter.hh6
-rw-r--r--paludis/filtered_generator.cc14
-rw-r--r--paludis/filtered_generator.hh6
-rw-r--r--paludis/format_messages_output_manager.cc10
-rw-r--r--paludis/format_messages_output_manager.hh6
-rw-r--r--paludis/forward_at_finish_output_manager.cc10
-rw-r--r--paludis/forward_at_finish_output_manager.hh6
-rw-r--r--paludis/fuzzy_finder.cc10
-rw-r--r--paludis/fuzzy_finder.hh6
-rw-r--r--paludis/generator.cc12
-rw-r--r--paludis/generator.hh6
-rw-r--r--paludis/handled_information.cc14
-rw-r--r--paludis/handled_information.hh6
-rw-r--r--paludis/hook.cc16
-rw-r--r--paludis/hook.hh6
-rw-r--r--paludis/hooker.cc8
-rw-r--r--paludis/hooker.hh4
-rw-r--r--paludis/install_task.cc8
-rw-r--r--paludis/install_task.hh4
-rw-r--r--paludis/ipc_output_manager.cc26
-rw-r--r--paludis/ipc_output_manager.hh14
-rw-r--r--paludis/libtool_linkage_checker.cc8
-rw-r--r--paludis/libtool_linkage_checker.hh4
-rw-r--r--paludis/literal_metadata_key.cc42
-rw-r--r--paludis/literal_metadata_key.hh22
-rw-r--r--paludis/merger.cc8
-rw-r--r--paludis/merger.hh2
-rw-r--r--paludis/metadata_key.cc6
-rw-r--r--paludis/metadata_key_holder.cc6
-rw-r--r--paludis/metadata_key_holder.hh4
-rw-r--r--paludis/ndbam.cc6
-rw-r--r--paludis/ndbam.hh4
-rw-r--r--paludis/ndbam_merger.cc12
-rw-r--r--paludis/ndbam_merger.hh4
-rw-r--r--paludis/ndbam_unmerger.cc10
-rw-r--r--paludis/ndbam_unmerger.hh6
-rw-r--r--paludis/notifier_callback.cc10
-rw-r--r--paludis/notifier_callback.hh6
-rw-r--r--paludis/output_manager_factory.cc8
-rw-r--r--paludis/output_manager_factory.hh6
-rw-r--r--paludis/output_manager_from_environment.cc10
-rw-r--r--paludis/output_manager_from_environment.hh6
-rw-r--r--paludis/package_database.cc6
-rw-r--r--paludis/package_database.hh4
-rw-r--r--paludis/package_id.cc14
-rw-r--r--paludis/package_id.hh8
-rw-r--r--paludis/paludislike_options_conf.cc10
-rw-r--r--paludis/paludislike_options_conf.hh6
-rw-r--r--paludis/query_visitor.cc8
-rw-r--r--paludis/query_visitor.hh4
-rw-r--r--paludis/range_rewriter.cc8
-rw-r--r--paludis/range_rewriter.hh4
-rw-r--r--paludis/report_task.cc8
-rw-r--r--paludis/report_task.hh4
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.cc8
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.hh4
-rw-r--r--paludis/repositories/accounts/accounts_id.cc10
-rw-r--r--paludis/repositories/accounts/accounts_id.hh6
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc22
-rw-r--r--paludis/repositories/accounts/accounts_repository.hh6
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.cc10
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.hh6
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.cc12
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.hh6
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc20
-rw-r--r--paludis/repositories/cran/cran_installed_repository.hh6
-rw-r--r--paludis/repositories/cran/cran_package_id.cc16
-rw-r--r--paludis/repositories/cran/cran_package_id.hh4
-rw-r--r--paludis/repositories/cran/cran_repository.cc18
-rw-r--r--paludis/repositories/cran/cran_repository.hh6
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.cc8
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.hh4
-rw-r--r--paludis/repositories/cran/description_file.cc6
-rw-r--r--paludis/repositories/cran/description_file.hh2
-rw-r--r--paludis/repositories/cran/keys.cc8
-rw-r--r--paludis/repositories/cran/keys.hh4
-rw-r--r--paludis/repositories/cran/masks.cc8
-rw-r--r--paludis/repositories/cran/masks.hh4
-rw-r--r--paludis/repositories/e/aa_visitor.cc8
-rw-r--r--paludis/repositories/e/aa_visitor.hh4
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.cc8
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.hh4
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.cc10
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.hh2
-rw-r--r--paludis/repositories/e/dependencies_rewriter.cc8
-rw-r--r--paludis/repositories/e/dependencies_rewriter.hh4
-rw-r--r--paludis/repositories/e/e_choices_key.cc8
-rw-r--r--paludis/repositories/e/e_choices_key.hh2
-rw-r--r--paludis/repositories/e/e_installed_repository.cc10
-rw-r--r--paludis/repositories/e/e_installed_repository.hh4
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc10
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh4
-rw-r--r--paludis/repositories/e/e_key.cc74
-rw-r--r--paludis/repositories/e/e_key.hh24
-rw-r--r--paludis/repositories/e/e_mask.cc20
-rw-r--r--paludis/repositories/e/e_mask.hh8
-rw-r--r--paludis/repositories/e/e_repository.cc24
-rw-r--r--paludis/repositories/e/e_repository.hh6
-rw-r--r--paludis/repositories/e/e_repository_mask_file.cc6
-rw-r--r--paludis/repositories/e/e_repository_mask_file.hh4
-rw-r--r--paludis/repositories/e/e_repository_news.cc16
-rw-r--r--paludis/repositories/e/e_repository_news.hh6
-rw-r--r--paludis/repositories/e/e_repository_sets.cc10
-rw-r--r--paludis/repositories/e/e_repository_sets.hh2
-rw-r--r--paludis/repositories/e/e_stripper.cc10
-rw-r--r--paludis/repositories/e/e_stripper.hh4
-rw-r--r--paludis/repositories/e/eapi.cc14
-rw-r--r--paludis/repositories/e/eapi.hh6
-rw-r--r--paludis/repositories/e/eapi_phase.cc10
-rw-r--r--paludis/repositories/e/eapi_phase.hh6
-rw-r--r--paludis/repositories/e/ebuild.cc2
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc12
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.hh6
-rw-r--r--paludis/repositories/e/ebuild_id.cc10
-rw-r--r--paludis/repositories/e/ebuild_id.hh4
-rw-r--r--paludis/repositories/e/eclass_mtimes.cc8
-rw-r--r--paludis/repositories/e/eclass_mtimes.hh4
-rw-r--r--paludis/repositories/e/exheres_layout.cc8
-rw-r--r--paludis/repositories/e/exheres_layout.hh4
-rw-r--r--paludis/repositories/e/exheres_profile.cc8
-rw-r--r--paludis/repositories/e/exheres_profile.hh2
-rw-r--r--paludis/repositories/e/exndbam_repository.cc12
-rw-r--r--paludis/repositories/e/exndbam_repository.hh6
-rw-r--r--paludis/repositories/e/fetch_visitor.cc8
-rw-r--r--paludis/repositories/e/fetch_visitor.hh4
-rw-r--r--paludis/repositories/e/glsa.cc12
-rw-r--r--paludis/repositories/e/glsa.hh6
-rw-r--r--paludis/repositories/e/info_metadata_key.cc20
-rw-r--r--paludis/repositories/e/info_metadata_key.hh12
-rw-r--r--paludis/repositories/e/manifest2_reader.cc8
-rw-r--r--paludis/repositories/e/manifest2_reader.hh2
-rw-r--r--paludis/repositories/e/memoised_hashes.cc10
-rw-r--r--paludis/repositories/e/memoised_hashes.hh6
-rw-r--r--paludis/repositories/e/metadata_xml.cc8
-rw-r--r--paludis/repositories/e/metadata_xml.hh6
-rw-r--r--paludis/repositories/e/myoptions_requirements_verifier.cc10
-rw-r--r--paludis/repositories/e/myoptions_requirements_verifier.hh6
-rw-r--r--paludis/repositories/e/pretend_fetch_visitor.cc8
-rw-r--r--paludis/repositories/e/pretend_fetch_visitor.hh4
-rw-r--r--paludis/repositories/e/profile_file.cc10
-rw-r--r--paludis/repositories/e/profile_file.hh4
-rw-r--r--paludis/repositories/e/source_uri_finder.cc8
-rw-r--r--paludis/repositories/e/source_uri_finder.hh4
-rw-r--r--paludis/repositories/e/traditional_layout.cc8
-rw-r--r--paludis/repositories/e/traditional_layout.hh4
-rw-r--r--paludis/repositories/e/traditional_profile.cc36
-rw-r--r--paludis/repositories/e/traditional_profile.hh2
-rw-r--r--paludis/repositories/e/use_desc.cc8
-rw-r--r--paludis/repositories/e/use_desc.hh4
-rw-r--r--paludis/repositories/e/vdb_merger.cc10
-rw-r--r--paludis/repositories/e/vdb_merger.hh6
-rw-r--r--paludis/repositories/e/vdb_repository.cc18
-rw-r--r--paludis/repositories/e/vdb_repository.hh6
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc10
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh6
-rw-r--r--paludis/repositories/e/xml_things_handle.cc10
-rw-r--r--paludis/repositories/e/xml_things_handle.hh6
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc10
-rw-r--r--paludis/repositories/fake/fake_installed_repository.hh4
-rw-r--r--paludis/repositories/fake/fake_package_id.cc64
-rw-r--r--paludis/repositories/fake/fake_package_id.hh30
-rw-r--r--paludis/repositories/fake/fake_repository.cc10
-rw-r--r--paludis/repositories/fake/fake_repository.hh4
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc14
-rw-r--r--paludis/repositories/fake/fake_repository_base.hh6
-rw-r--r--paludis/repositories/gems/gem_specification.cc18
-rw-r--r--paludis/repositories/gems/gem_specification.hh6
-rw-r--r--paludis/repositories/gems/gem_specifications.cc14
-rw-r--r--paludis/repositories/gems/gem_specifications.hh4
-rw-r--r--paludis/repositories/gems/gems_repository.cc12
-rw-r--r--paludis/repositories/gems/gems_repository.hh6
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc12
-rw-r--r--paludis/repositories/gems/installed_gems_repository.hh6
-rw-r--r--paludis/repositories/gems/yaml.cc30
-rw-r--r--paludis/repositories/gems/yaml.hh12
-rw-r--r--paludis/repositories/repository/repository_id.cc14
-rw-r--r--paludis/repositories/repository/repository_id.hh4
-rw-r--r--paludis/repositories/repository/repository_repository.cc14
-rw-r--r--paludis/repositories/repository/repository_repository.hh8
-rw-r--r--paludis/repositories/repository/repository_repository_store.cc10
-rw-r--r--paludis/repositories/repository/repository_repository_store.hh6
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc12
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.hh4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.cc14
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.hh8
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc8
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_file.cc10
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_file.hh6
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc12
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.hh4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_store.cc10
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_store.hh6
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc12
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh6
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc12
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc10
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.cc14
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.cc12
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.hh6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.cc10
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.hh4
-rw-r--r--paludis/repositories/unwritten/unwritten_id.cc12
-rw-r--r--paludis/repositories/unwritten/unwritten_id.hh4
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.cc14
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.hh8
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.cc8
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.hh6
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_store.cc10
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_store.hh6
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc12
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh4
-rw-r--r--paludis/repositories/virtuals/package_id.cc18
-rw-r--r--paludis/repositories/virtuals/package_id.hh10
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc12
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh4
-rw-r--r--paludis/repository.cc10
-rw-r--r--paludis/repository.hh4
-rw-r--r--paludis/repository_factory.cc8
-rw-r--r--paludis/repository_factory.hh6
-rw-r--r--paludis/repository_name_cache.cc12
-rw-r--r--paludis/repository_name_cache.hh4
-rw-r--r--paludis/resolver/constraint.cc10
-rw-r--r--paludis/resolver/constraint.hh4
-rw-r--r--paludis/resolver/decider.cc8
-rw-r--r--paludis/resolver/decider.hh4
-rw-r--r--paludis/resolver/decision.cc50
-rw-r--r--paludis/resolver/decision.hh26
-rw-r--r--paludis/resolver/decisions.cc6
-rw-r--r--paludis/resolver/decisions.hh6
-rw-r--r--paludis/resolver/job.cc26
-rw-r--r--paludis/resolver/job.hh10
-rw-r--r--paludis/resolver/job_list.cc6
-rw-r--r--paludis/resolver/job_list.hh6
-rw-r--r--paludis/resolver/job_state.cc18
-rw-r--r--paludis/resolver/job_state.hh8
-rw-r--r--paludis/resolver/nag.cc6
-rw-r--r--paludis/resolver/nag.hh4
-rw-r--r--paludis/resolver/orderer.cc8
-rw-r--r--paludis/resolver/orderer.hh4
-rw-r--r--paludis/resolver/reason.cc66
-rw-r--r--paludis/resolver/reason.hh30
-rw-r--r--paludis/resolver/resolutions_by_resolvent.cc6
-rw-r--r--paludis/resolver/resolutions_by_resolvent.hh4
-rw-r--r--paludis/resolver/resolver.cc8
-rw-r--r--paludis/resolver/resolver.hh4
-rw-r--r--paludis/resolver/sanitised_dependencies.cc4
-rw-r--r--paludis/resolver/sanitised_dependencies.hh2
-rw-r--r--paludis/resolver/spec_rewriter.cc10
-rw-r--r--paludis/resolver/spec_rewriter.hh6
-rw-r--r--paludis/resolver/suggest_restart.cc12
-rw-r--r--paludis/resolver/suggest_restart.hh6
-rw-r--r--paludis/selection.cc12
-rw-r--r--paludis/selection.hh6
-rw-r--r--paludis/selection_cache.cc16
-rw-r--r--paludis/selection_cache.hh10
-rw-r--r--paludis/selinux/security_context.cc10
-rw-r--r--paludis/selinux/security_context.hh4
-rw-r--r--paludis/serialise.cc26
-rw-r--r--paludis/serialise.hh14
-rw-r--r--paludis/set_file.cc8
-rw-r--r--paludis/set_file.hh4
-rw-r--r--paludis/show_suggest_visitor.cc8
-rw-r--r--paludis/show_suggest_visitor.hh4
-rw-r--r--paludis/stringify_formatter-impl.hh12
-rw-r--r--paludis/stringify_formatter.cc4
-rw-r--r--paludis/stringify_formatter.hh4
-rw-r--r--paludis/stripper.cc8
-rw-r--r--paludis/stripper.hh4
-rw-r--r--paludis/sync_task.cc8
-rw-r--r--paludis/sync_task.hh4
-rw-r--r--paludis/tee_output_manager.cc10
-rw-r--r--paludis/tee_output_manager.hh6
-rw-r--r--paludis/uninstall_list.cc8
-rw-r--r--paludis/uninstall_list.hh4
-rw-r--r--paludis/uninstall_task.cc8
-rw-r--r--paludis/uninstall_task.hh4
-rw-r--r--paludis/unmerger.cc8
-rw-r--r--paludis/unmerger.hh4
-rw-r--r--paludis/user_dep_spec.cc10
-rw-r--r--paludis/user_dep_spec.hh6
-rw-r--r--paludis/util/action_queue.cc16
-rw-r--r--paludis/util/action_queue.hh6
-rw-r--r--paludis/util/buffer_output_stream.cc10
-rw-r--r--paludis/util/buffer_output_stream.hh6
-rw-r--r--paludis/util/clone-impl.hh2
-rw-r--r--paludis/util/config_file.cc38
-rw-r--r--paludis/util/config_file.hh14
-rw-r--r--paludis/util/damerau_levenshtein.cc10
-rw-r--r--paludis/util/damerau_levenshtein.hh6
-rw-r--r--paludis/util/dir_iterator.cc16
-rw-r--r--paludis/util/dir_iterator.hh6
-rw-r--r--paludis/util/elf.cc6
-rw-r--r--paludis/util/elf.hh6
-rw-r--r--paludis/util/elf_dynamic_section.cc10
-rw-r--r--paludis/util/elf_dynamic_section.hh10
-rw-r--r--paludis/util/elf_relocation_section.cc6
-rw-r--r--paludis/util/elf_relocation_section.hh6
-rw-r--r--paludis/util/elf_symbol_section.cc6
-rw-r--r--paludis/util/elf_symbol_section.hh6
-rw-r--r--paludis/util/executor.cc10
-rw-r--r--paludis/util/executor.hh6
-rw-r--r--paludis/util/files.m42
-rw-r--r--paludis/util/fs_entry.cc14
-rw-r--r--paludis/util/fs_entry.hh4
-rw-r--r--paludis/util/graph-impl.hh16
-rw-r--r--paludis/util/graph.hh6
-rw-r--r--paludis/util/log.cc20
-rw-r--r--paludis/util/log.hh4
-rw-r--r--paludis/util/map-impl.hh10
-rw-r--r--paludis/util/map.hh6
-rw-r--r--paludis/util/options.cc14
-rw-r--r--paludis/util/options.hh4
-rw-r--r--paludis/util/pimp-impl.hh (renamed from paludis/util/private_implementation_pattern-impl.hh)26
-rw-r--r--paludis/util/pimp.hh (renamed from paludis/util/private_implementation_pattern.hh)42
-rw-r--r--paludis/util/sequence-impl.hh10
-rw-r--r--paludis/util/sequence.hh6
-rw-r--r--paludis/util/set-impl.hh10
-rw-r--r--paludis/util/set.hh6
-rw-r--r--paludis/util/simple_parser.cc10
-rw-r--r--paludis/util/simple_parser.hh6
-rw-r--r--paludis/util/string_list_stream.cc10
-rw-r--r--paludis/util/string_list_stream.hh6
-rw-r--r--paludis/util/system.cc14
-rw-r--r--paludis/util/system.hh4
-rw-r--r--paludis/util/tail_output_stream.cc10
-rw-r--r--paludis/util/tail_output_stream.hh6
-rw-r--r--paludis/util/tee_output_stream.cc8
-rw-r--r--paludis/util/tee_output_stream.hh6
-rw-r--r--paludis/util/thread_pool.cc6
-rw-r--r--paludis/util/thread_pool.hh4
-rw-r--r--paludis/util/wildcard_expander.cc14
-rw-r--r--paludis/util/wildcard_expander.hh4
-rw-r--r--paludis/version_spec.cc10
-rw-r--r--paludis/version_spec.hh4
-rw-r--r--python/dep_spec.cc14
-rw-r--r--python/dep_spec.hh4
-rw-r--r--python/exception.cc6
-rw-r--r--python/exception.hh4
-rw-r--r--ruby/paludis_ruby.cc6
-rw-r--r--ruby/paludis_ruby.hh4
-rw-r--r--src/clients/cave/cmd_resolve_display_callback.cc8
-rw-r--r--src/clients/cave/cmd_resolve_display_callback.hh4
-rw-r--r--src/clients/cave/command_factory.cc8
-rw-r--r--src/clients/cave/command_factory.hh6
-rw-r--r--src/clients/cave/script_command.cc8
-rw-r--r--src/clients/cave/script_command.hh4
-rw-r--r--src/clients/inquisitio/exact_matcher.cc8
-rw-r--r--src/clients/inquisitio/exact_matcher.hh4
-rw-r--r--src/clients/inquisitio/key_extractor.cc8
-rw-r--r--src/clients/inquisitio/key_extractor.hh4
-rw-r--r--src/clients/inquisitio/matcher.cc2
-rw-r--r--src/clients/inquisitio/pcre_matcher.cc8
-rw-r--r--src/clients/inquisitio/pcre_matcher.hh4
-rw-r--r--src/clients/inquisitio/text_matcher.cc8
-rw-r--r--src/clients/inquisitio/text_matcher.hh4
-rw-r--r--src/output/console_query_task.cc8
-rw-r--r--src/output/console_query_task.hh4
-rw-r--r--src/output/mask_displayer.cc8
-rw-r--r--src/output/mask_displayer.hh4
-rw-r--r--test/test_framework.cc24
-rw-r--r--test/test_framework.hh6
-rw-r--r--test/test_runner.cc2
442 files changed, 2108 insertions, 2108 deletions
diff --git a/paludis/about_metadata.cc b/paludis/about_metadata.cc
index eb427ed..aa1658b 100644
--- a/paludis/about_metadata.cc
+++ b/paludis/about_metadata.cc
@@ -19,7 +19,7 @@
#include <paludis/about_metadata.hh>
#include <paludis/util/singleton-impl.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/literal_metadata_key.hh>
#include <paludis/about.hh>
@@ -28,7 +28,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<AboutMetadata>
+ struct Imp<AboutMetadata>
{
std::shared_ptr<LiteralMetadataValueKey<std::string> > package_key;
std::shared_ptr<LiteralMetadataValueKey<std::string> > version_key;
@@ -38,7 +38,7 @@ namespace paludis
std::shared_ptr<LiteralMetadataValueKey<std::string> > build_cxx_key;
std::shared_ptr<LiteralMetadataValueKey<std::string> > build_date_key;
- Implementation() :
+ Imp() :
package_key(new LiteralMetadataValueKey<std::string>("PALUDIS_PACKAGE", "Package Name", mkt_significant, PALUDIS_PACKAGE)),
version_key(new LiteralMetadataValueKey<std::string>("PALUDIS_VERSION", "Package Version", mkt_significant,
stringify(PALUDIS_VERSION_MAJOR) + "." + stringify(PALUDIS_VERSION_MINOR) + "." +
@@ -62,8 +62,8 @@ namespace paludis
}
AboutMetadata::AboutMetadata() :
- PrivateImplementationPattern<AboutMetadata>(),
- _imp(PrivateImplementationPattern<AboutMetadata>::_imp)
+ Pimp<AboutMetadata>(),
+ _imp(Pimp<AboutMetadata>::_imp)
{
add_metadata_key(_imp->package_key);
add_metadata_key(_imp->version_key);
@@ -82,6 +82,6 @@ AboutMetadata::need_keys_added() const
{
}
-template class PrivateImplementationPattern<AboutMetadata>;
+template class Pimp<AboutMetadata>;
template class Singleton<AboutMetadata>;
diff --git a/paludis/about_metadata.hh b/paludis/about_metadata.hh
index 6a1da81..62e0dba 100644
--- a/paludis/about_metadata.hh
+++ b/paludis/about_metadata.hh
@@ -22,7 +22,7 @@
#include <paludis/about_metadata-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/singleton.hh>
#include <paludis/metadata_key_holder.hh>
@@ -42,14 +42,14 @@ namespace paludis
* \since 0.46
*/
class PALUDIS_VISIBLE AboutMetadata :
- private PrivateImplementationPattern<AboutMetadata>,
+ private Pimp<AboutMetadata>,
public Singleton<AboutMetadata>,
public MetadataKeyHolder
{
friend class Singleton<AboutMetadata>;
private:
- PrivateImplementationPattern<AboutMetadata>::ImpPtr & _imp;
+ Pimp<AboutMetadata>::ImpPtr & _imp;
AboutMetadata();
~AboutMetadata();
@@ -58,7 +58,7 @@ namespace paludis
void need_keys_added() const;
};
- extern template class PrivateImplementationPattern<AboutMetadata>;
+ extern template class Pimp<AboutMetadata>;
extern template class Singleton<AboutMetadata>;
}
diff --git a/paludis/action.cc b/paludis/action.cc
index 1007043..c924a16 100644
--- a/paludis/action.cc
+++ b/paludis/action.cc
@@ -39,11 +39,11 @@ Action::~Action()
namespace paludis
{
template <>
- struct Implementation<InstallAction>
+ struct Imp<InstallAction>
{
const InstallActionOptions options;
- Implementation(const InstallActionOptions & o) :
+ Imp(const InstallActionOptions & o) :
options(o)
{
}
@@ -51,7 +51,7 @@ namespace paludis
}
InstallAction::InstallAction(const InstallActionOptions & o) :
- PrivateImplementationPattern<InstallAction>(o),
+ Pimp<InstallAction>(o),
options(_imp->options)
{
}
@@ -63,11 +63,11 @@ InstallAction::~InstallAction()
namespace paludis
{
template <>
- struct Implementation<FetchAction>
+ struct Imp<FetchAction>
{
const FetchActionOptions options;
- Implementation(const FetchActionOptions & o) :
+ Imp(const FetchActionOptions & o) :
options(o)
{
}
@@ -75,7 +75,7 @@ namespace paludis
}
FetchAction::FetchAction(const FetchActionOptions & o) :
- PrivateImplementationPattern<FetchAction>(o),
+ Pimp<FetchAction>(o),
options(_imp->options)
{
}
@@ -87,11 +87,11 @@ FetchAction::~FetchAction()
namespace paludis
{
template <>
- struct Implementation<UninstallAction>
+ struct Imp<UninstallAction>
{
const UninstallActionOptions options;
- Implementation(const UninstallActionOptions & o) :
+ Imp(const UninstallActionOptions & o) :
options(o)
{
}
@@ -99,7 +99,7 @@ namespace paludis
}
UninstallAction::UninstallAction(const UninstallActionOptions & o) :
- PrivateImplementationPattern<UninstallAction>(o),
+ Pimp<UninstallAction>(o),
options(_imp->options)
{
}
@@ -111,12 +111,12 @@ UninstallAction::~UninstallAction()
namespace paludis
{
template <>
- struct Implementation<PretendAction>
+ struct Imp<PretendAction>
{
bool failed;
const PretendActionOptions options;
- Implementation(const PretendActionOptions & o) :
+ Imp(const PretendActionOptions & o) :
failed(false),
options(o)
{
@@ -125,7 +125,7 @@ namespace paludis
}
PretendAction::PretendAction(const PretendActionOptions & o) :
- PrivateImplementationPattern<PretendAction>(o),
+ Pimp<PretendAction>(o),
options(_imp->options)
{
}
@@ -149,11 +149,11 @@ PretendAction::set_failed()
namespace paludis
{
template <>
- struct Implementation<PretendFetchAction>
+ struct Imp<PretendFetchAction>
{
const FetchActionOptions options;
- Implementation(const FetchActionOptions & o) :
+ Imp(const FetchActionOptions & o) :
options(o)
{
}
@@ -161,7 +161,7 @@ namespace paludis
}
PretendFetchAction::PretendFetchAction(const FetchActionOptions & o) :
- PrivateImplementationPattern<PretendFetchAction>(o),
+ Pimp<PretendFetchAction>(o),
options(_imp->options)
{
}
@@ -173,11 +173,11 @@ PretendFetchAction::~PretendFetchAction()
namespace paludis
{
template <>
- struct Implementation<InfoAction>
+ struct Imp<InfoAction>
{
const InfoActionOptions options;
- Implementation(const InfoActionOptions & o) :
+ Imp(const InfoActionOptions & o) :
options(o)
{
}
@@ -185,7 +185,7 @@ namespace paludis
}
InfoAction::InfoAction(const InfoActionOptions & o) :
- PrivateImplementationPattern<InfoAction>(o),
+ Pimp<InfoAction>(o),
options(_imp->options)
{
}
@@ -197,11 +197,11 @@ InfoAction::~InfoAction()
namespace paludis
{
template <>
- struct Implementation<ConfigAction>
+ struct Imp<ConfigAction>
{
const ConfigActionOptions options;
- Implementation(const ConfigActionOptions & o) :
+ Imp(const ConfigActionOptions & o) :
options(o)
{
}
@@ -209,7 +209,7 @@ namespace paludis
}
ConfigAction::ConfigAction(const ConfigActionOptions & o) :
- PrivateImplementationPattern<ConfigAction>(o),
+ Pimp<ConfigAction>(o),
options(_imp->options)
{
}
@@ -322,13 +322,13 @@ ConfigAction::class_simple_name()
return "config";
}
-template class PrivateImplementationPattern<FetchAction>;
-template class PrivateImplementationPattern<InstallAction>;
-template class PrivateImplementationPattern<PretendAction>;
-template class PrivateImplementationPattern<PretendFetchAction>;
-template class PrivateImplementationPattern<UninstallAction>;
-template class PrivateImplementationPattern<InfoAction>;
-template class PrivateImplementationPattern<ConfigAction>;
+template class Pimp<FetchAction>;
+template class Pimp<InstallAction>;
+template class Pimp<PretendAction>;
+template class Pimp<PretendFetchAction>;
+template class Pimp<UninstallAction>;
+template class Pimp<InfoAction>;
+template class Pimp<ConfigAction>;
template class Sequence<FetchActionFailure>;
template class WrappedForwardIterator<Sequence<FetchActionFailure>::ConstIteratorTag, const FetchActionFailure>;
diff --git a/paludis/action.hh b/paludis/action.hh
index 124bea6..30c5af5 100644
--- a/paludis/action.hh
+++ b/paludis/action.hh
@@ -26,7 +26,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/simple_visitor.hh>
#include <paludis/util/exception.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/sequence-fwd.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/fs_entry-fwd.hh>
@@ -275,7 +275,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE InstallAction :
public Action,
- private PrivateImplementationPattern<InstallAction>,
+ private Pimp<InstallAction>,
public ImplementAcceptMethods<Action, InstallAction>
{
public:
@@ -305,7 +305,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE FetchAction :
public Action,
- private PrivateImplementationPattern<FetchAction>,
+ private Pimp<FetchAction>,
public ImplementAcceptMethods<Action, FetchAction>
{
public:
@@ -335,7 +335,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE UninstallAction :
public Action,
- private PrivateImplementationPattern<UninstallAction>,
+ private Pimp<UninstallAction>,
public ImplementAcceptMethods<Action, UninstallAction>
{
public:
@@ -384,7 +384,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE PretendAction :
public Action,
- private PrivateImplementationPattern<PretendAction>,
+ private Pimp<PretendAction>,
public ImplementAcceptMethods<Action, PretendAction>
{
public:
@@ -425,7 +425,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE PretendFetchAction :
public Action,
- private PrivateImplementationPattern<PretendFetchAction>,
+ private Pimp<PretendFetchAction>,
public ImplementAcceptMethods<Action, PretendFetchAction>
{
public:
@@ -478,7 +478,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE ConfigAction :
public Action,
- private PrivateImplementationPattern<ConfigAction>,
+ private Pimp<ConfigAction>,
public ImplementAcceptMethods<Action, ConfigAction>
{
public:
@@ -537,7 +537,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE InfoAction:
public Action,
- private PrivateImplementationPattern<InfoAction>,
+ private Pimp<InfoAction>,
public ImplementAcceptMethods<Action, InfoAction>
{
public:
@@ -641,13 +641,13 @@ namespace paludis
///\}
};
- extern template class PrivateImplementationPattern<FetchAction>;
- extern template class PrivateImplementationPattern<InstallAction>;
- extern template class PrivateImplementationPattern<PretendAction>;
- extern template class PrivateImplementationPattern<PretendFetchAction>;
- extern template class PrivateImplementationPattern<UninstallAction>;
- extern template class PrivateImplementationPattern<InfoAction>;
- extern template class PrivateImplementationPattern<ConfigAction>;
+ extern template class Pimp<FetchAction>;
+ extern template class Pimp<InstallAction>;
+ extern template class Pimp<PretendAction>;
+ extern template class Pimp<PretendFetchAction>;
+ extern template class Pimp<UninstallAction>;
+ extern template class Pimp<InfoAction>;
+ extern template class Pimp<ConfigAction>;
}
#endif
diff --git a/paludis/args/args_group.cc b/paludis/args/args_group.cc
index bffa925..7ac4d83 100644
--- a/paludis/args/args_group.cc
+++ b/paludis/args/args_group.cc
@@ -19,7 +19,7 @@
#include <paludis/args/args_group.hh>
#include <paludis/args/args_section.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <list>
@@ -29,12 +29,12 @@ using namespace paludis::args;
namespace paludis
{
/**
- * Implementation data for ArgsGroup.
+ * Imp data for ArgsGroup.
*
* \ingroup grplibpaludisargs
*/
template<>
- struct Implementation<ArgsGroup>
+ struct Imp<ArgsGroup>
{
std::list<ArgsOption *> args_options;
};
@@ -48,7 +48,7 @@ namespace paludis
ArgsGroup::ArgsGroup(ArgsSection * s, const std::string & our_name,
const std::string & our_description) :
- PrivateImplementationPattern<ArgsGroup>(),
+ Pimp<ArgsGroup>(),
_name(our_name),
_description(our_description),
_section(s)
diff --git a/paludis/args/args_group.hh b/paludis/args/args_group.hh
index c050c8a..289a934 100644
--- a/paludis/args/args_group.hh
+++ b/paludis/args/args_group.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_ARGS_ARGS_GROUP_HH 1
#include <paludis/args/args_option.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <string>
/** \file
@@ -48,7 +48,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ArgsGroup :
- private PrivateImplementationPattern<ArgsGroup>
+ private Pimp<ArgsGroup>
{
private:
const std::string _name;
diff --git a/paludis/args/args_handler.cc b/paludis/args/args_handler.cc
index e7ec47c..2793719 100644
--- a/paludis/args/args_handler.cc
+++ b/paludis/args/args_handler.cc
@@ -25,7 +25,7 @@
#include <paludis/util/join.hh>
#include <paludis/util/accept_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/wrapped_output_iterator-impl.hh>
#include <paludis/util/create_iterator-impl.hh>
@@ -44,12 +44,12 @@ using namespace paludis::args;
namespace paludis
{
/**
- * Implementation data for ArgsHandler.
+ * Imp data for ArgsHandler.
*
* \ingroup grplibpaludisargs
*/
template<>
- struct Implementation<ArgsHandler>
+ struct Imp<ArgsHandler>
{
std::list<ArgsSection *> sections;
std::list<std::string> parameters;
@@ -66,7 +66,7 @@ namespace paludis
std::shared_ptr<ArgsSection> main_options_section;
- Implementation() :
+ Imp() :
separate_after_dashes_args(new Sequence<std::string>)
{
}
@@ -128,7 +128,7 @@ namespace paludis
}
ArgsHandler::ArgsHandler() :
- PrivateImplementationPattern<ArgsHandler>()
+ Pimp<ArgsHandler>()
{
}
diff --git a/paludis/args/args_handler.hh b/paludis/args/args_handler.hh
index 237ecce..e1f032d 100644
--- a/paludis/args/args_handler.hh
+++ b/paludis/args/args_handler.hh
@@ -22,7 +22,7 @@
#include <paludis/args/args_section.hh>
#include <paludis/args/args_group.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/options.hh>
#include <paludis/util/sequence.hh>
#include <memory>
@@ -56,7 +56,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ArgsHandler :
- private PrivateImplementationPattern<ArgsHandler>
+ private Pimp<ArgsHandler>
{
friend class ArgsSection;
friend std::ostream & operator<< (std::ostream &, const ArgsHandler &);
diff --git a/paludis/args/args_option.cc b/paludis/args/args_option.cc
index 0f162ba..63fbc26 100644
--- a/paludis/args/args_option.cc
+++ b/paludis/args/args_option.cc
@@ -23,7 +23,7 @@
#include <paludis/args/args_section.hh>
#include <paludis/args/args_handler.hh>
#include <paludis/args/escape.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/make_named_values.hh>
#include <paludis/util/join.hh>
@@ -168,14 +168,14 @@ StringArg::forwardable_args() const
namespace paludis
{
template<>
- struct Implementation<StringSetArg>
+ struct Imp<StringSetArg>
{
std::set<std::string> args;
std::vector<std::pair<std::string, std::string> > allowed_args;
};
template<>
- struct Implementation<StringSetArg::StringSetArgOptions>
+ struct Imp<StringSetArg::StringSetArgOptions>
{
std::vector<std::pair<std::string, std::string> > options;
};
@@ -197,7 +197,7 @@ StringSetArg::StringSetArg(ArgsGroup * const g, const std::string & our_long_nam
const char our_short_name, const std::string & our_description,
const StringSetArgOptions & opts) :
ArgsOption(g, our_long_name, our_short_name, our_description),
- PrivateImplementationPattern<StringSetArg>(),
+ Pimp<StringSetArg>(),
_validator(0)
{
std::copy(opts._imp->options.begin(), opts._imp->options.end(),
@@ -208,7 +208,7 @@ StringSetArg::StringSetArg(ArgsGroup * const g, const std::string & our_long_nam
const char our_short_name, const std::string & our_description,
const StringSetArgOptions & opts, void (* v) (const std::string &)) :
ArgsOption(g, our_long_name, our_short_name, our_description),
- PrivateImplementationPattern<StringSetArg>(),
+ Pimp<StringSetArg>(),
_validator(v)
{
std::copy(opts._imp->options.begin(), opts._imp->options.end(),
@@ -272,7 +272,7 @@ StringSetArg::forwardable_args() const
namespace paludis
{
template<>
- struct Implementation<StringSequenceArg>
+ struct Imp<StringSequenceArg>
{
std::list<std::string> args;
};
@@ -287,7 +287,7 @@ namespace paludis
StringSequenceArg::StringSequenceArg(ArgsGroup * const g, const std::string & our_long_name,
const char our_short_name, const std::string & our_description) :
ArgsOption(g, our_long_name, our_short_name, our_description),
- PrivateImplementationPattern<StringSequenceArg>()
+ Pimp<StringSequenceArg>()
{
}
@@ -370,13 +370,13 @@ IntegerArg::forwardable_args() const
namespace paludis
{
template<>
- struct Implementation<EnumArg>
+ struct Imp<EnumArg>
{
std::vector<AllowedEnumArg> allowed_args;
};
template<>
- struct Implementation<EnumArg::EnumArgOptions>
+ struct Imp<EnumArg::EnumArgOptions>
{
std::vector<AllowedEnumArg> options;
};
@@ -389,7 +389,7 @@ namespace paludis
}
StringSetArg::StringSetArgOptions::StringSetArgOptions(const std::string & opt, const std::string & desc) :
- PrivateImplementationPattern<StringSetArgOptions>()
+ Pimp<StringSetArgOptions>()
{
_imp->options.push_back(std::make_pair(opt, desc));
}
@@ -402,7 +402,7 @@ StringSetArg::StringSetArgOptions::operator() (const std::string & opt, const st
}
StringSetArg::StringSetArgOptions::StringSetArgOptions(const StringSetArg::StringSetArgOptions & o) :
- PrivateImplementationPattern<StringSetArgOptions>()
+ Pimp<StringSetArgOptions>()
{
std::copy(o._imp->options.begin(), o._imp->options.end(),
std::back_inserter(_imp->options));
@@ -413,7 +413,7 @@ StringSetArg::StringSetArgOptions::~StringSetArgOptions()
}
StringSetArg::StringSetArgOptions::StringSetArgOptions() :
- PrivateImplementationPattern<StringSetArgOptions>()
+ Pimp<StringSetArgOptions>()
{
}
@@ -446,7 +446,7 @@ EnumArg::~EnumArg()
}
EnumArg::EnumArgOptions::EnumArgOptions(const std::string & opt, const std::string & desc) :
- PrivateImplementationPattern<EnumArgOptions>()
+ Pimp<EnumArgOptions>()
{
_imp->options.push_back(make_named_values<AllowedEnumArg>(
n::description() = desc,
@@ -456,7 +456,7 @@ EnumArg::EnumArgOptions::EnumArgOptions(const std::string & opt, const std::stri
}
EnumArg::EnumArgOptions::EnumArgOptions(const std::string & opt, const char s, const std::string & desc) :
- PrivateImplementationPattern<EnumArgOptions>()
+ Pimp<EnumArgOptions>()
{
_imp->options.push_back(make_named_values<AllowedEnumArg>(
n::description() = desc,
@@ -495,7 +495,7 @@ EnumArg::EnumArg(ArgsGroup * const our_group, const std::string & our_long_name,
const char our_short_name, const std::string & our_description,
const EnumArgOptions & opts, const std::string & our_default_arg) :
ArgsOption(our_group, our_long_name, our_short_name, our_description),
- PrivateImplementationPattern<EnumArg>(),
+ Pimp<EnumArg>(),
_argument(our_default_arg),
_default_arg(our_default_arg)
{
diff --git a/paludis/args/args_option.hh b/paludis/args/args_option.hh
index a612665..3b60c5c 100644
--- a/paludis/args/args_option.hh
+++ b/paludis/args/args_option.hh
@@ -21,7 +21,7 @@
#ifndef PALUDIS_GUARD_ARGS_ARGS_OPTION_HH
#define PALUDIS_GUARD_ARGS_ARGS_OPTION_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/type_list.hh>
#include <paludis/util/named_value.hh>
@@ -260,7 +260,7 @@ namespace paludis
class PALUDIS_VISIBLE StringSetArg :
public ArgsOption,
public ImplementAcceptMethods<ArgsOption, StringSetArg>,
- private PrivateImplementationPattern<StringSetArg>
+ private Pimp<StringSetArg>
{
private:
void (* _validator) (const std::string &);
@@ -273,7 +273,7 @@ namespace paludis
* \ingroup grplibpaludisargs
*/
class PALUDIS_VISIBLE StringSetArgOptions :
- private PrivateImplementationPattern<StringSetArgOptions>
+ private Pimp<StringSetArgOptions>
{
friend class StringSetArg;
@@ -366,7 +366,7 @@ namespace paludis
class PALUDIS_VISIBLE StringSequenceArg :
public ArgsOption,
public ImplementAcceptMethods<ArgsOption, StringSequenceArg>,
- private PrivateImplementationPattern<StringSequenceArg>
+ private Pimp<StringSequenceArg>
{
public:
///\name Basic operations
@@ -514,7 +514,7 @@ namespace paludis
class PALUDIS_VISIBLE EnumArg :
public ArgsOption,
public ImplementAcceptMethods<ArgsOption, EnumArg>,
- private PrivateImplementationPattern<EnumArg>
+ private Pimp<EnumArg>
{
private:
std::string _argument;
@@ -528,7 +528,7 @@ namespace paludis
* \ingroup grplibpaludisargs
*/
class PALUDIS_VISIBLE EnumArgOptions :
- private PrivateImplementationPattern<EnumArgOptions>
+ private Pimp<EnumArgOptions>
{
friend class EnumArg;
diff --git a/paludis/args/args_section.cc b/paludis/args/args_section.cc
index 2508e17..bda59ad 100644
--- a/paludis/args/args_section.cc
+++ b/paludis/args/args_section.cc
@@ -19,7 +19,7 @@
#include <paludis/args/args_section.hh>
#include <paludis/args/args_handler.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 <list>
@@ -30,13 +30,13 @@ using namespace paludis::args;
namespace paludis
{
template <>
- struct Implementation<ArgsSection>
+ struct Imp<ArgsSection>
{
ArgsHandler * const handler;
const std::string name;
std::list<ArgsGroup *> groups;
- Implementation(ArgsHandler * const h, const std::string & s) :
+ Imp(ArgsHandler * const h, const std::string & s) :
handler(h),
name(s)
{
@@ -51,7 +51,7 @@ namespace paludis
}
ArgsSection::ArgsSection(ArgsHandler * const h, const std::string & s) :
- PrivateImplementationPattern<ArgsSection>(h, s)
+ Pimp<ArgsSection>(h, s)
{
h->add(this);
}
@@ -96,6 +96,6 @@ ArgsSection::name() const
return _imp->name;
}
-template class PrivateImplementationPattern<ArgsSection>;
+template class Pimp<ArgsSection>;
template class WrappedForwardIterator<args::ArgsSection::GroupsConstIteratorTag, const args::ArgsGroup>;
diff --git a/paludis/args/args_section.hh b/paludis/args/args_section.hh
index a98a6ce..412e538 100644
--- a/paludis/args/args_section.hh
+++ b/paludis/args/args_section.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_ARGS_ARGS_SECTION_HH
#define PALUDIS_GUARD_PALUDIS_ARGS_ARGS_SECTION_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <string>
@@ -39,7 +39,7 @@ namespace paludis
* \ingroup g_args
*/
class PALUDIS_VISIBLE ArgsSection :
- private PrivateImplementationPattern<ArgsSection>
+ private Pimp<ArgsSection>
{
public:
ArgsSection(ArgsHandler * const, const std::string &);
@@ -58,7 +58,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<args::ArgsSection>;
+ extern template class Pimp<args::ArgsSection>;
extern template class WrappedForwardIterator<args::ArgsSection::GroupsConstIteratorTag, const args::ArgsGroup>;
}
diff --git a/paludis/args/args_visitor.cc b/paludis/args/args_visitor.cc
index 86104d2..aa0e863 100644
--- a/paludis/args/args_visitor.cc
+++ b/paludis/args/args_visitor.cc
@@ -26,7 +26,7 @@
#include <paludis/util/system.hh>
#include <paludis/util/join.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <algorithm>
#include <sstream>
@@ -38,7 +38,7 @@ using namespace paludis::args;
namespace paludis
{
template <>
- struct Implementation<ArgsVisitor>
+ struct Imp<ArgsVisitor>
{
ArgsHandler::ArgsIterator * args_index;
ArgsHandler::ArgsIterator args_end;
@@ -46,7 +46,7 @@ namespace paludis
char & second_char_or_zero;
bool no;
- Implementation(
+ Imp(
ArgsHandler::ArgsIterator * i,
ArgsHandler::ArgsIterator e,
std::string p,
@@ -64,7 +64,7 @@ namespace paludis
ArgsVisitor::ArgsVisitor(ArgsHandler::ArgsIterator * ai, ArgsHandler::ArgsIterator ae,
const std::string & env_prefix, char & s, bool n) :
- PrivateImplementationPattern<ArgsVisitor>(ai, ae, env_prefix, s, n)
+ Pimp<ArgsVisitor>(ai, ae, env_prefix, s, n)
{
}
diff --git a/paludis/args/args_visitor.hh b/paludis/args/args_visitor.hh
index ca2ad7d..523ec20 100644
--- a/paludis/args/args_visitor.hh
+++ b/paludis/args/args_visitor.hh
@@ -24,7 +24,7 @@
#include <paludis/util/simple_visitor.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/args/args_handler.hh>
#include <string>
@@ -57,7 +57,7 @@ namespace paludis
* \ingroup g_args
*/
class PALUDIS_VISIBLE ArgsVisitor :
- private PrivateImplementationPattern<ArgsVisitor>
+ private Pimp<ArgsVisitor>
{
private:
const std::string & get_param(const ArgsOption &);
diff --git a/paludis/broken_linkage_configuration.cc b/paludis/broken_linkage_configuration.cc
index d2d43a6..1de7582 100644
--- a/paludis/broken_linkage_configuration.cc
+++ b/paludis/broken_linkage_configuration.cc
@@ -25,7 +25,7 @@
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
#include <paludis/util/options.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/system.hh>
#include <paludis/util/tokeniser.hh>
@@ -40,7 +40,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<BrokenLinkageConfiguration>
+ struct Imp<BrokenLinkageConfiguration>
{
std::vector<std::string> ld_library_mask;
std::vector<FSEntry> search_dirs;
@@ -136,7 +136,7 @@ namespace
}
BrokenLinkageConfiguration::BrokenLinkageConfiguration(const FSEntry & root) :
- PrivateImplementationPattern<BrokenLinkageConfiguration>()
+ Pimp<BrokenLinkageConfiguration>()
{
Context ctx("When loading broken linkage checker configuration for '" + stringify(root) + "':");
@@ -164,7 +164,7 @@ BrokenLinkageConfiguration::~BrokenLinkageConfiguration()
}
void
-Implementation<BrokenLinkageConfiguration>::load_from_environment()
+Imp<BrokenLinkageConfiguration>::load_from_environment()
{
using namespace std::placeholders;
@@ -179,7 +179,7 @@ Implementation<BrokenLinkageConfiguration>::load_from_environment()
}
void
-Implementation<BrokenLinkageConfiguration>::load_from_etc_revdep_rebuild(const FSEntry & root)
+Imp<BrokenLinkageConfiguration>::load_from_etc_revdep_rebuild(const FSEntry & root)
{
using namespace std::placeholders;
@@ -227,7 +227,7 @@ Implementation<BrokenLinkageConfiguration>::load_from_etc_revdep_rebuild(const F
}
void
-Implementation<BrokenLinkageConfiguration>::load_from_etc_profile_env(const FSEntry & root)
+Imp<BrokenLinkageConfiguration>::load_from_etc_profile_env(const FSEntry & root)
{
using namespace std::placeholders;
@@ -256,7 +256,7 @@ Implementation<BrokenLinkageConfiguration>::load_from_etc_profile_env(const FSEn
}
void
-Implementation<BrokenLinkageConfiguration>::load_from_etc_ld_so_conf(const FSEntry & root)
+Imp<BrokenLinkageConfiguration>::load_from_etc_ld_so_conf(const FSEntry & root)
{
FSEntry etc_ld_so_conf(root / "etc" / "ld.so.conf");
Context ctx("When reading '" + stringify(etc_ld_so_conf) + "':");
@@ -281,7 +281,7 @@ Implementation<BrokenLinkageConfiguration>::load_from_etc_ld_so_conf(const FSEnt
}
void
-Implementation<BrokenLinkageConfiguration>::add_defaults()
+Imp<BrokenLinkageConfiguration>::add_defaults()
{
Context ctx("When adding default settings:");
diff --git a/paludis/broken_linkage_configuration.hh b/paludis/broken_linkage_configuration.hh
index 07d8807..36c1299 100644
--- a/paludis/broken_linkage_configuration.hh
+++ b/paludis/broken_linkage_configuration.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <string>
@@ -30,7 +30,7 @@
namespace paludis
{
class PALUDIS_VISIBLE BrokenLinkageConfiguration :
- private PrivateImplementationPattern<BrokenLinkageConfiguration>
+ private Pimp<BrokenLinkageConfiguration>
{
public:
BrokenLinkageConfiguration(const FSEntry &);
diff --git a/paludis/broken_linkage_finder.cc b/paludis/broken_linkage_finder.cc
index f43670f..d2beb27 100644
--- a/paludis/broken_linkage_finder.cc
+++ b/paludis/broken_linkage_finder.cc
@@ -28,7 +28,7 @@
#include <paludis/util/dir_iterator.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/set-impl.hh>
#include <paludis/util/sequence-impl.hh>
#include <paludis/util/simple_visitor_cast.hh>
@@ -63,7 +63,7 @@ typedef std::map<std::shared_ptr<const PackageID>, PackageBreakage, PackageIDSet
namespace paludis
{
template <>
- struct Implementation<BrokenLinkageFinder>
+ struct Imp<BrokenLinkageFinder>
{
const Environment * env;
const BrokenLinkageConfiguration config;
@@ -88,7 +88,7 @@ namespace paludis
void add_breakage(const FSEntry &, const std::string &);
void gather_package(const std::shared_ptr<const PackageID> &);
- Implementation(const Environment * the_env, const std::string & the_library) :
+ Imp(const Environment * the_env, const std::string & the_library) :
env(the_env),
config(the_env->root()),
library(the_library),
@@ -140,7 +140,7 @@ namespace
}
BrokenLinkageFinder::BrokenLinkageFinder(const Environment * env, const std::string & library) :
- PrivateImplementationPattern<BrokenLinkageFinder>(env, library)
+ Pimp<BrokenLinkageFinder>(env, library)
{
using namespace std::placeholders;
@@ -171,7 +171,7 @@ BrokenLinkageFinder::BrokenLinkageFinder(const Environment * env, const std::str
std::bind(realpath_with_current_and_root, _1, FSEntry("/"), env->root()));
std::for_each(search_dirs_pruned.begin(), search_dirs_pruned.end(),
- std::bind(&Implementation<BrokenLinkageFinder>::search_directory, _imp.get(), _1));
+ std::bind(&Imp<BrokenLinkageFinder>::search_directory, _imp.get(), _1));
for (std::set<FSEntry>::const_iterator it(_imp->extra_lib_dirs.begin()),
it_end(_imp->extra_lib_dirs.end()); it_end != it; ++it)
@@ -183,7 +183,7 @@ BrokenLinkageFinder::BrokenLinkageFinder(const Environment * env, const std::str
}
std::function<void (const FSEntry &, const std::string &)> callback(
- std::bind(&Implementation<BrokenLinkageFinder>::add_breakage, _imp.get(), _1, _2));
+ std::bind(&Imp<BrokenLinkageFinder>::add_breakage, _imp.get(), _1, _2));
std::for_each(indirect_iterator(_imp->checkers.begin()), indirect_iterator(_imp->checkers.end()),
std::bind(&LinkageChecker::need_breakage_added, _1, callback));
@@ -195,7 +195,7 @@ BrokenLinkageFinder::~BrokenLinkageFinder()
}
void
-Implementation<BrokenLinkageFinder>::search_directory(const FSEntry & directory)
+Imp<BrokenLinkageFinder>::search_directory(const FSEntry & directory)
{
FSEntry dir(directory);
env->trigger_notifier_callback(NotifierCallbackLinkageStepEvent(dir));
@@ -221,7 +221,7 @@ Implementation<BrokenLinkageFinder>::search_directory(const FSEntry & directory)
}
void
-Implementation<BrokenLinkageFinder>::walk_directory(const FSEntry & directory)
+Imp<BrokenLinkageFinder>::walk_directory(const FSEntry & directory)
{
using namespace std::placeholders;
@@ -243,7 +243,7 @@ Implementation<BrokenLinkageFinder>::walk_directory(const FSEntry & directory)
try
{
std::for_each(DirIterator(directory, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort), DirIterator(),
- std::bind(&Implementation<BrokenLinkageFinder>::check_file, this, _1));
+ std::bind(&Imp<BrokenLinkageFinder>::check_file, this, _1));
}
catch (const FSError & ex)
{
@@ -252,7 +252,7 @@ Implementation<BrokenLinkageFinder>::walk_directory(const FSEntry & directory)
}
void
-Implementation<BrokenLinkageFinder>::check_file(const FSEntry & file)
+Imp<BrokenLinkageFinder>::check_file(const FSEntry & file)
{
using namespace std::placeholders;
@@ -289,7 +289,7 @@ Implementation<BrokenLinkageFinder>::check_file(const FSEntry & file)
}
void
-Implementation<BrokenLinkageFinder>::add_breakage(const FSEntry & file, const std::string & req)
+Imp<BrokenLinkageFinder>::add_breakage(const FSEntry & file, const std::string & req)
{
using namespace std::placeholders;
@@ -306,7 +306,7 @@ Implementation<BrokenLinkageFinder>::add_breakage(const FSEntry & file, const st
generator::All() | filter::InstalledAtRoot(env->root()))]);
std::for_each(pkgs->begin(), pkgs->end(),
- std::bind(&Implementation<BrokenLinkageFinder>::gather_package, this, _1));
+ std::bind(&Imp<BrokenLinkageFinder>::gather_package, this, _1));
}
FSEntry without_root(file.strip_leading(env->root()));
@@ -322,7 +322,7 @@ Implementation<BrokenLinkageFinder>::add_breakage(const FSEntry & file, const st
}
void
-Implementation<BrokenLinkageFinder>::gather_package(const std::shared_ptr<const PackageID> & pkg)
+Imp<BrokenLinkageFinder>::gather_package(const std::shared_ptr<const PackageID> & pkg)
{
using namespace std::placeholders;
diff --git a/paludis/broken_linkage_finder.hh b/paludis/broken_linkage_finder.hh
index 268a812..e2ac1f2 100644
--- a/paludis/broken_linkage_finder.hh
+++ b/paludis/broken_linkage_finder.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/environment-fwd.hh>
@@ -33,7 +33,7 @@
namespace paludis
{
class PALUDIS_VISIBLE BrokenLinkageFinder :
- private paludis::PrivateImplementationPattern<BrokenLinkageFinder>
+ private paludis::Pimp<BrokenLinkageFinder>
{
public:
BrokenLinkageFinder(const paludis::Environment *, const std::string &);
diff --git a/paludis/buffer_output_manager.cc b/paludis/buffer_output_manager.cc
index 7a4bf6c..7b91213 100644
--- a/paludis/buffer_output_manager.cc
+++ b/paludis/buffer_output_manager.cc
@@ -19,7 +19,7 @@
#include <paludis/buffer_output_manager.hh>
#include <paludis/util/buffer_output_stream.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/exception.hh>
@@ -29,13 +29,13 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<BufferOutputManager>
+ struct Imp<BufferOutputManager>
{
const std::shared_ptr<OutputManager> child;
BufferOutputStream stdout_stream;
BufferOutputStream stderr_stream;
- Implementation(
+ Imp(
const std::shared_ptr<OutputManager> & c) :
child(c)
{
@@ -45,7 +45,7 @@ namespace paludis
BufferOutputManager::BufferOutputManager(
const std::shared_ptr<OutputManager> & c) :
- PrivateImplementationPattern<BufferOutputManager>(c)
+ Pimp<BufferOutputManager>(c)
{
}
@@ -119,5 +119,5 @@ BufferOutputManager::factory_create(
return std::make_shared<BufferOutputManager>(child);
}
-template class PrivateImplementationPattern<BufferOutputManager>;
+template class Pimp<BufferOutputManager>;
diff --git a/paludis/buffer_output_manager.hh b/paludis/buffer_output_manager.hh
index 325a050..2840ed4 100644
--- a/paludis/buffer_output_manager.hh
+++ b/paludis/buffer_output_manager.hh
@@ -23,14 +23,14 @@
#include <paludis/tee_output_manager-fwd.hh>
#include <paludis/output_manager.hh>
#include <paludis/output_manager_factory.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
#include <functional>
namespace paludis
{
class PALUDIS_VISIBLE BufferOutputManager :
- private PrivateImplementationPattern<BufferOutputManager>,
+ private Pimp<BufferOutputManager>,
public OutputManager
{
public:
@@ -58,7 +58,7 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template class PrivateImplementationPattern<BufferOutputManager>;
+ extern template class Pimp<BufferOutputManager>;
}
diff --git a/paludis/choice.cc b/paludis/choice.cc
index 0c3c3e4..2ed0d86 100644
--- a/paludis/choice.cc
+++ b/paludis/choice.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/choice.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/wrapped_output_iterator-impl.hh>
#include <paludis/util/stringify.hh>
@@ -151,14 +151,14 @@ WrappedValueTraits<UnprefixedChoiceNameTag>::validate(const std::string & s)
namespace paludis
{
template <>
- struct Implementation<Choices>
+ struct Imp<Choices>
{
ChoicesList choices;
};
}
Choices::Choices() :
- PrivateImplementationPattern<Choices>()
+ Pimp<Choices>()
{
}
@@ -231,12 +231,12 @@ Choices::has_matching_contains_every_value_prefix(const ChoiceNameWithPrefix & f
namespace paludis
{
template <>
- struct Implementation<Choice>
+ struct Imp<Choice>
{
ChoiceList values;
const ChoiceParams params;
- Implementation(const ChoiceParams & p) :
+ Imp(const ChoiceParams & p) :
params(p)
{
}
@@ -244,7 +244,7 @@ namespace paludis
}
Choice::Choice(const ChoiceParams & p) :
- PrivateImplementationPattern<Choice>(p)
+ Pimp<Choice>(p)
{
}
@@ -316,8 +316,8 @@ ChoiceValue::~ChoiceValue()
{
}
-template class PrivateImplementationPattern<Choices>;
-template class PrivateImplementationPattern<Choice>;
+template class Pimp<Choices>;
+template class Pimp<Choice>;
template class WrappedForwardIterator<Choices::ConstIteratorTag, const std::shared_ptr<const Choice> >;
template class WrappedForwardIterator<Choice::ConstIteratorTag, const std::shared_ptr<const ChoiceValue> >;
diff --git a/paludis/choice.hh b/paludis/choice.hh
index dcaea62..ba13e6a 100644
--- a/paludis/choice.hh
+++ b/paludis/choice.hh
@@ -23,7 +23,7 @@
#include <paludis/choice-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/wrapped_value.hh>
@@ -138,7 +138,7 @@ namespace paludis
* \since 0.32
*/
class PALUDIS_VISIBLE Choices :
- private PrivateImplementationPattern<Choices>
+ private Pimp<Choices>
{
public:
///\name Basic operations
@@ -217,7 +217,7 @@ namespace paludis
* \since 0.32
*/
class PALUDIS_VISIBLE Choice :
- private PrivateImplementationPattern<Choice>
+ private Pimp<Choice>
{
public:
///\name Basic operations
@@ -370,8 +370,8 @@ namespace paludis
///\}
};
- extern template class PrivateImplementationPattern<Choices>;
- extern template class PrivateImplementationPattern<Choice>;
+ extern template class Pimp<Choices>;
+ extern template class Pimp<Choice>;
extern template class WrappedForwardIterator<Choices::ConstIteratorTag, const std::shared_ptr<const Choice> >;
extern template class WrappedForwardIterator<Choice::ConstIteratorTag, const std::shared_ptr<const ChoiceValue> >;
diff --git a/paludis/comma_separated_dep_printer.cc b/paludis/comma_separated_dep_printer.cc
index 2e0a4ee..faccee0 100644
--- a/paludis/comma_separated_dep_printer.cc
+++ b/paludis/comma_separated_dep_printer.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/comma_separated_dep_printer.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/options.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -35,7 +35,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<CommaSeparatedDepPrinter>
+ struct Imp<CommaSeparatedDepPrinter>
{
std::stringstream s;
const Environment * const env;
@@ -44,7 +44,7 @@ namespace paludis
const bool flat;
bool need_comma;
- Implementation(
+ Imp(
const Environment * const e,
const DependencySpecTree::ItemFormatter & f,
const unsigned u,
@@ -61,7 +61,7 @@ namespace paludis
CommaSeparatedDepPrinter::CommaSeparatedDepPrinter(const Environment * const e,
const DependencySpecTree::ItemFormatter & f, const bool flat) :
- PrivateImplementationPattern<CommaSeparatedDepPrinter>(e, f, 0, flat)
+ Pimp<CommaSeparatedDepPrinter>(e, f, 0, flat)
{
}
diff --git a/paludis/comma_separated_dep_printer.hh b/paludis/comma_separated_dep_printer.hh
index adf38c8..c787936 100644
--- a/paludis/comma_separated_dep_printer.hh
+++ b/paludis/comma_separated_dep_printer.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNPACKAGED_DEP_PRINTER_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNPACKAGED_DEP_PRINTER_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/spec_tree.hh>
#include <paludis/formatter.hh>
#include <paludis/environment-fwd.hh>
@@ -28,7 +28,7 @@
namespace paludis
{
class PALUDIS_VISIBLE CommaSeparatedDepPrinter :
- private PrivateImplementationPattern<CommaSeparatedDepPrinter>
+ private Pimp<CommaSeparatedDepPrinter>
{
public:
CommaSeparatedDepPrinter(const Environment * const, const DependencySpecTree::ItemFormatter &, const bool);
diff --git a/paludis/contents.cc b/paludis/contents.cc
index c9e7183..5fb1841 100644
--- a/paludis/contents.cc
+++ b/paludis/contents.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/contents.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/literal_metadata_key.hh>
#include <list>
@@ -30,11 +30,11 @@ typedef std::list<std::shared_ptr<const ContentsEntry> > Entries;
namespace paludis
{
template <>
- struct Implementation<ContentsEntry>
+ struct Imp<ContentsEntry>
{
const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
- Implementation(const FSEntry & n) :
+ Imp(const FSEntry & n) :
location_key(std::make_shared<LiteralMetadataValueKey<FSEntry>>("location", "location", mkt_significant, n))
{
}
@@ -42,8 +42,8 @@ namespace paludis
}
ContentsEntry::ContentsEntry(const FSEntry & n) :
- PrivateImplementationPattern<ContentsEntry>(n),
- _imp(PrivateImplementationPattern<ContentsEntry>::_imp)
+ Pimp<ContentsEntry>(n),
+ _imp(Pimp<ContentsEntry>::_imp)
{
add_metadata_key(_imp->location_key);
}
@@ -81,11 +81,11 @@ ContentsOtherEntry::ContentsOtherEntry(const FSEntry & our_name) :
namespace paludis
{
template <>
- struct Implementation<ContentsSymEntry>
+ struct Imp<ContentsSymEntry>
{
const std::shared_ptr<const MetadataValueKey<std::string> > target_key;
- Implementation(const std::string & t) :
+ Imp(const std::string & t) :
target_key(std::make_shared<LiteralMetadataValueKey<std::string>>("target", "target", mkt_normal, t))
{
}
@@ -93,9 +93,9 @@ namespace paludis
}
ContentsSymEntry::ContentsSymEntry(const FSEntry & our_name, const std::string & our_target) :
- PrivateImplementationPattern<ContentsSymEntry>(our_target),
+ Pimp<ContentsSymEntry>(our_target),
ContentsEntry(our_name),
- _imp(PrivateImplementationPattern<ContentsSymEntry>::_imp)
+ _imp(Pimp<ContentsSymEntry>::_imp)
{
add_metadata_key(_imp->target_key);
}
@@ -113,7 +113,7 @@ ContentsSymEntry::target_key() const
namespace paludis
{
template<>
- struct Implementation<Contents>
+ struct Imp<Contents>
{
Entries c;
};
@@ -126,7 +126,7 @@ namespace paludis
}
Contents::Contents() :
- PrivateImplementationPattern<Contents>()
+ Pimp<Contents>()
{
}
@@ -152,9 +152,9 @@ Contents::end() const
return ConstIterator(_imp->c.end());
}
-template class PrivateImplementationPattern<Contents>;
-template class PrivateImplementationPattern<ContentsEntry>;
-template class PrivateImplementationPattern<ContentsSymEntry>;
+template class Pimp<Contents>;
+template class Pimp<ContentsEntry>;
+template class Pimp<ContentsSymEntry>;
template class WrappedForwardIterator<Contents::ConstIteratorTag, const std::shared_ptr<const ContentsEntry> >;
diff --git a/paludis/contents.hh b/paludis/contents.hh
index 8213b8e..595aa2e 100644
--- a/paludis/contents.hh
+++ b/paludis/contents.hh
@@ -22,7 +22,7 @@
#include <paludis/contents-fwd.hh>
#include <paludis/util/simple_visitor.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/type_list.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/fs_entry-fwd.hh>
@@ -51,13 +51,13 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ContentsEntry :
- private PrivateImplementationPattern<ContentsEntry>,
+ private Pimp<ContentsEntry>,
public MetadataKeyHolder,
public virtual DeclareAbstractAcceptMethods<ContentsEntry, MakeTypeList<
ContentsFileEntry, ContentsDirEntry, ContentsSymEntry, ContentsOtherEntry>::Type>
{
private:
- PrivateImplementationPattern<ContentsEntry>::ImpPtr & _imp;
+ Pimp<ContentsEntry>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
@@ -163,12 +163,12 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ContentsSymEntry :
- private PrivateImplementationPattern<ContentsSymEntry>,
+ private Pimp<ContentsSymEntry>,
public ContentsEntry,
public ImplementAcceptMethods<ContentsEntry, ContentsSymEntry>
{
private:
- PrivateImplementationPattern<ContentsSymEntry>::ImpPtr & _imp;
+ Pimp<ContentsSymEntry>::ImpPtr & _imp;
public:
///\name Basic operations
@@ -199,7 +199,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE Contents :
- private PrivateImplementationPattern<Contents>
+ private Pimp<Contents>
{
public:
///\name Basic operations
@@ -231,9 +231,9 @@ namespace paludis
///\}
};
- extern template class PrivateImplementationPattern<Contents>;
- extern template class PrivateImplementationPattern<ContentsEntry>;
- extern template class PrivateImplementationPattern<ContentsSymEntry>;
+ extern template class Pimp<Contents>;
+ extern template class Pimp<ContentsEntry>;
+ extern template class Pimp<ContentsSymEntry>;
extern template class WrappedForwardIterator<Contents::ConstIteratorTag, const std::shared_ptr<const ContentsEntry> >;
}
diff --git a/paludis/create_output_manager_info.cc b/paludis/create_output_manager_info.cc
index 51d37f2..c05f912 100644
--- a/paludis/create_output_manager_info.cc
+++ b/paludis/create_output_manager_info.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/create_output_manager_info.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/set.hh>
@@ -84,7 +84,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<CreateOutputManagerForPackageIDActionInfo>
+ struct Imp<CreateOutputManagerForPackageIDActionInfo>
{
const std::shared_ptr<const PackageID> id;
const std::string action_name;
@@ -92,7 +92,7 @@ namespace paludis
const OutputExclusivity output_exclusivity;
const ClientOutputFeatures client_output_features;
- Implementation(const std::shared_ptr<const PackageID> & i,
+ Imp(const std::shared_ptr<const PackageID> & i,
const std::string & a,
const std::shared_ptr<const Set<std::string> > & f,
const OutputExclusivity e,
@@ -107,13 +107,13 @@ namespace paludis
};
template <>
- struct Implementation<CreateOutputManagerForRepositorySyncInfo>
+ struct Imp<CreateOutputManagerForRepositorySyncInfo>
{
const RepositoryName repo_name;
const OutputExclusivity output_exclusivity;
const ClientOutputFeatures client_output_features;
- Implementation(const RepositoryName & r, const OutputExclusivity e, const ClientOutputFeatures & c) :
+ Imp(const RepositoryName & r, const OutputExclusivity e, const ClientOutputFeatures & c) :
repo_name(r),
output_exclusivity(e),
client_output_features(c)
@@ -138,7 +138,7 @@ CreateOutputManagerForPackageIDActionInfo::CreateOutputManagerForPackageIDAction
const Action & a,
const OutputExclusivity e,
const ClientOutputFeatures & c) :
- PrivateImplementationPattern<CreateOutputManagerForPackageIDActionInfo>(i, a.simple_name(), get_flags(a), e, c)
+ Pimp<CreateOutputManagerForPackageIDActionInfo>(i, a.simple_name(), get_flags(a), e, c)
{
}
@@ -148,7 +148,7 @@ CreateOutputManagerForPackageIDActionInfo::CreateOutputManagerForPackageIDAction
const std::shared_ptr<const Set<std::string> > & f,
const OutputExclusivity e,
const ClientOutputFeatures & c) :
- PrivateImplementationPattern<CreateOutputManagerForPackageIDActionInfo>(i, a, f, e, c)
+ Pimp<CreateOutputManagerForPackageIDActionInfo>(i, a, f, e, c)
{
}
@@ -219,7 +219,7 @@ CreateOutputManagerForPackageIDActionInfo::deserialise(Deserialisation & d)
CreateOutputManagerForRepositorySyncInfo::CreateOutputManagerForRepositorySyncInfo(
const RepositoryName & r, const OutputExclusivity e, const ClientOutputFeatures & c) :
- PrivateImplementationPattern<CreateOutputManagerForRepositorySyncInfo>(r, e, c)
+ Pimp<CreateOutputManagerForRepositorySyncInfo>(r, e, c)
{
}
@@ -266,6 +266,6 @@ CreateOutputManagerForRepositorySyncInfo::deserialise(Deserialisation & d)
);
}
-template class PrivateImplementationPattern<CreateOutputManagerForRepositorySyncInfo>;
-template class PrivateImplementationPattern<CreateOutputManagerForPackageIDActionInfo>;
+template class Pimp<CreateOutputManagerForRepositorySyncInfo>;
+template class Pimp<CreateOutputManagerForPackageIDActionInfo>;
diff --git a/paludis/create_output_manager_info.hh b/paludis/create_output_manager_info.hh
index 82753c9..090e74f 100644
--- a/paludis/create_output_manager_info.hh
+++ b/paludis/create_output_manager_info.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_CREATE_OUTPUT_MANAGER_INFO_HH 1
#include <paludis/create_output_manager_info-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/simple_visitor.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/type_list.hh>
@@ -62,7 +62,7 @@ namespace paludis
* \see Environment::create_output_manager
*/
class PALUDIS_VISIBLE CreateOutputManagerForPackageIDActionInfo :
- private PrivateImplementationPattern<CreateOutputManagerForPackageIDActionInfo>,
+ private Pimp<CreateOutputManagerForPackageIDActionInfo>,
public CreateOutputManagerInfo,
public ImplementAcceptMethods<CreateOutputManagerInfo, CreateOutputManagerForPackageIDActionInfo>
{
@@ -122,7 +122,7 @@ namespace paludis
* \see Environment::create_output_manager
*/
class PALUDIS_VISIBLE CreateOutputManagerForRepositorySyncInfo :
- private PrivateImplementationPattern<CreateOutputManagerForRepositorySyncInfo>,
+ private Pimp<CreateOutputManagerForRepositorySyncInfo>,
public CreateOutputManagerInfo,
public ImplementAcceptMethods<CreateOutputManagerInfo, CreateOutputManagerForRepositorySyncInfo>
{
diff --git a/paludis/dep_label.hh b/paludis/dep_label.hh
index 8e3b0fd..0137830 100644
--- a/paludis/dep_label.hh
+++ b/paludis/dep_label.hh
@@ -23,7 +23,7 @@
#include <paludis/dep_label-fwd.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/util/simple_visitor.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/type_list.hh>
#include <paludis/util/sequence.hh>
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index 354d39f..cf3d476 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -43,7 +43,7 @@
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/save.hh>
#include <paludis/util/member_iterator.hh>
@@ -105,7 +105,7 @@ namespace paludis
typedef std::unordered_multimap<QualifiedPackageName, MergeList::iterator, Hash<QualifiedPackageName> > MergeListIndex;
template<>
- struct Implementation<DepList>
+ struct Imp<DepList>
{
const Environment * const env;
std::shared_ptr<DepListOptions> opts;
@@ -130,7 +130,7 @@ namespace paludis
return std::shared_ptr<const PackageID>();
}
- Implementation(const Environment * const e, const DepListOptions & o) :
+ Imp(const Environment * const e, const DepListOptions & o) :
env(e),
opts(new DepListOptions(o)),
current_merge_list_entry(merge_list.end()),
@@ -1052,7 +1052,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<DependenciesLabels
}
DepList::DepList(const Environment * const e, const DepListOptions & o) :
- PrivateImplementationPattern<DepList>(e, o)
+ Pimp<DepList>(e, o)
{
}
@@ -1076,7 +1076,7 @@ void
DepList::clear()
{
DepListOptions o(*options());
- _imp.reset(new Implementation<DepList>(_imp->env, o));
+ _imp.reset(new Imp<DepList>(_imp->env, o));
}
void
@@ -1754,5 +1754,5 @@ template class WrappedForwardIterator<DepList::ConstIteratorTag, const DepListEn
template WrappedForwardIterator<DepList::ConstIteratorTag, const DepListEntry>::WrappedForwardIterator(const DepList::Iterator &);
-template class PrivateImplementationPattern<DepList>;
+template class Pimp<DepList>;
diff --git a/paludis/dep_list.hh b/paludis/dep_list.hh
index 340bc82..c46dfa1 100644
--- a/paludis/dep_list.hh
+++ b/paludis/dep_list.hh
@@ -29,7 +29,7 @@
#include <paludis/name.hh>
#include <paludis/environment.hh>
#include <paludis/match_package.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/options.hh>
#include <paludis/version_spec.hh>
#include <functional>
@@ -147,7 +147,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE DepList :
- private PrivateImplementationPattern<DepList>
+ private Pimp<DepList>
{
protected:
class AddVisitor;
@@ -308,7 +308,7 @@ namespace paludis
const PackageDepSpec &, const std::shared_ptr<const DestinationsSet> & destinations);
};
- extern template class PrivateImplementationPattern<DepList>;
+ extern template class Pimp<DepList>;
extern template class WrappedForwardIterator<DepList::IteratorTag, DepListEntry>;
extern template class WrappedForwardIterator<DepList::ConstIteratorTag, const DepListEntry>;
extern template WrappedForwardIterator<DepList::ConstIteratorTag, const DepListEntry>::WrappedForwardIterator(const DepList::Iterator &);
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index 0160525..daa2362 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -25,7 +25,7 @@
#include <paludis/util/clone-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/join.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/sequence-impl.hh>
@@ -48,15 +48,15 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<DepSpec>
+ struct Imp<DepSpec>
{
std::shared_ptr<const MetadataSectionKey> annotations_key;
- Implementation()
+ Imp()
{
}
- Implementation(const std::shared_ptr<const MetadataSectionKey> & k) :
+ Imp(const std::shared_ptr<const MetadataSectionKey> & k) :
annotations_key(k)
{
}
@@ -64,8 +64,8 @@ namespace paludis
}
DepSpec::DepSpec() :
- PrivateImplementationPattern<DepSpec>(),
- _imp(PrivateImplementationPattern<DepSpec>::_imp)
+ Pimp<DepSpec>(),
+ _imp(Pimp<DepSpec>::_imp)
{
}
@@ -126,13 +126,13 @@ AllDepSpec::clone() const
namespace paludis
{
template <>
- struct Implementation<ConditionalDepSpec>
+ struct Imp<ConditionalDepSpec>
{
const std::shared_ptr<const ConditionalDepSpecData> data;
Mutex mutex;
bool added_keys;
- Implementation(const std::shared_ptr<const ConditionalDepSpecData> & d) :
+ Imp(const std::shared_ptr<const ConditionalDepSpecData> & d) :
data(d),
added_keys(false)
{
@@ -141,8 +141,8 @@ namespace paludis
}
ConditionalDepSpec::ConditionalDepSpec(const std::shared_ptr<const ConditionalDepSpecData> & d) :
- PrivateImplementationPattern<ConditionalDepSpec>(d),
- _imp(PrivateImplementationPattern<ConditionalDepSpec>::_imp)
+ Pimp<ConditionalDepSpec>(d),
+ _imp(Pimp<ConditionalDepSpec>::_imp)
{
}
@@ -159,9 +159,9 @@ namespace
ConditionalDepSpec::ConditionalDepSpec(const ConditionalDepSpec & other) :
Cloneable<DepSpec>(),
DepSpec(),
- PrivateImplementationPattern<ConditionalDepSpec>(other._imp->data),
+ Pimp<ConditionalDepSpec>(other._imp->data),
CloneUsingThis<DepSpec, ConditionalDepSpec>(other),
- _imp(PrivateImplementationPattern<ConditionalDepSpec>::_imp)
+ _imp(Pimp<ConditionalDepSpec>::_imp)
{
set_annotations_key(other.annotations_key());
}
@@ -524,7 +524,7 @@ FetchableURIDepSpec::clone() const
namespace paludis
{
template <typename T_>
- struct Implementation<LabelsDepSpec<T_ > >
+ struct Imp<LabelsDepSpec<T_ > >
{
std::list<std::shared_ptr<const T_> > items;
};
@@ -544,8 +544,8 @@ namespace paludis
template <typename T_>
LabelsDepSpec<T_>::LabelsDepSpec() :
- PrivateImplementationPattern<LabelsDepSpec<T_> >(),
- _imp(PrivateImplementationPattern<LabelsDepSpec<T_> >::_imp)
+ Pimp<LabelsDepSpec<T_> >(),
+ _imp(Pimp<LabelsDepSpec<T_> >::_imp)
{
}
@@ -599,12 +599,12 @@ PackageDepSpecData::~PackageDepSpecData()
namespace paludis
{
template <>
- struct Implementation<PackageDepSpec>
+ struct Imp<PackageDepSpec>
{
const std::shared_ptr<const PackageDepSpecData> data;
std::shared_ptr<const DepTag> tag;
- Implementation(const std::shared_ptr<const PackageDepSpecData> & d, const std::shared_ptr<const DepTag> & t) :
+ Imp(const std::shared_ptr<const PackageDepSpecData> & d, const std::shared_ptr<const DepTag> & t) :
data(d),
tag(t)
{
@@ -615,8 +615,8 @@ namespace paludis
PackageDepSpec::PackageDepSpec(const std::shared_ptr<const PackageDepSpecData> & d) :
Cloneable<DepSpec>(),
StringDepSpec(d->as_string()),
- PrivateImplementationPattern<PackageDepSpec>(d, std::shared_ptr<const DepTag>()),
- _imp(PrivateImplementationPattern<PackageDepSpec>::_imp)
+ Pimp<PackageDepSpec>(d, std::shared_ptr<const DepTag>()),
+ _imp(Pimp<PackageDepSpec>::_imp)
{
set_annotations_key(d->annotations_key());
}
@@ -628,9 +628,9 @@ PackageDepSpec::~PackageDepSpec()
PackageDepSpec::PackageDepSpec(const PackageDepSpec & d) :
Cloneable<DepSpec>(d),
StringDepSpec(d._imp->data->as_string()),
- PrivateImplementationPattern<PackageDepSpec>(d._imp->data, d._imp->tag),
+ Pimp<PackageDepSpec>(d._imp->data, d._imp->tag),
CloneUsingThis<DepSpec, PackageDepSpec>(d),
- _imp(PrivateImplementationPattern<PackageDepSpec>::_imp)
+ _imp(Pimp<PackageDepSpec>::_imp)
{
set_annotations_key(d.annotations_key());
}
@@ -1066,21 +1066,21 @@ namespace
namespace paludis
{
template <>
- struct Implementation<PartiallyMadePackageDepSpec>
+ struct Imp<PartiallyMadePackageDepSpec>
{
std::shared_ptr<PartiallyMadePackageDepSpecData> data;
- Implementation(const PartiallyMadePackageDepSpecOptions & o) :
+ Imp(const PartiallyMadePackageDepSpecOptions & o) :
data(new PartiallyMadePackageDepSpecData(o))
{
}
- Implementation(const Implementation & other) :
+ Imp(const Imp & other) :
data(new PartiallyMadePackageDepSpecData(*other.data))
{
}
- Implementation(const PackageDepSpec & other) :
+ Imp(const PackageDepSpec & other) :
data(new PartiallyMadePackageDepSpecData(*other.data()))
{
}
@@ -1088,17 +1088,17 @@ namespace paludis
}
PartiallyMadePackageDepSpec::PartiallyMadePackageDepSpec(const PartiallyMadePackageDepSpecOptions & o) :
- PrivateImplementationPattern<PartiallyMadePackageDepSpec>(o)
+ Pimp<PartiallyMadePackageDepSpec>(o)
{
}
PartiallyMadePackageDepSpec::PartiallyMadePackageDepSpec(const PartiallyMadePackageDepSpec & other) :
- PrivateImplementationPattern<PartiallyMadePackageDepSpec>(*other._imp.get())
+ Pimp<PartiallyMadePackageDepSpec>(*other._imp.get())
{
}
PartiallyMadePackageDepSpec::PartiallyMadePackageDepSpec(const PackageDepSpec & other) :
- PrivateImplementationPattern<PartiallyMadePackageDepSpec>(other)
+ Pimp<PartiallyMadePackageDepSpec>(other)
{
}
@@ -1226,13 +1226,13 @@ template class Sequence<std::shared_ptr<const AdditionalPackageDepSpecRequiremen
template class WrappedForwardIterator<AdditionalPackageDepSpecRequirements::ConstIteratorTag, const std::shared_ptr<const AdditionalPackageDepSpecRequirement> >;
template class Cloneable<DepSpec>;
-template class PrivateImplementationPattern<ConditionalDepSpec>;
+template class Pimp<ConditionalDepSpec>;
template class CloneUsingThis<DepSpec, ConditionalDepSpec>;
-template class PrivateImplementationPattern<PartiallyMadePackageDepSpec>;
-template class PrivateImplementationPattern<PackageDepSpec>;
+template class Pimp<PartiallyMadePackageDepSpec>;
+template class Pimp<PackageDepSpec>;
template class CloneUsingThis<DepSpec, PackageDepSpec>;
-template class PrivateImplementationPattern<URILabelsDepSpec>;
-template class PrivateImplementationPattern<DependenciesLabelsDepSpec>;
+template class Pimp<URILabelsDepSpec>;
+template class Pimp<DependenciesLabelsDepSpec>;
template class WrappedForwardIterator<DependenciesLabelsDepSpec::ConstIteratorTag,
const std::shared_ptr<const DependenciesLabel> >;
diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh
index 44b4ece..30bf6bd 100644
--- a/paludis/dep_spec.hh
+++ b/paludis/dep_spec.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/clone.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/named_value.hh>
@@ -63,12 +63,12 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE DepSpec :
- private PrivateImplementationPattern<DepSpec>,
+ private Pimp<DepSpec>,
public MetadataKeyHolder,
public virtual Cloneable<DepSpec>
{
private:
- PrivateImplementationPattern<DepSpec>::ImpPtr & _imp;
+ Pimp<DepSpec>::ImpPtr & _imp;
protected:
DepSpec();
@@ -158,13 +158,13 @@ namespace paludis
*/
class PALUDIS_VISIBLE ConditionalDepSpec :
public DepSpec,
- private PrivateImplementationPattern<ConditionalDepSpec>,
+ private Pimp<ConditionalDepSpec>,
public CloneUsingThis<DepSpec, ConditionalDepSpec>
{
friend std::ostream & operator<< (std::ostream &, const ConditionalDepSpec &);
private:
- PrivateImplementationPattern<ConditionalDepSpec>::ImpPtr & _imp;
+ Pimp<ConditionalDepSpec>::ImpPtr & _imp;
std::string _as_string() const;
@@ -351,7 +351,7 @@ namespace paludis
* \since 0.26
*/
class PALUDIS_VISIBLE PartiallyMadePackageDepSpec :
- private PrivateImplementationPattern<PartiallyMadePackageDepSpec>
+ private Pimp<PartiallyMadePackageDepSpec>
{
public:
///\name Basic operations
@@ -474,7 +474,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE PackageDepSpec :
public StringDepSpec,
- private PrivateImplementationPattern<PackageDepSpec>,
+ private Pimp<PackageDepSpec>,
public CloneUsingThis<DepSpec, PackageDepSpec>
{
friend std::ostream & operator<< (std::ostream &, const PackageDepSpec &);
@@ -483,7 +483,7 @@ namespace paludis
const PackageDepSpec & operator= (const PackageDepSpec &);
std::string _as_string() const;
- PrivateImplementationPattern<PackageDepSpec>::ImpPtr & _imp;
+ Pimp<PackageDepSpec>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
@@ -920,10 +920,10 @@ namespace paludis
template <typename Labels_>
class PALUDIS_VISIBLE LabelsDepSpec :
public DepSpec,
- private PrivateImplementationPattern<LabelsDepSpec<Labels_> >
+ private Pimp<LabelsDepSpec<Labels_> >
{
private:
- typename PrivateImplementationPattern<LabelsDepSpec>::ImpPtr & _imp;
+ typename Pimp<LabelsDepSpec>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
@@ -975,14 +975,14 @@ namespace paludis
};
extern template class Cloneable<DepSpec>;
- extern template class PrivateImplementationPattern<ConditionalDepSpec>;
+ extern template class Pimp<ConditionalDepSpec>;
extern template class CloneUsingThis<DepSpec, ConditionalDepSpec>;
- extern template class PrivateImplementationPattern<PartiallyMadePackageDepSpec>;
- extern template class PrivateImplementationPattern<PackageDepSpec>;
+ extern template class Pimp<PartiallyMadePackageDepSpec>;
+ extern template class Pimp<PackageDepSpec>;
extern template class CloneUsingThis<DepSpec, PackageDepSpec>;
- extern template class PrivateImplementationPattern<DependenciesLabelsDepSpec>;
- extern template class PrivateImplementationPattern<URILabelsDepSpec>;
- extern template class PrivateImplementationPattern<PlainTextLabelDepSpec>;
+ extern template class Pimp<DependenciesLabelsDepSpec>;
+ extern template class Pimp<URILabelsDepSpec>;
+ extern template class Pimp<PlainTextLabelDepSpec>;
extern template class WrappedForwardIterator<DependenciesLabelsDepSpec::ConstIteratorTag,
const std::shared_ptr<const DependenciesLabel> >;
diff --git a/paludis/dep_spec_flattener.cc b/paludis/dep_spec_flattener.cc
index 60917a1..603b014 100644
--- a/paludis/dep_spec_flattener.cc
+++ b/paludis/dep_spec_flattener.cc
@@ -20,7 +20,7 @@
#include <paludis/dep_spec_flattener.hh>
#include <paludis/dep_spec.hh>
#include <paludis/environment.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -35,14 +35,14 @@ using namespace paludis;
namespace paludis
{
template <typename Heirarchy_, typename Item_>
- struct Implementation<DepSpecFlattener<Heirarchy_, Item_> >
+ struct Imp<DepSpecFlattener<Heirarchy_, Item_> >
{
const Environment * const env;
std::list<std::shared_ptr<const Item_> > specs;
std::set<SetName> recursing_sets;
- Implementation(const Environment * const e) :
+ Imp(const Environment * const e) :
env(e)
{
}
@@ -76,8 +76,8 @@ namespace paludis
template <typename Heirarchy_, typename Item_>
DepSpecFlattener<Heirarchy_, Item_>::DepSpecFlattener(
const Environment * const env) :
- PrivateImplementationPattern<DepSpecFlattener<Heirarchy_, Item_> >(env),
- _imp(PrivateImplementationPattern<DepSpecFlattener<Heirarchy_, Item_> >::_imp)
+ Pimp<DepSpecFlattener<Heirarchy_, Item_> >(env),
+ _imp(Pimp<DepSpecFlattener<Heirarchy_, Item_> >::_imp)
{
}
diff --git a/paludis/dep_spec_flattener.hh b/paludis/dep_spec_flattener.hh
index 1c13d43..a394373 100644
--- a/paludis/dep_spec_flattener.hh
+++ b/paludis/dep_spec_flattener.hh
@@ -25,7 +25,7 @@
#include <paludis/dep_spec-fwd.hh>
#include <paludis/spec_tree.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/no_type.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <memory>
@@ -62,10 +62,10 @@ namespace paludis
*/
template <typename Heirarchy_, typename Item_>
class PALUDIS_VISIBLE DepSpecFlattener :
- private PrivateImplementationPattern<DepSpecFlattener<Heirarchy_, Item_> >
+ private Pimp<DepSpecFlattener<Heirarchy_, Item_> >
{
private:
- typename PrivateImplementationPattern<DepSpecFlattener<Heirarchy_, Item_> >::ImpPtr & _imp;
+ typename Pimp<DepSpecFlattener<Heirarchy_, Item_> >::ImpPtr & _imp;
public:
///\name Visit operations
diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc
index c0934a5..af3f7d5 100644
--- a/paludis/dep_tag.cc
+++ b/paludis/dep_tag.cc
@@ -21,7 +21,7 @@
#include <paludis/dep_spec.hh>
#include <paludis/dep_label.hh>
#include <paludis/spec_tree.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/set-impl.hh>
#include <paludis/util/mutex.hh>
@@ -38,8 +38,8 @@ template class Set<DepTagEntry, DepTagEntryComparator>;
template class WrappedForwardIterator<Set<DepTagEntry, DepTagEntryComparator>::ConstIteratorTag, const DepTagEntry>;
template class WrappedOutputIterator<Set<DepTagEntry, DepTagEntryComparator>::InserterTag, DepTagEntry>;
-template class PrivateImplementationPattern<GeneralSetDepTag>;
-template class PrivateImplementationPattern<DependencyDepTag>;
+template class Pimp<GeneralSetDepTag>;
+template class Pimp<DependencyDepTag>;
namespace
{
@@ -223,12 +223,12 @@ GLSADepTag::glsa_title() const
namespace paludis
{
template <>
- struct Implementation<GeneralSetDepTag>
+ struct Imp<GeneralSetDepTag>
{
const SetName id;
const std::string source;
- Implementation(const SetName & n, const std::string s) :
+ Imp(const SetName & n, const std::string s) :
id(n),
source(s)
{
@@ -237,7 +237,7 @@ namespace paludis
}
GeneralSetDepTag::GeneralSetDepTag(const SetName & id, const std::string & r) :
- PrivateImplementationPattern<GeneralSetDepTag>(id, r)
+ Pimp<GeneralSetDepTag>(id, r)
{
}
@@ -266,7 +266,7 @@ GeneralSetDepTag::source() const
namespace paludis
{
template <>
- struct Implementation<DependencyDepTag>
+ struct Imp<DependencyDepTag>
{
mutable Mutex mutex;
mutable std::string str;
@@ -274,7 +274,7 @@ namespace paludis
std::shared_ptr<const PackageID> id;
const std::shared_ptr<PackageDepSpec> spec;
- Implementation(const std::shared_ptr<const PackageID> & i, const PackageDepSpec & d) :
+ Imp(const std::shared_ptr<const PackageID> & i, const PackageDepSpec & d) :
id(i),
spec(std::static_pointer_cast<PackageDepSpec>(d.clone()))
{
@@ -284,7 +284,7 @@ namespace paludis
}
DependencyDepTag::DependencyDepTag(const std::shared_ptr<const PackageID> & i, const PackageDepSpec & d) :
- PrivateImplementationPattern<DependencyDepTag>(i, d)
+ Pimp<DependencyDepTag>(i, d)
{
}
diff --git a/paludis/dep_tag.hh b/paludis/dep_tag.hh
index 9adc717..07a422e 100644
--- a/paludis/dep_tag.hh
+++ b/paludis/dep_tag.hh
@@ -242,7 +242,7 @@ namespace paludis
class PALUDIS_VISIBLE GeneralSetDepTag :
public DepTag,
public ImplementAcceptMethods<DepTag, GeneralSetDepTag>,
- private PrivateImplementationPattern<GeneralSetDepTag>
+ private Pimp<GeneralSetDepTag>
{
public:
///\name Basic operations
@@ -272,7 +272,7 @@ namespace paludis
class PALUDIS_VISIBLE DependencyDepTag :
public DepTag,
public ImplementAcceptMethods<DepTag, DependencyDepTag>,
- private PrivateImplementationPattern<DependencyDepTag>
+ private Pimp<DependencyDepTag>
{
private:
void _make_str() const;
@@ -354,8 +354,8 @@ namespace paludis
};
extern template class Singleton<DepTagCategoryFactory>;
- extern template class PrivateImplementationPattern<DependencyDepTag>;
- extern template class PrivateImplementationPattern<GeneralSetDepTag>;
+ extern template class Pimp<DependencyDepTag>;
+ extern template class Pimp<GeneralSetDepTag>;
}
diff --git a/paludis/distribution-impl.hh b/paludis/distribution-impl.hh
index 1172f8b..c74704e 100644
--- a/paludis/distribution-impl.hh
+++ b/paludis/distribution-impl.hh
@@ -25,13 +25,13 @@
#include <paludis/util/hashes.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/options.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <unordered_map>
namespace paludis
{
template <typename Data_>
- struct Implementation<ExtraDistributionData<Data_> >
+ struct Imp<ExtraDistributionData<Data_> >
{
mutable Mutex mutex;
mutable std::unordered_map<std::string, std::shared_ptr<const Data_>, Hash<std::string> > values;
@@ -39,7 +39,7 @@ namespace paludis
template <typename Data_>
ExtraDistributionData<Data_>::ExtraDistributionData() :
- PrivateImplementationPattern<ExtraDistributionData<Data_> >()
+ Pimp<ExtraDistributionData<Data_> >()
{
}
diff --git a/paludis/distribution.cc b/paludis/distribution.cc
index 68d7ff0..f8cf331 100644
--- a/paludis/distribution.cc
+++ b/paludis/distribution.cc
@@ -24,7 +24,7 @@
#include <paludis/util/hashes.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/strip.hh>
@@ -45,11 +45,11 @@ typedef std::unordered_map<std::string, std::shared_ptr<const Distribution>, Has
namespace paludis
{
template <>
- struct Implementation<DistributionData>
+ struct Imp<DistributionData>
{
DistributionHash values;
- Implementation()
+ Imp()
{
Context c("When loading distribution data:");
@@ -81,7 +81,7 @@ namespace paludis
}
DistributionData::DistributionData() :
- PrivateImplementationPattern<DistributionData>()
+ Pimp<DistributionData>()
{
}
diff --git a/paludis/distribution.hh b/paludis/distribution.hh
index 3d04843..295b962 100644
--- a/paludis/distribution.hh
+++ b/paludis/distribution.hh
@@ -23,7 +23,7 @@
#include <paludis/distribution-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/exception.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/singleton.hh>
@@ -113,7 +113,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE DistributionData :
- private PrivateImplementationPattern<DistributionData>,
+ private Pimp<DistributionData>,
public Singleton<DistributionData>
{
friend class Singleton<DistributionData>;
@@ -140,7 +140,7 @@ namespace paludis
*/
template <typename Data_>
class PALUDIS_VISIBLE ExtraDistributionData :
- private PrivateImplementationPattern<ExtraDistributionData<Data_> >,
+ private Pimp<ExtraDistributionData<Data_> >,
public Singleton<ExtraDistributionData<Data_> >
{
friend class Singleton<ExtraDistributionData<Data_> >;
diff --git a/paludis/elf_linkage_checker.cc b/paludis/elf_linkage_checker.cc
index 19dc364..ed73418 100644
--- a/paludis/elf_linkage_checker.cc
+++ b/paludis/elf_linkage_checker.cc
@@ -30,7 +30,7 @@
#include <paludis/util/join.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/set.hh>
#include <paludis/util/member_iterator-impl.hh>
#include <paludis/util/simple_visitor_cast.hh>
@@ -108,7 +108,7 @@ typedef std::map<ElfArchitecture, std::map<std::string, std::vector<FSEntry> > >
namespace paludis
{
template <>
- struct Implementation<ElfLinkageChecker>
+ struct Imp<ElfLinkageChecker>
{
FSEntry root;
std::string library;
@@ -127,7 +127,7 @@ namespace paludis
void handle_library(const FSEntry &, const ElfArchitecture &);
template <typename> bool check_extra_elf(const FSEntry &, std::istream &, std::set<ElfArchitecture> &);
- Implementation(const FSEntry & the_root, const std::string & the_library) :
+ Imp(const FSEntry & the_root, const std::string & the_library) :
root(the_root),
library(the_library)
{
@@ -136,7 +136,7 @@ namespace paludis
}
ElfLinkageChecker::ElfLinkageChecker(const FSEntry & root, const std::string & library) :
- PrivateImplementationPattern<ElfLinkageChecker>(root, library)
+ Pimp<ElfLinkageChecker>(root, library)
{
}
@@ -159,7 +159,7 @@ ElfLinkageChecker::check_file(const FSEntry & file)
template <typename ElfType_>
bool
-Implementation<ElfLinkageChecker>::check_elf(const FSEntry & file, std::istream & stream)
+Imp<ElfLinkageChecker>::check_elf(const FSEntry & file, std::istream & stream)
{
if (! ElfObject<ElfType_>::is_valid_elf(stream))
return false;
@@ -218,7 +218,7 @@ Implementation<ElfLinkageChecker>::check_elf(const FSEntry & file, std::istream
}
void
-Implementation<ElfLinkageChecker>::handle_library(const FSEntry & file, const ElfArchitecture & arch)
+Imp<ElfLinkageChecker>::handle_library(const FSEntry & file, const ElfArchitecture & arch)
{
seen.insert(std::make_pair(file, arch));
std::pair<Symlinks::const_iterator, Symlinks::const_iterator> range(symlinks.equal_range(file));
@@ -337,7 +337,7 @@ ElfLinkageChecker::need_breakage_added(
template <typename ElfType_>
bool
-Implementation<ElfLinkageChecker>::check_extra_elf(const FSEntry & file, std::istream & stream, std::set<ElfArchitecture> & arches)
+Imp<ElfLinkageChecker>::check_extra_elf(const FSEntry & file, std::istream & stream, std::set<ElfArchitecture> & arches)
{
if (! ElfObject<ElfType_>::is_valid_elf(stream))
return false;
diff --git a/paludis/elf_linkage_checker.hh b/paludis/elf_linkage_checker.hh
index 1dc22d7..ec4493a 100644
--- a/paludis/elf_linkage_checker.hh
+++ b/paludis/elf_linkage_checker.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_ELF_LINKAGE_CHECKER_HH
#include <paludis/linkage_checker.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <functional>
#include <iosfwd>
@@ -29,7 +29,7 @@ namespace paludis
{
class ElfLinkageChecker :
public LinkageChecker,
- private paludis::PrivateImplementationPattern<ElfLinkageChecker>
+ private paludis::Pimp<ElfLinkageChecker>
{
public:
ElfLinkageChecker(const paludis::FSEntry &, const std::string &);
diff --git a/paludis/elike_annotations.cc b/paludis/elike_annotations.cc
index 0d4f9ca..54e984f 100644
--- a/paludis/elike_annotations.cc
+++ b/paludis/elike_annotations.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/elike_annotations.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/map.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/literal_metadata_key.hh>
@@ -28,13 +28,13 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<ELikeAnnotations>
+ struct Imp<ELikeAnnotations>
{
};
}
ELikeAnnotations::ELikeAnnotations(const std::shared_ptr<const Map<std::string, std::string> > & m) :
- PrivateImplementationPattern<ELikeAnnotations>()
+ Pimp<ELikeAnnotations>()
{
for (Map<std::string, std::string>::ConstIterator k(m->begin()), k_end(m->end()) ;
k != k_end ; ++k)
@@ -70,5 +70,5 @@ ELikeAnnotations::type() const
return mkt_normal;
}
-template class PrivateImplementationPattern<ELikeAnnotations>;
+template class Pimp<ELikeAnnotations>;
diff --git a/paludis/elike_annotations.hh b/paludis/elike_annotations.hh
index 2636ae6..781cc92 100644
--- a/paludis/elike_annotations.hh
+++ b/paludis/elike_annotations.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_ELIKE_ANNOTATIONS_HH 1
#include <paludis/elike_annotations-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/map-fwd.hh>
#include <paludis/metadata_key.hh>
#include <memory>
@@ -29,7 +29,7 @@
namespace paludis
{
class PALUDIS_VISIBLE ELikeAnnotations :
- private PrivateImplementationPattern<ELikeAnnotations>,
+ private Pimp<ELikeAnnotations>,
public MetadataSectionKey
{
public:
@@ -42,7 +42,7 @@ namespace paludis
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template class PrivateImplementationPattern<ELikeAnnotations>;
+ extern template class Pimp<ELikeAnnotations>;
}
#endif
diff --git a/paludis/environment.hh b/paludis/environment.hh
index 424a1aa..b479cd5 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -26,7 +26,7 @@
#include <paludis/util/tribool-fwd.hh>
#include <paludis/util/simple_visitor.hh>
#include <paludis/output_manager-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/name-fwd.hh>
#include <paludis/hook-fwd.hh>
#include <paludis/repository-fwd.hh>
@@ -509,8 +509,8 @@ namespace paludis
///\}
};
- extern template class PrivateImplementationPattern<CreateOutputManagerForRepositorySyncInfo>;
- extern template class PrivateImplementationPattern<CreateOutputManagerForPackageIDActionInfo>;
+ extern template class Pimp<CreateOutputManagerForRepositorySyncInfo>;
+ extern template class Pimp<CreateOutputManagerForPackageIDActionInfo>;
}
diff --git a/paludis/environment_factory.cc b/paludis/environment_factory.cc
index ac1c316..0e4c4c2 100644
--- a/paludis/environment_factory.cc
+++ b/paludis/environment_factory.cc
@@ -19,7 +19,7 @@
#include <paludis/environment_factory.hh>
#include <paludis/util/singleton-impl.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/system.hh>
#include <paludis/util/member_iterator-impl.hh>
#include <paludis/util/join.hh>
@@ -41,7 +41,7 @@ typedef std::unordered_map<std::string, EnvironmentFactory::CreateFunction> Keys
namespace paludis
{
template <>
- struct Implementation<EnvironmentFactory>
+ struct Imp<EnvironmentFactory>
{
Keys keys;
};
@@ -70,7 +70,7 @@ namespace
}
EnvironmentFactory::EnvironmentFactory() :
- PrivateImplementationPattern<EnvironmentFactory>()
+ Pimp<EnvironmentFactory>()
{
using namespace environment_groups;
@@ -145,5 +145,5 @@ EnvironmentFactory::add_environment_format(
}
template class Singleton<EnvironmentFactory>;
-template class PrivateImplementationPattern<EnvironmentFactory>;
+template class Pimp<EnvironmentFactory>;
diff --git a/paludis/environment_factory.hh b/paludis/environment_factory.hh
index 3a8bacb..72e6574 100644
--- a/paludis/environment_factory.hh
+++ b/paludis/environment_factory.hh
@@ -22,7 +22,7 @@
#include <paludis/environment_factory-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/set-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/util/no_type.hh>
@@ -44,7 +44,7 @@ namespace paludis
* \since 0.30
*/
class PALUDIS_VISIBLE EnvironmentFactory :
- private PrivateImplementationPattern<EnvironmentFactory>,
+ private Pimp<EnvironmentFactory>,
public Singleton<EnvironmentFactory>
{
friend class Singleton<EnvironmentFactory>;
@@ -90,7 +90,7 @@ namespace paludis
template <typename EnvironmentClass_>
void register_environment(const EnvironmentClass_ * const, EnvironmentFactory * const);
- extern template class PrivateImplementationPattern<EnvironmentFactory>;
+ extern template class Pimp<EnvironmentFactory>;
extern template class Singleton<EnvironmentFactory>;
}
diff --git a/paludis/environment_implementation.cc b/paludis/environment_implementation.cc
index bb89726..29f2fb4 100644
--- a/paludis/environment_implementation.cc
+++ b/paludis/environment_implementation.cc
@@ -30,7 +30,7 @@
#include <paludis/util/member_iterator-impl.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/hook.hh>
#include <paludis/distribution.hh>
@@ -106,7 +106,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<EnvironmentImplementation>
+ struct Imp<EnvironmentImplementation>
{
std::map<unsigned, NotifierCallbackFunction> notifier_callbacks;
std::list<std::shared_ptr<const SelectionCache> > selection_caches;
@@ -116,7 +116,7 @@ namespace paludis
std::shared_ptr<SetNameSet> set_names;
SetsStore sets;
- Implementation() :
+ Imp() :
loaded_sets(false)
{
}
@@ -124,8 +124,8 @@ namespace paludis
}
EnvironmentImplementation::EnvironmentImplementation() :
- PrivateImplementationPattern<EnvironmentImplementation>(),
- _imp(PrivateImplementationPattern<EnvironmentImplementation>::_imp)
+ Pimp<EnvironmentImplementation>(),
+ _imp(Pimp<EnvironmentImplementation>::_imp)
{
}
diff --git a/paludis/environment_implementation.hh b/paludis/environment_implementation.hh
index b6df7d4..e2d9c80 100644
--- a/paludis/environment_implementation.hh
+++ b/paludis/environment_implementation.hh
@@ -47,11 +47,11 @@ namespace paludis
* \see Environment
*/
class PALUDIS_VISIBLE EnvironmentImplementation :
- private PrivateImplementationPattern<EnvironmentImplementation>,
+ private Pimp<EnvironmentImplementation>,
public Environment
{
private:
- PrivateImplementationPattern<EnvironmentImplementation>::ImpPtr & _imp;
+ Pimp<EnvironmentImplementation>::ImpPtr & _imp;
void _need_sets() const;
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index bece5fa..276ac6c 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -26,7 +26,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/create_iterator-impl.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/wrapped_output_iterator-impl.hh>
#include <paludis/util/tribool.hh>
@@ -58,7 +58,7 @@ using namespace paludis::no_config_environment;
namespace paludis
{
template<>
- struct Implementation<NoConfigEnvironment>
+ struct Imp<NoConfigEnvironment>
{
const no_config_environment::Params params;
@@ -78,7 +78,7 @@ namespace paludis
std::shared_ptr<LiteralMetadataValueKey<std::string> > format_key;
std::shared_ptr<LiteralMetadataValueKey<FSEntry> > repository_dir_key;
- Implementation(NoConfigEnvironment * const env, const no_config_environment::Params & params);
+ Imp(NoConfigEnvironment * const env, const no_config_environment::Params & params);
void initialise(NoConfigEnvironment * const env);
};
@@ -153,7 +153,7 @@ namespace
}
}
-Implementation<NoConfigEnvironment>::Implementation(
+Imp<NoConfigEnvironment>::Imp(
NoConfigEnvironment * const env, const no_config_environment::Params & p) :
params(p),
top_level_dir(p.repository_dir()),
@@ -169,7 +169,7 @@ Implementation<NoConfigEnvironment>::Implementation(
}
void
-Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
+Imp<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
{
Context context("When initialising NoConfigEnvironment at '" + stringify(params.repository_dir()) + "':");
@@ -349,8 +349,8 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
}
NoConfigEnvironment::NoConfigEnvironment(const no_config_environment::Params & params) :
- PrivateImplementationPattern<NoConfigEnvironment>(this, params),
- _imp(PrivateImplementationPattern<NoConfigEnvironment>::_imp)
+ Pimp<NoConfigEnvironment>(this, params),
+ _imp(Pimp<NoConfigEnvironment>::_imp)
{
_imp->initialise(this);
diff --git a/paludis/environments/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh
index 9024991..9eaf5a0 100644
--- a/paludis/environments/no_config/no_config_environment.hh
+++ b/paludis/environments/no_config/no_config_environment.hh
@@ -22,7 +22,7 @@
#include <paludis/environment_implementation.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/map-fwd.hh>
namespace paludis
@@ -84,10 +84,10 @@ namespace paludis
*/
class PALUDIS_VISIBLE NoConfigEnvironment :
public EnvironmentImplementation,
- private PrivateImplementationPattern<NoConfigEnvironment>
+ private Pimp<NoConfigEnvironment>
{
private:
- PrivateImplementationPattern<NoConfigEnvironment>::ImpPtr & _imp;
+ Pimp<NoConfigEnvironment>::ImpPtr & _imp;
virtual void need_keys_added() const;
diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index 935322e..ac750f8 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -30,7 +30,7 @@
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environments/paludis/bashable_conf.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -57,7 +57,7 @@ typedef std::unordered_map<SetName, SetNameEntry, Hash<SetName> > NamedSetMap;
namespace paludis
{
template<>
- struct Implementation<KeywordsConf>
+ struct Imp<KeywordsConf>
{
const PaludisEnvironment * const env;
@@ -66,7 +66,7 @@ namespace paludis
mutable NamedSetMap set;
mutable Mutex set_mutex;
- Implementation(const PaludisEnvironment * const e) :
+ Imp(const PaludisEnvironment * const e) :
env(e)
{
}
@@ -74,7 +74,7 @@ namespace paludis
}
KeywordsConf::KeywordsConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<KeywordsConf>(e)
+ Pimp<KeywordsConf>(e)
{
}
diff --git a/paludis/environments/paludis/keywords_conf.hh b/paludis/environments/paludis/keywords_conf.hh
index 3f94ae4..4ac8e96 100644
--- a/paludis/environments/paludis/keywords_conf.hh
+++ b/paludis/environments/paludis/keywords_conf.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_KEYWORDS_CONF_HH
#define PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_KEYWORDS_CONF_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
* \nosubgrouping
*/
class KeywordsConf :
- private PrivateImplementationPattern<KeywordsConf>
+ private Pimp<KeywordsConf>
{
public:
///\name Basic operations
diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc
index 2c4fa4a..5230cbe 100644
--- a/paludis/environments/paludis/licenses_conf.cc
+++ b/paludis/environments/paludis/licenses_conf.cc
@@ -31,7 +31,7 @@
#include <paludis/environments/paludis/bashable_conf.hh>
#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/mutex.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/iterator_funcs.hh>
@@ -56,7 +56,7 @@ typedef std::unordered_map<SetName, SetNameEntry, Hash<SetName> > NamedSetMap;
namespace paludis
{
template<>
- struct Implementation<LicensesConf>
+ struct Imp<LicensesConf>
{
const PaludisEnvironment * const env;
@@ -65,7 +65,7 @@ namespace paludis
mutable NamedSetMap set;
mutable Mutex set_mutex;
- Implementation(const PaludisEnvironment * const e) :
+ Imp(const PaludisEnvironment * const e) :
env(e)
{
}
@@ -73,7 +73,7 @@ namespace paludis
}
LicensesConf::LicensesConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<LicensesConf>(e)
+ Pimp<LicensesConf>(e)
{
}
diff --git a/paludis/environments/paludis/licenses_conf.hh b/paludis/environments/paludis/licenses_conf.hh
index 126462d..7935cc7 100644
--- a/paludis/environments/paludis/licenses_conf.hh
+++ b/paludis/environments/paludis/licenses_conf.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_PALUDIS_ENVIRONMENTS_PALUDIS_LICENSES_CONF_HH
#define PALUDIS_GUARD_PALUDIS_PALUDIS_ENVIRONMENTS_PALUDIS_LICENSES_CONF_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
* \nosubgrouping
*/
class LicensesConf :
- private PrivateImplementationPattern<LicensesConf>
+ private Pimp<LicensesConf>
{
public:
///\name Basic operations
diff --git a/paludis/environments/paludis/mirrors_conf.cc b/paludis/environments/paludis/mirrors_conf.cc
index 32f2985..928cbab 100644
--- a/paludis/environments/paludis/mirrors_conf.cc
+++ b/paludis/environments/paludis/mirrors_conf.cc
@@ -23,7 +23,7 @@
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environments/paludis/bashable_conf.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/iterator_funcs.hh>
@@ -43,12 +43,12 @@ typedef std::unordered_multimap<std::string, std::string, Hash<std::string> > Mi
namespace paludis
{
template<>
- struct Implementation<MirrorsConf>
+ struct Imp<MirrorsConf>
{
const PaludisEnvironment * const env;
Mirrors mirrors;
- Implementation(const PaludisEnvironment * const e) :
+ Imp(const PaludisEnvironment * const e) :
env(e)
{
}
@@ -56,7 +56,7 @@ namespace paludis
}
MirrorsConf::MirrorsConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<MirrorsConf>(e)
+ Pimp<MirrorsConf>(e)
{
}
diff --git a/paludis/environments/paludis/mirrors_conf.hh b/paludis/environments/paludis/mirrors_conf.hh
index 3c40989..ae9f5a6 100644
--- a/paludis/environments/paludis/mirrors_conf.hh
+++ b/paludis/environments/paludis/mirrors_conf.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_MIRRORS_CONF_HH
#define PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_MIRRORS_CONF_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/config_file.hh>
#include <paludis/environment.hh>
#include <paludis/name.hh>
@@ -38,7 +38,7 @@ namespace paludis
* \nosubgrouping
*/
class MirrorsConf :
- private PrivateImplementationPattern<MirrorsConf>
+ private Pimp<MirrorsConf>
{
public:
///\name Basic operations
diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc
index 22ece88..42b6b6f 100644
--- a/paludis/environments/paludis/output_conf.cc
+++ b/paludis/environments/paludis/output_conf.cc
@@ -23,7 +23,7 @@
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environments/paludis/extra_distribution_data.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/make_named_values.hh>
@@ -97,14 +97,14 @@ namespace
namespace paludis
{
template<>
- struct Implementation<OutputConf>
+ struct Imp<OutputConf>
{
const PaludisEnvironment * const env;
RuleList rules;
Managers managers;
std::map<std::string, std::string> misc_vars;
- Implementation(const PaludisEnvironment * const e) :
+ Imp(const PaludisEnvironment * const e) :
env(e)
{
}
@@ -112,7 +112,7 @@ namespace paludis
}
OutputConf::OutputConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<OutputConf>(e)
+ Pimp<OutputConf>(e)
{
}
@@ -475,5 +475,5 @@ OutputConf::create_named_output_manager(const std::string & s, const CreateOutpu
);
}
-template class PrivateImplementationPattern<paludis_environment::OutputConf>;
+template class Pimp<paludis_environment::OutputConf>;
diff --git a/paludis/environments/paludis/output_conf.hh b/paludis/environments/paludis/output_conf.hh
index 976fd3d..9abd315 100644
--- a/paludis/environments/paludis/output_conf.hh
+++ b/paludis/environments/paludis/output_conf.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_OUTPUT_CONF_HH
#define PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_OUTPUT_CONF_HH 1
-#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/create_output_manager_info-fwd.hh>
@@ -33,7 +33,7 @@ namespace paludis
namespace paludis_environment
{
class OutputConf :
- private PrivateImplementationPattern<OutputConf>
+ private Pimp<OutputConf>
{
public:
///\name Basic operations
@@ -60,7 +60,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<paludis_environment::OutputConf>;
+ extern template class Pimp<paludis_environment::OutputConf>;
}
#endif
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index 39a20f7..a36ceb3 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -32,7 +32,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/options.hh>
#include <paludis/util/tokeniser.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/mutex.hh>
#include <paludis/util/hashes.hh>
@@ -49,14 +49,14 @@ typedef std::list<std::pair<SetName, std::shared_ptr<const SetSpecTree> > > Sets
namespace paludis
{
template<>
- struct Implementation<PackageMaskConf>
+ struct Imp<PackageMaskConf>
{
const PaludisEnvironment * const env;
std::list<std::shared_ptr<const PackageDepSpec> > masks;
mutable Sets sets;
mutable Mutex set_mutex;
- Implementation(const PaludisEnvironment * const e) :
+ Imp(const PaludisEnvironment * const e) :
env(e)
{
}
@@ -64,7 +64,7 @@ namespace paludis
}
PackageMaskConf::PackageMaskConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<PackageMaskConf>(e)
+ Pimp<PackageMaskConf>(e)
{
}
diff --git a/paludis/environments/paludis/package_mask_conf.hh b/paludis/environments/paludis/package_mask_conf.hh
index f6e7e1c..01409ef 100644
--- a/paludis/environments/paludis/package_mask_conf.hh
+++ b/paludis/environments/paludis/package_mask_conf.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_PACKAGE_MASK_CONF_HH
#define PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_PACKAGE_MASK_CONF_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>
@@ -39,7 +39,7 @@ namespace paludis
* \nosubgrouping
*/
class PackageMaskConf :
- private PrivateImplementationPattern<PackageMaskConf>
+ private Pimp<PackageMaskConf>
{
public:
///\name Basic operations
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 9a3f60f..3f8f63b 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -40,7 +40,7 @@
#include <paludis/util/map.hh>
#include <paludis/util/system.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -67,7 +67,7 @@
#include "config.h"
/** \file
- * Implementation of paludis_config.hh classes.
+ * Imp of paludis_config.hh classes.
*
* \ingroup grppaludisconfig
*/
@@ -156,12 +156,12 @@ namespace
namespace paludis
{
/**
- * Implementation data for PaludisConfig.
+ * Imp data for PaludisConfig.
*
* \ingroup grppaludisconfig
*/
template<>
- struct Implementation<PaludisConfig>
+ struct Imp<PaludisConfig>
{
PaludisEnvironment * const env;
@@ -197,12 +197,12 @@ namespace paludis
std::shared_ptr<Map<std::string, std::string> > commandline_environment;
- Implementation(PaludisEnvironment * const);
+ Imp(PaludisEnvironment * const);
void need_general_conf() const;
};
- Implementation<PaludisConfig>::Implementation(PaludisEnvironment * e) :
+ Imp<PaludisConfig>::Imp(PaludisEnvironment * e) :
env(e),
paludis_command("paludis"),
config_dir("(unset)"),
@@ -222,7 +222,7 @@ namespace paludis
}
void
- Implementation<PaludisConfig>::need_general_conf() const
+ Imp<PaludisConfig>::need_general_conf() const
{
Lock lock(general_conf_mutex);
@@ -383,7 +383,7 @@ PaludisConfigNoDirectoryError::PaludisConfigNoDirectoryError(const std::string &
}
PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & suffix) :
- PrivateImplementationPattern<PaludisConfig>(e)
+ Pimp<PaludisConfig>(e)
{
using namespace std::placeholders;
diff --git a/paludis/environments/paludis/paludis_config.hh b/paludis/environments/paludis/paludis_config.hh
index 0ea4bb0..468948c 100644
--- a/paludis/environments/paludis/paludis_config.hh
+++ b/paludis/environments/paludis/paludis_config.hh
@@ -97,7 +97,7 @@ namespace paludis
* \nosubgrouping
*/
class PaludisConfig :
- private PrivateImplementationPattern<PaludisConfig>
+ private Pimp<PaludisConfig>
{
public:
///\name Basic operations
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 2895303..db2d293 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -43,7 +43,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/system.hh>
#include <paludis/util/dir_iterator.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/save.hh>
#include <paludis/util/strip.hh>
@@ -68,7 +68,7 @@ using namespace paludis::paludis_environment;
namespace paludis
{
template<>
- struct Implementation<PaludisEnvironment>
+ struct Imp<PaludisEnvironment>
{
mutable Mutex hook_mutex;
mutable bool done_hooks;
@@ -87,7 +87,7 @@ namespace paludis
std::shared_ptr<LiteralMetadataValueKey<FSEntry> > config_location_key;
std::shared_ptr<LiteralMetadataValueKey<FSEntry> > world_file_key;
- Implementation(PaludisEnvironment * const e, std::shared_ptr<PaludisConfig> c) :
+ Imp(PaludisEnvironment * const e, std::shared_ptr<PaludisConfig> c) :
done_hooks(false),
config(c),
paludis_command("paludis"),
@@ -141,8 +141,8 @@ namespace paludis
}
PaludisEnvironment::PaludisEnvironment(const std::string & s) :
- PrivateImplementationPattern<PaludisEnvironment>(this, std::shared_ptr<PaludisConfig>(new PaludisConfig(this, s))),
- _imp(PrivateImplementationPattern<PaludisEnvironment>::_imp)
+ Pimp<PaludisEnvironment>(this, std::shared_ptr<PaludisConfig>(new PaludisConfig(this, s))),
+ _imp(Pimp<PaludisEnvironment>::_imp)
{
Context context("When loading paludis environment:");
diff --git a/paludis/environments/paludis/paludis_environment.hh b/paludis/environments/paludis/paludis_environment.hh
index ce3f8e7..bc10935 100644
--- a/paludis/environments/paludis/paludis_environment.hh
+++ b/paludis/environments/paludis/paludis_environment.hh
@@ -46,11 +46,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE PaludisEnvironment :
public EnvironmentImplementation,
- private PrivateImplementationPattern<PaludisEnvironment>
+ private Pimp<PaludisEnvironment>
{
private:
- PrivateImplementationPattern<PaludisEnvironment>::ImpPtr & _imp;
+ Pimp<PaludisEnvironment>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/environments/paludis/use_conf.cc b/paludis/environments/paludis/use_conf.cc
index 10fe3fc..120e188 100644
--- a/paludis/environments/paludis/use_conf.cc
+++ b/paludis/environments/paludis/use_conf.cc
@@ -20,7 +20,7 @@
#include <paludis/environments/paludis/use_conf.hh>
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environments/paludis/bashable_conf.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/tribool.hh>
@@ -33,12 +33,12 @@ using namespace paludis::paludis_environment;
namespace paludis
{
template<>
- struct Implementation<UseConf>
+ struct Imp<UseConf>
{
const PaludisEnvironment * const env;
const std::shared_ptr<PaludisLikeOptionsConf> handler;
- Implementation(const PaludisEnvironment * const e) :
+ Imp(const PaludisEnvironment * const e) :
env(e),
handler(new PaludisLikeOptionsConf(make_named_values<PaludisLikeOptionsConfParams>(
n::allow_locking() = false,
@@ -51,7 +51,7 @@ namespace paludis
}
UseConf::UseConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<UseConf>(e)
+ Pimp<UseConf>(e)
{
}
diff --git a/paludis/environments/paludis/use_conf.hh b/paludis/environments/paludis/use_conf.hh
index 05609ec..6ce0a63 100644
--- a/paludis/environments/paludis/use_conf.hh
+++ b/paludis/environments/paludis/use_conf.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_PALUDIS_ENVIRONMENTS_PALUDIS_USE_CONF_HH
#define PALUDIS_GUARD_PALUDIS_PALUDIS_ENVIRONMENTS_PALUDIS_USE_CONF_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/util/tribool-fwd.hh>
#include <paludis/choice-fwd.hh>
@@ -40,7 +40,7 @@ namespace paludis
* \nosubgrouping
*/
class UseConf :
- private PrivateImplementationPattern<UseConf>
+ private Pimp<UseConf>
{
public:
///\name Basic operations
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index 06ed296..ba6faec 100644
--- a/paludis/environments/paludis/world.cc
+++ b/paludis/environments/paludis/world.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/environments/paludis/world.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/stringify.hh>
@@ -36,13 +36,13 @@ using namespace paludis::paludis_environment;
namespace paludis
{
template <>
- struct Implementation<World>
+ struct Imp<World>
{
const Environment * const env;
const std::shared_ptr<const FSEntry> maybe_world_file;
mutable Mutex mutex;
- Implementation(const Environment * const e, const std::shared_ptr<const FSEntry> & m) :
+ Imp(const Environment * const e, const std::shared_ptr<const FSEntry> & m) :
env(e),
maybe_world_file(m)
{
@@ -51,7 +51,7 @@ namespace paludis
}
World::World(const Environment * const e, const std::shared_ptr<const FSEntry> & f) :
- PrivateImplementationPattern<World>(e, f)
+ Pimp<World>(e, f)
{
}
diff --git a/paludis/environments/paludis/world.hh b/paludis/environments/paludis/world.hh
index 6d96ea4..1915e59 100644
--- a/paludis/environments/paludis/world.hh
+++ b/paludis/environments/paludis/world.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_WORLD_HH
#define PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_WORLD_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/spec_tree.hh>
@@ -33,7 +33,7 @@ namespace paludis
namespace paludis_environment
{
class PALUDIS_VISIBLE World :
- private PrivateImplementationPattern<World>
+ private Pimp<World>
{
private:
bool _add_string_to_world(const std::string &) const;
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 92c81c2..da96abb 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -25,7 +25,7 @@
#include <paludis/util/create_iterator-impl.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/save.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/strip.hh>
@@ -75,7 +75,7 @@ PortageEnvironmentConfigurationError::PortageEnvironmentConfigurationError(const
namespace paludis
{
template<>
- struct Implementation<PortageEnvironment>
+ struct Imp<PortageEnvironment>
{
const FSEntry conf_dir;
std::string paludis_command;
@@ -111,7 +111,7 @@ namespace paludis
std::shared_ptr<LiteralMetadataValueKey<FSEntry> > config_location_key;
std::shared_ptr<LiteralMetadataValueKey<FSEntry> > world_file_key;
- Implementation(Environment * const e, const std::string & s) :
+ Imp(Environment * const e, const std::string & s) :
conf_dir(FSEntry(s.empty() ? "/" : s) / SYSCONFDIR),
paludis_command("paludis"),
ignore_all_breaks_portage(false),
@@ -222,8 +222,8 @@ namespace
}
PortageEnvironment::PortageEnvironment(const std::string & s) :
- PrivateImplementationPattern<PortageEnvironment>(this, s),
- _imp(PrivateImplementationPattern<PortageEnvironment>::_imp)
+ Pimp<PortageEnvironment>(this, s),
+ _imp(Pimp<PortageEnvironment>::_imp)
{
using namespace std::placeholders;
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index 534eba2..e16e106 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -22,7 +22,7 @@
#include <paludis/environment_implementation.hh>
#include <paludis/util/exception.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -56,10 +56,10 @@ namespace paludis
*/
class PALUDIS_VISIBLE PortageEnvironment :
public EnvironmentImplementation,
- private PrivateImplementationPattern<PortageEnvironment>
+ private Pimp<PortageEnvironment>
{
private:
- PrivateImplementationPattern<PortageEnvironment>::ImpPtr & _imp;
+ Pimp<PortageEnvironment>::ImpPtr & _imp;
void _load_profile(const FSEntry &);
void _add_virtuals_repository();
diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index f62fc4e..521a911 100644
--- a/paludis/environments/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/environments/test/test_environment.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/sequence.hh>
@@ -46,7 +46,7 @@ typedef std::unordered_map<SetName, std::shared_ptr<const SetSpecTree>, Hash<Set
namespace paludis
{
template<>
- struct Implementation<TestEnvironment>
+ struct Imp<TestEnvironment>
{
std::shared_ptr<PackageDatabase> package_database;
std::string paludis_command;
@@ -54,7 +54,7 @@ namespace paludis
FSEntry root;
Sets sets;
- Implementation(Environment * const e, const FSEntry & r) :
+ Imp(Environment * const e, const FSEntry & r) :
package_database(new PackageDatabase(e)),
paludis_command(""),
root(r)
@@ -64,14 +64,14 @@ namespace paludis
}
TestEnvironment::TestEnvironment() :
- PrivateImplementationPattern<TestEnvironment>(this, FSEntry("/")),
- _imp(PrivateImplementationPattern<TestEnvironment>::_imp)
+ Pimp<TestEnvironment>(this, FSEntry("/")),
+ _imp(Pimp<TestEnvironment>::_imp)
{
}
TestEnvironment::TestEnvironment(const FSEntry & r) :
- PrivateImplementationPattern<TestEnvironment>(this, r),
- _imp(PrivateImplementationPattern<TestEnvironment>::_imp)
+ Pimp<TestEnvironment>(this, r),
+ _imp(Pimp<TestEnvironment>::_imp)
{
}
diff --git a/paludis/environments/test/test_environment.hh b/paludis/environments/test/test_environment.hh
index f86fca8..67d3137 100644
--- a/paludis/environments/test/test_environment.hh
+++ b/paludis/environments/test/test_environment.hh
@@ -22,7 +22,7 @@
#include <paludis/environment_implementation.hh>
#include <paludis/version_spec-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
/** \file
* Declarations for the TestEnvironment class.
@@ -40,11 +40,11 @@ namespace paludis
* \ingroup grptestenvironment
*/
class PALUDIS_VISIBLE TestEnvironment :
- private PrivateImplementationPattern<TestEnvironment>,
+ private Pimp<TestEnvironment>,
public EnvironmentImplementation
{
private:
- PrivateImplementationPattern<TestEnvironment>::ImpPtr & _imp;
+ Pimp<TestEnvironment>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/file_output_manager.cc b/paludis/file_output_manager.cc
index a2162a2..40a54d6 100644
--- a/paludis/file_output_manager.cc
+++ b/paludis/file_output_manager.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/file_output_manager.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/safe_ofstream.hh>
#include <paludis/util/set.hh>
#include <paludis/util/map.hh>
@@ -32,7 +32,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<FileOutputManager>
+ struct Imp<FileOutputManager>
{
FSEntry filename;
std::shared_ptr<SafeOFStream> stream;
@@ -42,7 +42,7 @@ namespace paludis
bool succeeded, unlinked, nothing_more_to_come;
- Implementation(
+ Imp(
const FSEntry & o,
const bool k,
const bool l,
@@ -65,7 +65,7 @@ namespace paludis
FileOutputManager::FileOutputManager(const FSEntry & o, const bool k, const bool l,
const std::shared_ptr<OutputManager> & m, const std::string & s) :
- PrivateImplementationPattern<FileOutputManager>(o, k, l, m, s)
+ Pimp<FileOutputManager>(o, k, l, m, s)
{
}
@@ -186,5 +186,5 @@ FileOutputManager::factory_create(
summary_output_manager, summary_output_message_s);
}
-template class PrivateImplementationPattern<FileOutputManager>;
+template class Pimp<FileOutputManager>;
diff --git a/paludis/file_output_manager.hh b/paludis/file_output_manager.hh
index 776aa52..3823e19 100644
--- a/paludis/file_output_manager.hh
+++ b/paludis/file_output_manager.hh
@@ -24,7 +24,7 @@
#include <paludis/output_manager.hh>
#include <paludis/output_manager_factory.hh>
#include <paludis/util/set-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <memory>
#include <functional>
@@ -32,7 +32,7 @@
namespace paludis
{
class PALUDIS_VISIBLE FileOutputManager :
- private PrivateImplementationPattern<FileOutputManager>,
+ private Pimp<FileOutputManager>,
public OutputManager
{
public:
@@ -62,7 +62,7 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template class PrivateImplementationPattern<FileOutputManager>;
+ extern template class Pimp<FileOutputManager>;
}
#endif
diff --git a/paludis/filter.cc b/paludis/filter.cc
index f486f95..8eb9b56 100644
--- a/paludis/filter.cc
+++ b/paludis/filter.cc
@@ -26,7 +26,7 @@
#include <paludis/package_database.hh>
#include <paludis/metadata_key.hh>
#include <paludis/match_package.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -39,11 +39,11 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<Filter>
+ struct Imp<Filter>
{
std::shared_ptr<const FilterHandler> handler;
- Implementation(const std::shared_ptr<const FilterHandler> & h) :
+ Imp(const std::shared_ptr<const FilterHandler> & h) :
handler(h)
{
}
@@ -51,12 +51,12 @@ namespace paludis
}
Filter::Filter(const std::shared_ptr<const FilterHandler> & h) :
- PrivateImplementationPattern<Filter>(h)
+ Pimp<Filter>(h)
{
}
Filter::Filter(const Filter & other) :
- PrivateImplementationPattern<Filter>(other._imp->handler)
+ Pimp<Filter>(other._imp->handler)
{
}
@@ -479,7 +479,7 @@ paludis::operator<< (std::ostream & s, const Filter & f)
return s;
}
-template class PrivateImplementationPattern<Filter>;
+template class Pimp<Filter>;
template class filter::SupportsAction<InstallAction>;
template class filter::SupportsAction<UninstallAction>;
template class filter::SupportsAction<PretendAction>;
diff --git a/paludis/filter.hh b/paludis/filter.hh
index 1e15ac6..5564164 100644
--- a/paludis/filter.hh
+++ b/paludis/filter.hh
@@ -23,7 +23,7 @@
#include <paludis/filter-fwd.hh>
#include <paludis/filter_handler-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/set-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
@@ -54,7 +54,7 @@ namespace paludis
* \ingroup g_selections
*/
class PALUDIS_VISIBLE Filter :
- private PrivateImplementationPattern<Filter>
+ private Pimp<Filter>
{
protected:
Filter(const std::shared_ptr<const FilterHandler> &);
@@ -239,7 +239,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<Filter>;
+ extern template class Pimp<Filter>;
extern template class filter::SupportsAction<InstallAction>;
extern template class filter::SupportsAction<UninstallAction>;
extern template class filter::SupportsAction<PretendAction>;
diff --git a/paludis/filtered_generator.cc b/paludis/filtered_generator.cc
index bc36a0f..5ef54fc 100644
--- a/paludis/filtered_generator.cc
+++ b/paludis/filtered_generator.cc
@@ -20,7 +20,7 @@
#include <paludis/filtered_generator.hh>
#include <paludis/filter.hh>
#include <paludis/generator.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <ostream>
using namespace paludis;
@@ -28,12 +28,12 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<FilteredGenerator>
+ struct Imp<FilteredGenerator>
{
Generator generator;
Filter filter;
- Implementation(const Generator & g, const Filter & f) :
+ Imp(const Generator & g, const Filter & f) :
generator(g),
filter(f)
{
@@ -42,17 +42,17 @@ namespace paludis
}
FilteredGenerator::FilteredGenerator(const FilteredGenerator & other) :
- PrivateImplementationPattern<FilteredGenerator>(other._imp->generator, other._imp->filter)
+ Pimp<FilteredGenerator>(other._imp->generator, other._imp->filter)
{
}
FilteredGenerator::FilteredGenerator(const Generator & g, const Filter & f) :
- PrivateImplementationPattern<FilteredGenerator>(g, f)
+ Pimp<FilteredGenerator>(g, f)
{
}
FilteredGenerator::FilteredGenerator(const FilteredGenerator & g, const Filter & f) :
- PrivateImplementationPattern<FilteredGenerator>(g.generator(), filter::And(g.filter(), f))
+ Pimp<FilteredGenerator>(g.generator(), filter::And(g.filter(), f))
{
}
@@ -96,5 +96,5 @@ paludis::operator<< (std::ostream & s, const FilteredGenerator & fg)
return s;
}
-template class PrivateImplementationPattern<FilteredGenerator>;
+template class Pimp<FilteredGenerator>;
diff --git a/paludis/filtered_generator.hh b/paludis/filtered_generator.hh
index ceb28b6..973c71d 100644
--- a/paludis/filtered_generator.hh
+++ b/paludis/filtered_generator.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_FILTERED_GENERATOR_HH 1
#include <paludis/filtered_generator-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/filter-fwd.hh>
#include <paludis/generator-fwd.hh>
@@ -46,7 +46,7 @@ namespace paludis
* \ingroup g_selections
*/
class PALUDIS_VISIBLE FilteredGenerator :
- private PrivateImplementationPattern<FilteredGenerator>
+ private Pimp<FilteredGenerator>
{
public:
///\name Basic operations
@@ -71,7 +71,7 @@ namespace paludis
const Filter & filter() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template class PrivateImplementationPattern<FilteredGenerator>;
+ extern template class Pimp<FilteredGenerator>;
}
#endif
diff --git a/paludis/format_messages_output_manager.cc b/paludis/format_messages_output_manager.cc
index dff0c32..775b190 100644
--- a/paludis/format_messages_output_manager.cc
+++ b/paludis/format_messages_output_manager.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/format_messages_output_manager.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/discard_output_stream.hh>
#include <paludis/util/set.hh>
#include <paludis/util/map.hh>
@@ -31,7 +31,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<FormatMessagesOutputManager>
+ struct Imp<FormatMessagesOutputManager>
{
DiscardOutputStream stream;
const std::shared_ptr<OutputManager> child;
@@ -43,7 +43,7 @@ namespace paludis
const FormatMessagesOutputManagerFormatFunction format_func;
- Implementation(
+ Imp(
const std::shared_ptr<OutputManager> & c,
const std::string & d,
const std::string & i,
@@ -72,7 +72,7 @@ FormatMessagesOutputManager::FormatMessagesOutputManager(
const std::string & format_error,
const std::string & format_log,
const FormatMessagesOutputManagerFormatFunction & f) :
- PrivateImplementationPattern<FormatMessagesOutputManager>(child, format_debug, format_info, format_warn, format_error, format_log, f)
+ Pimp<FormatMessagesOutputManager>(child, format_debug, format_info, format_warn, format_error, format_log, f)
{
}
@@ -192,5 +192,5 @@ FormatMessagesOutputManager::factory_create(
child, format_debug_s, format_info_s, format_warn_s, format_error_s, format_log_s, format_func);
}
-template class PrivateImplementationPattern<FormatMessagesOutputManager>;
+template class Pimp<FormatMessagesOutputManager>;
diff --git a/paludis/format_messages_output_manager.hh b/paludis/format_messages_output_manager.hh
index b7ae28e..3ada44d 100644
--- a/paludis/format_messages_output_manager.hh
+++ b/paludis/format_messages_output_manager.hh
@@ -24,7 +24,7 @@
#include <paludis/output_manager.hh>
#include <paludis/output_manager_factory.hh>
#include <paludis/util/set-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
#include <functional>
@@ -35,7 +35,7 @@ namespace paludis
const std::string &)> FormatMessagesOutputManagerFormatFunction;
class PALUDIS_VISIBLE FormatMessagesOutputManager :
- private PrivateImplementationPattern<FormatMessagesOutputManager>,
+ private Pimp<FormatMessagesOutputManager>,
public OutputManager
{
public:
@@ -69,7 +69,7 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template class PrivateImplementationPattern<FormatMessagesOutputManager>;
+ extern template class Pimp<FormatMessagesOutputManager>;
}
#endif
diff --git a/paludis/forward_at_finish_output_manager.cc b/paludis/forward_at_finish_output_manager.cc
index 379a9c0..57eb81b 100644
--- a/paludis/forward_at_finish_output_manager.cc
+++ b/paludis/forward_at_finish_output_manager.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/forward_at_finish_output_manager.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/map.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -31,7 +31,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<ForwardAtFinishOutputManager>
+ struct Imp<ForwardAtFinishOutputManager>
{
std::stringstream stdout_stream;
std::stringstream stderr_stream;
@@ -40,7 +40,7 @@ namespace paludis
bool success;
bool nothing_more_to_come;
- Implementation(
+ Imp(
const bool s,
const bool f,
const std::shared_ptr<OutputManager> & m
@@ -59,7 +59,7 @@ ForwardAtFinishOutputManager::ForwardAtFinishOutputManager(
const bool s,
const bool f,
const std::shared_ptr<OutputManager> & m) :
- PrivateImplementationPattern<ForwardAtFinishOutputManager>(s, f, m)
+ Pimp<ForwardAtFinishOutputManager>(s, f, m)
{
}
@@ -152,5 +152,5 @@ ForwardAtFinishOutputManager::factory_create(
child);
}
-template class PrivateImplementationPattern<ForwardAtFinishOutputManager>;
+template class Pimp<ForwardAtFinishOutputManager>;
diff --git a/paludis/forward_at_finish_output_manager.hh b/paludis/forward_at_finish_output_manager.hh
index 135fdd4..601888a 100644
--- a/paludis/forward_at_finish_output_manager.hh
+++ b/paludis/forward_at_finish_output_manager.hh
@@ -24,14 +24,14 @@
#include <paludis/output_manager.hh>
#include <paludis/output_manager_factory.hh>
#include <paludis/util/set-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
#include <functional>
namespace paludis
{
class PALUDIS_VISIBLE ForwardAtFinishOutputManager :
- private PrivateImplementationPattern<ForwardAtFinishOutputManager>,
+ private Pimp<ForwardAtFinishOutputManager>,
public OutputManager
{
public:
@@ -60,7 +60,7 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template class PrivateImplementationPattern<ForwardAtFinishOutputManager>;
+ extern template class Pimp<ForwardAtFinishOutputManager>;
}
#endif
diff --git a/paludis/fuzzy_finder.cc b/paludis/fuzzy_finder.cc
index d539bd3..c28fe6e 100644
--- a/paludis/fuzzy_finder.cc
+++ b/paludis/fuzzy_finder.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/fuzzy_finder.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/damerau_levenshtein.hh>
#include <paludis/util/options.hh>
@@ -118,7 +118,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<FuzzyCandidatesFinder>
+ struct Imp<FuzzyCandidatesFinder>
{
std::list<QualifiedPackageName> candidates;
};
@@ -131,7 +131,7 @@ namespace paludis
}
FuzzyCandidatesFinder::FuzzyCandidatesFinder(const Environment & e, const std::string & name, const Filter & filter) :
- PrivateImplementationPattern<FuzzyCandidatesFinder>()
+ Pimp<FuzzyCandidatesFinder>()
{
Generator g = generator::All();
std::string package(name);
@@ -179,7 +179,7 @@ FuzzyCandidatesFinder::end() const
namespace paludis
{
template <>
- struct Implementation<FuzzyRepositoriesFinder>
+ struct Imp<FuzzyRepositoriesFinder>
{
std::list<RepositoryName> candidates;
};
@@ -192,7 +192,7 @@ namespace paludis
}
FuzzyRepositoriesFinder::FuzzyRepositoriesFinder(const Environment & e, const std::string & name) :
- PrivateImplementationPattern<FuzzyRepositoriesFinder>()
+ Pimp<FuzzyRepositoriesFinder>()
{
DamerauLevenshtein distance_calculator(tolower_0_cost(name));
diff --git a/paludis/fuzzy_finder.hh b/paludis/fuzzy_finder.hh
index d800aaf..45eadba 100644
--- a/paludis/fuzzy_finder.hh
+++ b/paludis/fuzzy_finder.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_FUZZY_FINDER_HH 1
#include <paludis/environment-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/name.hh>
#include <paludis/filter-fwd.hh>
@@ -41,7 +41,7 @@ namespace paludis
* \ingroup g_package_database
*/
class PALUDIS_VISIBLE FuzzyCandidatesFinder :
- private PrivateImplementationPattern<FuzzyCandidatesFinder>
+ private Pimp<FuzzyCandidatesFinder>
{
public:
///\name Basic Operations
@@ -71,7 +71,7 @@ namespace paludis
* \ingroup g_package_database
*/
class PALUDIS_VISIBLE FuzzyRepositoriesFinder :
- private PrivateImplementationPattern<FuzzyRepositoriesFinder>
+ private Pimp<FuzzyRepositoriesFinder>
{
public:
///\name Basic Operations
diff --git a/paludis/generator.cc b/paludis/generator.cc
index cd9343a..fc54ba3 100644
--- a/paludis/generator.cc
+++ b/paludis/generator.cc
@@ -24,7 +24,7 @@
#include <paludis/action_names.hh>
#include <paludis/action.hh>
#include <paludis/match_package.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -43,11 +43,11 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<Generator>
+ struct Imp<Generator>
{
std::shared_ptr<const GeneratorHandler> handler;
- Implementation(const std::shared_ptr<const GeneratorHandler> & h) :
+ Imp(const std::shared_ptr<const GeneratorHandler> & h) :
handler(h)
{
}
@@ -55,12 +55,12 @@ namespace paludis
}
Generator::Generator(const std::shared_ptr<const GeneratorHandler> & h) :
- PrivateImplementationPattern<Generator>(h)
+ Pimp<Generator>(h)
{
}
Generator::Generator(const Generator & other) :
- PrivateImplementationPattern<Generator>(other._imp->handler)
+ Pimp<Generator>(other._imp->handler)
{
}
@@ -779,7 +779,7 @@ paludis::operator<< (std::ostream & s, const Generator & g)
return s;
}
-template class PrivateImplementationPattern<Generator>;
+template class Pimp<Generator>;
template class generator::SomeIDsMightSupportAction<InstallAction>;
template class generator::SomeIDsMightSupportAction<UninstallAction>;
template class generator::SomeIDsMightSupportAction<PretendAction>;
diff --git a/paludis/generator.hh b/paludis/generator.hh
index c6ed3a2..6b5162d 100644
--- a/paludis/generator.hh
+++ b/paludis/generator.hh
@@ -22,7 +22,7 @@
#include <paludis/generator-fwd.hh>
#include <paludis/generator_handler-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/options.hh>
#include <paludis/filtered_generator-fwd.hh>
#include <paludis/name-fwd.hh>
@@ -55,7 +55,7 @@ namespace paludis
* \ingroup g_selections
*/
class PALUDIS_VISIBLE Generator :
- private PrivateImplementationPattern<Generator>
+ private Pimp<Generator>
{
protected:
Generator(const std::shared_ptr<const GeneratorHandler> &);
@@ -269,7 +269,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<Generator>;
+ extern template class Pimp<Generator>;
}
diff --git a/paludis/handled_information.cc b/paludis/handled_information.cc
index 6c349a3..6df89fe 100644
--- a/paludis/handled_information.cc
+++ b/paludis/handled_information.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/handled_information.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/dep_spec.hh>
using namespace paludis;
@@ -30,11 +30,11 @@ DepListEntryHandled::~DepListEntryHandled()
namespace paludis
{
template <>
- struct Implementation<DepListEntryHandledSkippedUnsatisfied>
+ struct Imp<DepListEntryHandledSkippedUnsatisfied>
{
const PackageDepSpec spec;
- Implementation(const PackageDepSpec & s) :
+ Imp(const PackageDepSpec & s) :
spec(s)
{
}
@@ -42,7 +42,7 @@ namespace paludis
}
DepListEntryHandledSkippedUnsatisfied::DepListEntryHandledSkippedUnsatisfied(const PackageDepSpec & s) :
- PrivateImplementationPattern<DepListEntryHandledSkippedUnsatisfied>(s)
+ Pimp<DepListEntryHandledSkippedUnsatisfied>(s)
{
}
@@ -59,11 +59,11 @@ DepListEntryHandledSkippedUnsatisfied::spec() const
namespace paludis
{
template <>
- struct Implementation<DepListEntryHandledSkippedDependent>
+ struct Imp<DepListEntryHandledSkippedDependent>
{
const std::shared_ptr<const PackageID> id;
- Implementation(const std::shared_ptr<const PackageID> & i) :
+ Imp(const std::shared_ptr<const PackageID> & i) :
id(i)
{
}
@@ -71,7 +71,7 @@ namespace paludis
}
DepListEntryHandledSkippedDependent::DepListEntryHandledSkippedDependent(const std::shared_ptr<const PackageID> & i) :
- PrivateImplementationPattern<DepListEntryHandledSkippedDependent>(i)
+ Pimp<DepListEntryHandledSkippedDependent>(i)
{
}
diff --git a/paludis/handled_information.hh b/paludis/handled_information.hh
index 7fd2fc7..53c0ca3 100644
--- a/paludis/handled_information.hh
+++ b/paludis/handled_information.hh
@@ -23,7 +23,7 @@
#include <paludis/handled_information-fwd.hh>
#include <paludis/util/simple_visitor.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/type_list.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -127,7 +127,7 @@ namespace paludis
class PALUDIS_VISIBLE DepListEntryHandledSkippedUnsatisfied :
public DepListEntryHandled,
public ImplementAcceptMethods<DepListEntryHandled, DepListEntryHandledSkippedUnsatisfied>,
- private PrivateImplementationPattern<DepListEntryHandledSkippedUnsatisfied>
+ private Pimp<DepListEntryHandledSkippedUnsatisfied>
{
public:
///\name Basic operations
@@ -156,7 +156,7 @@ namespace paludis
class PALUDIS_VISIBLE DepListEntryHandledSkippedDependent :
public DepListEntryHandled,
public ImplementAcceptMethods<DepListEntryHandled, DepListEntryHandledSkippedDependent>,
- private PrivateImplementationPattern<DepListEntryHandledSkippedDependent>
+ private Pimp<DepListEntryHandledSkippedDependent>
{
public:
///\name Basic operations
diff --git a/paludis/hook.cc b/paludis/hook.cc
index c26b4fe..9357fd9 100644
--- a/paludis/hook.cc
+++ b/paludis/hook.cc
@@ -19,7 +19,7 @@
*/
#include <paludis/hook.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -34,13 +34,13 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<Hook>
+ struct Imp<Hook>
{
std::string name;
std::map<std::string, std::string> extra_env;
std::set<std::string> allowed_values;
- Implementation(const std::string & n, const std::map<std::string, std::string> & e,
+ Imp(const std::string & n, const std::map<std::string, std::string> & e,
const std::set<std::string> & av) :
name(n),
extra_env(e),
@@ -50,7 +50,7 @@ namespace paludis
};
template <>
- struct Implementation<Hook::AllowedOutputValues>
+ struct Imp<Hook::AllowedOutputValues>
{
std::set<std::string> allowed_values;
};
@@ -63,12 +63,12 @@ namespace paludis
}
Hook::AllowedOutputValues::AllowedOutputValues() :
- PrivateImplementationPattern<Hook::AllowedOutputValues>()
+ Pimp<Hook::AllowedOutputValues>()
{
}
Hook::AllowedOutputValues::AllowedOutputValues(const AllowedOutputValues & other) :
- PrivateImplementationPattern<Hook::AllowedOutputValues>()
+ Pimp<Hook::AllowedOutputValues>()
{
_imp->allowed_values = other._imp->allowed_values;
}
@@ -86,13 +86,13 @@ Hook::AllowedOutputValues::operator() (const std::string & v) const
}
Hook::Hook(const std::string & n) :
- PrivateImplementationPattern<Hook>(n, std::map<std::string, std::string>(), std::set<std::string>()),
+ Pimp<Hook>(n, std::map<std::string, std::string>(), std::set<std::string>()),
output_dest(hod_stdout)
{
}
Hook::Hook(const Hook & h) :
- PrivateImplementationPattern<Hook>(h._imp->name, h._imp->extra_env, h._imp->allowed_values),
+ Pimp<Hook>(h._imp->name, h._imp->extra_env, h._imp->allowed_values),
output_dest(h.output_dest)
{
}
diff --git a/paludis/hook.hh b/paludis/hook.hh
index 7b19cc9..cd0865a 100644
--- a/paludis/hook.hh
+++ b/paludis/hook.hh
@@ -25,7 +25,7 @@
#include <paludis/environment-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/graph-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/sequence-fwd.hh>
#include <paludis/util/named_value.hh>
@@ -71,7 +71,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE Hook :
- private PrivateImplementationPattern<Hook>
+ private Pimp<Hook>
{
public:
///\name Basic operations
@@ -129,7 +129,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE Hook::AllowedOutputValues :
- private PrivateImplementationPattern<Hook::AllowedOutputValues>
+ private Pimp<Hook::AllowedOutputValues>
{
friend class Hook;
diff --git a/paludis/hooker.cc b/paludis/hooker.cc
index 4664763..dd51ddf 100644
--- a/paludis/hooker.cc
+++ b/paludis/hooker.cc
@@ -28,7 +28,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/system.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/graph-impl.hh>
#include <paludis/util/tokeniser.hh>
@@ -436,7 +436,7 @@ SoHookFile::auto_hook_names() const
namespace paludis
{
template<>
- struct Implementation<Hooker>
+ struct Imp<Hooker>
{
const Environment * const env;
std::list<std::pair<FSEntry, bool> > dirs;
@@ -446,7 +446,7 @@ namespace paludis
mutable std::map<std::string, std::map<std::string, std::shared_ptr<HookFile> > > auto_hook_files;
mutable bool has_auto_hook_files;
- Implementation(const Environment * const e) :
+ Imp(const Environment * const e) :
env(e),
has_auto_hook_files(false)
{
@@ -504,7 +504,7 @@ namespace paludis
}
Hooker::Hooker(const Environment * const e) :
- PrivateImplementationPattern<Hooker>(e)
+ Pimp<Hooker>(e)
{
}
diff --git a/paludis/hooker.hh b/paludis/hooker.hh
index 08b8d89..7466cbe 100644
--- a/paludis/hooker.hh
+++ b/paludis/hooker.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_HOOKER_HH 1
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/graph-fwd.hh>
#include <paludis/util/sequence-fwd.hh>
#include <memory>
@@ -77,7 +77,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE Hooker :
- private PrivateImplementationPattern<Hooker>
+ private Pimp<Hooker>
{
private:
std::shared_ptr<Sequence<std::shared_ptr<HookFile> > > _find_hooks(const Hook &) const;
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 529adba..ad2eb46 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -23,7 +23,7 @@
#include <paludis/action.hh>
#include <paludis/metadata_key.hh>
#include <paludis/util/exception.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/hook.hh>
#include <paludis/repository.hh>
#include <paludis/match_package.hh>
@@ -117,7 +117,7 @@ namespace
namespace paludis
{
template<>
- struct Implementation<InstallTask>
+ struct Imp<InstallTask>
{
Environment * const env;
DepList dep_list;
@@ -148,7 +148,7 @@ namespace paludis
bool had_resolution_failures;
- Implementation<InstallTask>(Environment * const e, const DepListOptions & o,
+ Imp<InstallTask>(Environment * const e, const DepListOptions & o,
std::shared_ptr<const DestinationsSet> d) :
env(e),
dep_list(e, o),
@@ -182,7 +182,7 @@ namespace paludis
InstallTask::InstallTask(Environment * const env, const DepListOptions & options,
const std::shared_ptr<const DestinationsSet> & d) :
- PrivateImplementationPattern<InstallTask>(env, options, d)
+ Pimp<InstallTask>(env, options, d)
{
}
diff --git a/paludis/install_task.hh b/paludis/install_task.hh
index e390fd8..c1b077c 100644
--- a/paludis/install_task.hh
+++ b/paludis/install_task.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_INSTALL_TASK_HH
#define PALUDIS_GUARD_PALUDIS_INSTALL_TASK_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/dep_list.hh>
#include <paludis/dep_list_exceptions.hh>
@@ -53,7 +53,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE InstallTask :
- private PrivateImplementationPattern<InstallTask>
+ private Pimp<InstallTask>
{
private:
void _execute();
diff --git a/paludis/ipc_output_manager.cc b/paludis/ipc_output_manager.cc
index 90734a1..a255fa4 100644
--- a/paludis/ipc_output_manager.cc
+++ b/paludis/ipc_output_manager.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/ipc_output_manager.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/safe_ofstream.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/util/set.hh>
@@ -53,7 +53,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<IPCOutputManager>
+ struct Imp<IPCOutputManager>
{
std::shared_ptr<SafeOFStream> stdout_stream;
std::shared_ptr<SafeOFStream> stderr_stream;
@@ -61,7 +61,7 @@ namespace paludis
std::shared_ptr<SafeIFStream> pipe_command_read_stream;
std::shared_ptr<SafeOFStream> pipe_command_write_stream;
- Implementation(int r, int w) :
+ Imp(int r, int w) :
pipe_command_write_stream(new SafeOFStream(w))
{
*pipe_command_write_stream << "PING 1 GOAT" << '\0' << std::flush;
@@ -77,7 +77,7 @@ namespace paludis
}
IPCOutputManager::IPCOutputManager(const int r, const int w, const CreateOutputManagerInfo & i) :
- PrivateImplementationPattern<IPCOutputManager>(r, w)
+ Pimp<IPCOutputManager>(r, w)
{
std::stringstream ser_stream;
Serialiser ser(ser_stream);
@@ -177,7 +177,7 @@ IPCOutputManager::nothing_more_to_come()
namespace paludis
{
template <>
- struct Implementation<IPCInputManager>
+ struct Imp<IPCInputManager>
{
const Environment * const env;
const std::function<void (const std::shared_ptr<OutputManager> &)> on_create;
@@ -189,7 +189,7 @@ namespace paludis
std::shared_ptr<Thread> copy_thread;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const std::function<void (const std::shared_ptr<OutputManager> &)> & c) :
env(e),
on_create(c)
@@ -208,7 +208,7 @@ namespace paludis
IPCInputManager::IPCInputManager(const Environment * const e,
const std::function<void (const std::shared_ptr<OutputManager> &)> & c) :
- PrivateImplementationPattern<IPCInputManager>(e, c)
+ Pimp<IPCInputManager>(e, c)
{
}
@@ -370,7 +370,7 @@ IPCInputManager::underlying_output_manager_if_constructed() const
namespace paludis
{
template <>
- struct Implementation<OutputManagerFromIPC>
+ struct Imp<OutputManagerFromIPC>
{
const Environment * const env;
const std::shared_ptr<const PackageID> id;
@@ -381,7 +381,7 @@ namespace paludis
std::shared_ptr<OutputManager> result;
- Implementation(const Environment * const e, const std::shared_ptr<const PackageID> & i,
+ Imp(const Environment * const e, const std::shared_ptr<const PackageID> & i,
const OutputExclusivity x, const ClientOutputFeatures & c) :
env(e),
id(i),
@@ -407,7 +407,7 @@ OutputManagerFromIPC::OutputManagerFromIPC(const Environment * const e,
const std::shared_ptr<const PackageID> & i,
const OutputExclusivity x,
const ClientOutputFeatures & c) :
- PrivateImplementationPattern<OutputManagerFromIPC>(e, i, x, c)
+ Pimp<OutputManagerFromIPC>(e, i, x, c)
{
}
@@ -443,7 +443,7 @@ OutputManagerFromIPC::construct_standard_if_unconstructed()
}
}
-template class PrivateImplementationPattern<IPCOutputManager>;
-template class PrivateImplementationPattern<IPCInputManager>;
-template class PrivateImplementationPattern<OutputManagerFromIPC>;
+template class Pimp<IPCOutputManager>;
+template class Pimp<IPCInputManager>;
+template class Pimp<OutputManagerFromIPC>;
diff --git a/paludis/ipc_output_manager.hh b/paludis/ipc_output_manager.hh
index 25a48e1..273df68 100644
--- a/paludis/ipc_output_manager.hh
+++ b/paludis/ipc_output_manager.hh
@@ -22,7 +22,7 @@
#include <paludis/ipc_output_manager-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/output_manager.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/create_output_manager_info-fwd.hh>
@@ -35,7 +35,7 @@
namespace paludis
{
class PALUDIS_VISIBLE IPCOutputManager :
- private PrivateImplementationPattern<IPCOutputManager>,
+ private Pimp<IPCOutputManager>,
public OutputManager
{
public:
@@ -56,7 +56,7 @@ namespace paludis
};
class PALUDIS_VISIBLE IPCInputManager :
- private PrivateImplementationPattern<IPCInputManager>
+ private Pimp<IPCInputManager>
{
private:
std::string _pipe_command_handler(const std::string &);
@@ -88,7 +88,7 @@ namespace paludis
};
class PALUDIS_VISIBLE OutputManagerFromIPC :
- private PrivateImplementationPattern<OutputManagerFromIPC>
+ private Pimp<OutputManagerFromIPC>
{
public:
OutputManagerFromIPC(
@@ -107,9 +107,9 @@ namespace paludis
void construct_standard_if_unconstructed();
};
- extern template class PrivateImplementationPattern<IPCOutputManager>;
- extern template class PrivateImplementationPattern<IPCInputManager>;
- extern template class PrivateImplementationPattern<OutputManagerFromIPC>;
+ extern template class Pimp<IPCOutputManager>;
+ extern template class Pimp<IPCInputManager>;
+ extern template class Pimp<OutputManagerFromIPC>;
}
diff --git a/paludis/libtool_linkage_checker.cc b/paludis/libtool_linkage_checker.cc
index c93f228..22bbd1a 100644
--- a/paludis/libtool_linkage_checker.cc
+++ b/paludis/libtool_linkage_checker.cc
@@ -25,7 +25,7 @@
#include <paludis/util/log.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/stringify.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/safe_ifstream.hh>
@@ -43,7 +43,7 @@ typedef std::vector<std::pair<FSEntry, std::string> > Breakage;
namespace paludis
{
template <>
- struct Implementation<LibtoolLinkageChecker>
+ struct Imp<LibtoolLinkageChecker>
{
FSEntry root;
@@ -51,7 +51,7 @@ namespace paludis
Breakage breakage;
- Implementation(const FSEntry & the_root) :
+ Imp(const FSEntry & the_root) :
root(the_root)
{
}
@@ -70,7 +70,7 @@ namespace
}
LibtoolLinkageChecker::LibtoolLinkageChecker(const FSEntry & root) :
- PrivateImplementationPattern<LibtoolLinkageChecker>(root)
+ Pimp<LibtoolLinkageChecker>(root)
{
}
diff --git a/paludis/libtool_linkage_checker.hh b/paludis/libtool_linkage_checker.hh
index 5b3a70e..a11e1ab 100644
--- a/paludis/libtool_linkage_checker.hh
+++ b/paludis/libtool_linkage_checker.hh
@@ -21,13 +21,13 @@
#define PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_LIBTOOL_LINKAGE_CHECKER_HH
#include <paludis/linkage_checker.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
class LibtoolLinkageChecker :
public LinkageChecker,
- private paludis::PrivateImplementationPattern<LibtoolLinkageChecker>
+ private paludis::Pimp<LibtoolLinkageChecker>
{
public:
LibtoolLinkageChecker(const paludis::FSEntry &);
diff --git a/paludis/literal_metadata_key.cc b/paludis/literal_metadata_key.cc
index 2bed3e6..001b062 100644
--- a/paludis/literal_metadata_key.cc
+++ b/paludis/literal_metadata_key.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/literal_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/sequence.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -36,14 +36,14 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<LiteralMetadataFSEntrySequenceKey>
+ struct Imp<LiteralMetadataFSEntrySequenceKey>
{
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
const std::shared_ptr<const FSEntrySequence> value;
- Implementation(const std::string & r, const std::string & h, const MetadataKeyType t,
+ Imp(const std::string & r, const std::string & h, const MetadataKeyType t,
const std::shared_ptr<const FSEntrySequence> & v) :
raw_name(r),
human_name(h),
@@ -54,14 +54,14 @@ namespace paludis
};
template <>
- struct Implementation<LiteralMetadataStringSetKey>
+ struct Imp<LiteralMetadataStringSetKey>
{
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
const std::shared_ptr<const Set<std::string> > value;
- Implementation(const std::string & r, const std::string & h, const MetadataKeyType t,
+ Imp(const std::string & r, const std::string & h, const MetadataKeyType t,
const std::shared_ptr<const Set<std::string> > & v) :
raw_name(r),
human_name(h),
@@ -72,14 +72,14 @@ namespace paludis
};
template <>
- struct Implementation<LiteralMetadataStringSequenceKey>
+ struct Imp<LiteralMetadataStringSequenceKey>
{
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
const std::shared_ptr<const Sequence<std::string> > value;
- Implementation(const std::string & r, const std::string & h, const MetadataKeyType t,
+ Imp(const std::string & r, const std::string & h, const MetadataKeyType t,
const std::shared_ptr<const Sequence<std::string> > & v) :
raw_name(r),
human_name(h),
@@ -90,14 +90,14 @@ namespace paludis
};
template <typename T_>
- struct Implementation<LiteralMetadataValueKey<T_> >
+ struct Imp<LiteralMetadataValueKey<T_> >
{
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
T_ value;
- Implementation(const std::string & r, const std::string & h, const MetadataKeyType t, const T_ & v) :
+ Imp(const std::string & r, const std::string & h, const MetadataKeyType t, const T_ & v) :
raw_name(r),
human_name(h),
type(t),
@@ -109,8 +109,8 @@ namespace paludis
LiteralMetadataFSEntrySequenceKey::LiteralMetadataFSEntrySequenceKey(const std::string & r, const std::string & h,
const MetadataKeyType t, const std::shared_ptr<const FSEntrySequence> & v) :
- PrivateImplementationPattern<LiteralMetadataFSEntrySequenceKey>(r, h, t, v),
- _imp(PrivateImplementationPattern<LiteralMetadataFSEntrySequenceKey>::_imp)
+ Pimp<LiteralMetadataFSEntrySequenceKey>(r, h, t, v),
+ _imp(Pimp<LiteralMetadataFSEntrySequenceKey>::_imp)
{
}
@@ -159,8 +159,8 @@ LiteralMetadataFSEntrySequenceKey::type() const
LiteralMetadataStringSetKey::LiteralMetadataStringSetKey(const std::string & r, const std::string & h,
const MetadataKeyType t, const std::shared_ptr<const Set<std::string> > & v) :
- PrivateImplementationPattern<LiteralMetadataStringSetKey>(r, h, t, v),
- _imp(PrivateImplementationPattern<LiteralMetadataStringSetKey>::_imp)
+ Pimp<LiteralMetadataStringSetKey>(r, h, t, v),
+ _imp(Pimp<LiteralMetadataStringSetKey>::_imp)
{
}
@@ -176,8 +176,8 @@ LiteralMetadataStringSetKey::value() const
LiteralMetadataStringSequenceKey::LiteralMetadataStringSequenceKey(const std::string & r, const std::string & h,
const MetadataKeyType t, const std::shared_ptr<const Sequence<std::string> > & v) :
- PrivateImplementationPattern<LiteralMetadataStringSequenceKey>(r, h, t, v),
- _imp(PrivateImplementationPattern<LiteralMetadataStringSequenceKey>::_imp)
+ Pimp<LiteralMetadataStringSequenceKey>(r, h, t, v),
+ _imp(Pimp<LiteralMetadataStringSequenceKey>::_imp)
{
}
@@ -323,8 +323,8 @@ ExtraLiteralMetadataValueKeyMethods<std::shared_ptr<const PackageID> >::pretty_p
template <typename T_>
LiteralMetadataValueKey<T_>::LiteralMetadataValueKey(const std::string & r, const std::string & h,
const MetadataKeyType t, const T_ & v) :
- PrivateImplementationPattern<LiteralMetadataValueKey<T_> >(r, h, t, v),
- _imp(PrivateImplementationPattern<LiteralMetadataValueKey<T_ > >::_imp)
+ Pimp<LiteralMetadataValueKey<T_> >(r, h, t, v),
+ _imp(Pimp<LiteralMetadataValueKey<T_ > >::_imp)
{
}
@@ -343,14 +343,14 @@ LiteralMetadataValueKey<T_>::value() const
namespace paludis
{
template <>
- struct Implementation<LiteralMetadataTimeKey>
+ struct Imp<LiteralMetadataTimeKey>
{
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
const Timestamp value;
- Implementation(const std::string & r, const std::string & h, const MetadataKeyType t, const Timestamp v) :
+ Imp(const std::string & r, const std::string & h, const MetadataKeyType t, const Timestamp v) :
raw_name(r),
human_name(h),
type(t),
@@ -362,8 +362,8 @@ namespace paludis
LiteralMetadataTimeKey::LiteralMetadataTimeKey(
const std::string & r, const std::string & h, const MetadataKeyType k, const Timestamp v) :
- PrivateImplementationPattern<LiteralMetadataTimeKey>(r, h, k, v),
- _imp(PrivateImplementationPattern<LiteralMetadataTimeKey>::_imp)
+ Pimp<LiteralMetadataTimeKey>(r, h, k, v),
+ _imp(Pimp<LiteralMetadataTimeKey>::_imp)
{
}
diff --git a/paludis/literal_metadata_key.hh b/paludis/literal_metadata_key.hh
index bcd056a..594286b 100644
--- a/paludis/literal_metadata_key.hh
+++ b/paludis/literal_metadata_key.hh
@@ -22,7 +22,7 @@
#include <paludis/metadata_key.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
@@ -111,11 +111,11 @@ namespace paludis
template <typename T_>
class PALUDIS_VISIBLE LiteralMetadataValueKey :
public MetadataValueKey<T_>,
- private PrivateImplementationPattern<LiteralMetadataValueKey<T_> >,
+ private Pimp<LiteralMetadataValueKey<T_> >,
public ExtraLiteralMetadataValueKeyMethods<T_>
{
private:
- typename PrivateImplementationPattern<LiteralMetadataValueKey<T_> >::ImpPtr & _imp;
+ typename Pimp<LiteralMetadataValueKey<T_> >::ImpPtr & _imp;
public:
///\name Basic operations
@@ -148,10 +148,10 @@ namespace paludis
*/
class PALUDIS_VISIBLE LiteralMetadataFSEntrySequenceKey :
public MetadataCollectionKey<FSEntrySequence>,
- private PrivateImplementationPattern<LiteralMetadataFSEntrySequenceKey>
+ private Pimp<LiteralMetadataFSEntrySequenceKey>
{
private:
- PrivateImplementationPattern<LiteralMetadataFSEntrySequenceKey>::ImpPtr & _imp;
+ Pimp<LiteralMetadataFSEntrySequenceKey>::ImpPtr & _imp;
public:
///\name Basic operations
@@ -182,10 +182,10 @@ namespace paludis
*/
class PALUDIS_VISIBLE LiteralMetadataStringSetKey :
public MetadataCollectionKey<Set<std::string> >,
- private PrivateImplementationPattern<LiteralMetadataStringSetKey>
+ private Pimp<LiteralMetadataStringSetKey>
{
private:
- PrivateImplementationPattern<LiteralMetadataStringSetKey>::ImpPtr & _imp;
+ Pimp<LiteralMetadataStringSetKey>::ImpPtr & _imp;
public:
///\name Basic operations
@@ -216,10 +216,10 @@ namespace paludis
*/
class PALUDIS_VISIBLE LiteralMetadataStringSequenceKey :
public MetadataCollectionKey<Sequence<std::string> >,
- private PrivateImplementationPattern<LiteralMetadataStringSequenceKey>
+ private Pimp<LiteralMetadataStringSequenceKey>
{
private:
- PrivateImplementationPattern<LiteralMetadataStringSequenceKey>::ImpPtr & _imp;
+ Pimp<LiteralMetadataStringSequenceKey>::ImpPtr & _imp;
public:
///\name Basic operations
@@ -251,10 +251,10 @@ namespace paludis
*/
class PALUDIS_VISIBLE LiteralMetadataTimeKey :
public MetadataTimeKey,
- private PrivateImplementationPattern<LiteralMetadataTimeKey>
+ private Pimp<LiteralMetadataTimeKey>
{
private:
- PrivateImplementationPattern<LiteralMetadataTimeKey>::ImpPtr & _imp;
+ Pimp<LiteralMetadataTimeKey>::ImpPtr & _imp;
public:
///\name Basic operations
diff --git a/paludis/merger.cc b/paludis/merger.cc
index f3772fe..159f689 100644
--- a/paludis/merger.cc
+++ b/paludis/merger.cc
@@ -25,7 +25,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/options.hh>
#include <paludis/util/hashes.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/timestamp.hh>
#include <paludis/selinux/security_context.hh>
@@ -56,7 +56,7 @@ typedef std::unordered_map<std::pair<dev_t, ino_t>, std::string, Hash<std::pair<
namespace paludis
{
template <>
- struct Implementation<Merger>
+ struct Imp<Merger>
{
std::set<FSEntry> fixed_entries;
MergedMap merged_ids;
@@ -64,7 +64,7 @@ namespace paludis
bool result;
bool skip_dir;
- Implementation(const MergerParams & p) :
+ Imp(const MergerParams & p) :
params(p),
result(true),
skip_dir(false)
@@ -79,7 +79,7 @@ MergerError::MergerError(const std::string & s) throw () :
}
Merger::Merger(const MergerParams & p) :
- PrivateImplementationPattern<Merger>(p)
+ Pimp<Merger>(p)
{
}
diff --git a/paludis/merger.hh b/paludis/merger.hh
index 98c4d80..a0015fe 100644
--- a/paludis/merger.hh
+++ b/paludis/merger.hh
@@ -123,7 +123,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE Merger :
- private PrivateImplementationPattern<Merger>
+ private Pimp<Merger>
{
private:
void track_renamed_dir_recursive(const FSEntry &);
diff --git a/paludis/metadata_key.cc b/paludis/metadata_key.cc
index c6d1e1d..d451010 100644
--- a/paludis/metadata_key.cc
+++ b/paludis/metadata_key.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/set.hh>
@@ -36,13 +36,13 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<MetadataKey>
+ struct Imp<MetadataKey>
{
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::string & r, const std::string & h, const MetadataKeyType t) :
+ Imp(const std::string & r, const std::string & h, const MetadataKeyType t) :
raw_name(r),
human_name(h),
type(t)
diff --git a/paludis/metadata_key_holder.cc b/paludis/metadata_key_holder.cc
index 39ea404..5fe2379 100644
--- a/paludis/metadata_key_holder.cc
+++ b/paludis/metadata_key_holder.cc
@@ -22,7 +22,7 @@
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/exception.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/metadata_key.hh>
#include <functional>
#include <list>
@@ -33,7 +33,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<MetadataKeyHolder>
+ struct Imp<MetadataKeyHolder>
{
mutable std::list<std::shared_ptr<const MetadataKey> > keys;
};
@@ -46,7 +46,7 @@ namespace paludis
}
MetadataKeyHolder::MetadataKeyHolder() :
- PrivateImplementationPattern<MetadataKeyHolder>()
+ Pimp<MetadataKeyHolder>()
{
}
diff --git a/paludis/metadata_key_holder.hh b/paludis/metadata_key_holder.hh
index b9cf08c..827a270 100644
--- a/paludis/metadata_key_holder.hh
+++ b/paludis/metadata_key_holder.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_METADATA_KEY_HOLDER_HH 1
#include <paludis/metadata_key_holder-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/metadata_key-fwd.hh>
#include <memory>
@@ -36,7 +36,7 @@ namespace paludis
* \ingroup g_metadata_key
*/
class PALUDIS_VISIBLE MetadataKeyHolder :
- private PrivateImplementationPattern<MetadataKeyHolder>
+ private Pimp<MetadataKeyHolder>
{
protected:
/**
diff --git a/paludis/ndbam.cc b/paludis/ndbam.cc
index 1f1750e..9f4fe8f 100644
--- a/paludis/ndbam.cc
+++ b/paludis/ndbam.cc
@@ -80,7 +80,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<NDBAM>
+ struct Imp<NDBAM>
{
const FSEntry location;
const VersionSpecOptions version_options;
@@ -92,7 +92,7 @@ namespace paludis
mutable Mutex category_names_containing_package_mutex;
mutable CategoryNamesContainingPackage category_names_containing_package;
- Implementation(const FSEntry & l, const VersionSpecOptions & o) :
+ Imp(const FSEntry & l, const VersionSpecOptions & o) :
location(l),
version_options(o)
{
@@ -104,7 +104,7 @@ NDBAM::NDBAM(const FSEntry & l,
const std::function<bool (const std::string &)> & check_format,
const std::string & preferred_format,
const VersionSpecOptions & version_options) :
- PrivateImplementationPattern<NDBAM>(l, version_options)
+ Pimp<NDBAM>(l, version_options)
{
Context c("When checking NDBAM layout at '" + stringify(l) + "':");
if ((l / "ndbam.conf").exists())
diff --git a/paludis/ndbam.hh b/paludis/ndbam.hh
index 76db29f..7e45401 100644
--- a/paludis/ndbam.hh
+++ b/paludis/ndbam.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNPACKAGED_NDBAM_HH 1
#include <paludis/ndbam-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/sequence-fwd.hh>
@@ -67,7 +67,7 @@ namespace paludis
* \since 0.26
*/
class PALUDIS_VISIBLE NDBAM :
- private PrivateImplementationPattern<NDBAM>
+ private Pimp<NDBAM>
{
public:
///\name Basic operations
diff --git a/paludis/ndbam_merger.cc b/paludis/ndbam_merger.cc
index 66bab84..03c3a01 100644
--- a/paludis/ndbam_merger.cc
+++ b/paludis/ndbam_merger.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/log.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/system.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/strip.hh>
@@ -48,7 +48,7 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<NDBAMMerger>
+ struct Imp<NDBAMMerger>
{
NDBAMMergerParams params;
FSEntry realroot;
@@ -57,7 +57,7 @@ namespace paludis
std::list<std::string> config_protect;
std::list<std::string> config_protect_mask;
- Implementation(const NDBAMMergerParams & p) :
+ Imp(const NDBAMMergerParams & p) :
params(p),
realroot(params.root().realpath())
{
@@ -79,8 +79,8 @@ NDBAMMerger::NDBAMMerger(const NDBAMMergerParams & p) :
n::options() = p.options(),
n::root() = p.root()
)),
- PrivateImplementationPattern<NDBAMMerger>(p),
- _imp(PrivateImplementationPattern<NDBAMMerger>::_imp)
+ Pimp<NDBAMMerger>(p),
+ _imp(Pimp<NDBAMMerger>::_imp)
{
}
diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh
index 21e3af6..744832c 100644
--- a/paludis/ndbam_merger.hh
+++ b/paludis/ndbam_merger.hh
@@ -70,13 +70,13 @@ namespace paludis
*/
class PALUDIS_VISIBLE NDBAMMerger :
public Merger,
- private PrivateImplementationPattern<NDBAMMerger>
+ private Pimp<NDBAMMerger>
{
private:
void display_override(const std::string &) const;
std::string make_arrows(const MergeStatusFlags &) const;
- PrivateImplementationPattern<NDBAMMerger>::ImpPtr & _imp;
+ Pimp<NDBAMMerger>::ImpPtr & _imp;
public:
NDBAMMerger(const NDBAMMergerParams &);
diff --git a/paludis/ndbam_unmerger.cc b/paludis/ndbam_unmerger.cc
index 9f65f5d..fe0ac1a 100644
--- a/paludis/ndbam_unmerger.cc
+++ b/paludis/ndbam_unmerger.cc
@@ -30,7 +30,7 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/join.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<NDBAMUnmerger>
+ struct Imp<NDBAMUnmerger>
{
NDBAMUnmergerOptions options;
std::list<std::string> config_protect;
std::list<std::string> config_protect_mask;
- Implementation(const NDBAMUnmergerOptions & o) :
+ Imp(const NDBAMUnmergerOptions & o) :
options(o)
{
tokenise_whitespace(o.config_protect(), std::back_inserter(config_protect));
@@ -74,8 +74,8 @@ NDBAMUnmerger::NDBAMUnmerger(const NDBAMUnmergerOptions & o) :
n::ignore() = o.ignore(),
n::root() = o.root()
)),
- PrivateImplementationPattern<NDBAMUnmerger>(o),
- _imp(PrivateImplementationPattern<NDBAMUnmerger>::_imp.get())
+ Pimp<NDBAMUnmerger>(o),
+ _imp(Pimp<NDBAMUnmerger>::_imp.get())
{
}
diff --git a/paludis/ndbam_unmerger.hh b/paludis/ndbam_unmerger.hh
index ee72fa6..3c72e5e 100644
--- a/paludis/ndbam_unmerger.hh
+++ b/paludis/ndbam_unmerger.hh
@@ -21,7 +21,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNPACKAGED_NDBAM_UNMERGER_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNPACKAGED_NDBAM_UNMERGER_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/unmerger.hh>
@@ -74,10 +74,10 @@ namespace paludis
*/
class PALUDIS_VISIBLE NDBAMUnmerger :
public Unmerger,
- private PrivateImplementationPattern<NDBAMUnmerger>
+ private Pimp<NDBAMUnmerger>
{
private:
- Implementation<NDBAMUnmerger> * _imp;
+ Imp<NDBAMUnmerger> * _imp;
void _add_file(const std::shared_ptr<const ContentsEntry> &);
void _add_dir(const std::shared_ptr<const ContentsEntry> &);
diff --git a/paludis/notifier_callback.cc b/paludis/notifier_callback.cc
index a838e5f..f80aae5 100644
--- a/paludis/notifier_callback.cc
+++ b/paludis/notifier_callback.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/notifier_callback.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/environment.hh>
@@ -60,13 +60,13 @@ NotifierCallbackLinkageStepEvent::location() const
namespace paludis
{
template <>
- struct Implementation<ScopedNotifierCallback>
+ struct Imp<ScopedNotifierCallback>
{
Environment * const env;
const NotifierCallbackID id;
bool removed;
- Implementation(Environment * const e, const NotifierCallbackFunction & f) :
+ Imp(Environment * const e, const NotifierCallbackFunction & f) :
env(e),
id(e->add_notifier_callback(f)),
removed(false)
@@ -76,7 +76,7 @@ namespace paludis
}
ScopedNotifierCallback::ScopedNotifierCallback(Environment * const e, const NotifierCallbackFunction & f) :
- PrivateImplementationPattern<ScopedNotifierCallback>(e, f)
+ Pimp<ScopedNotifierCallback>(e, f)
{
}
@@ -96,5 +96,5 @@ ScopedNotifierCallback::remove_now()
_imp->removed = true;
}
-template class PrivateImplementationPattern<ScopedNotifierCallback>;
+template class Pimp<ScopedNotifierCallback>;
diff --git a/paludis/notifier_callback.hh b/paludis/notifier_callback.hh
index eebb953..294d5c4 100644
--- a/paludis/notifier_callback.hh
+++ b/paludis/notifier_callback.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_NOTIFIER_CALLBACK_HH 1
#include <paludis/notifier_callback-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/simple_visitor.hh>
#include <paludis/util/type_list.hh>
#include <paludis/util/fs_entry.hh>
@@ -85,7 +85,7 @@ namespace paludis
};
class PALUDIS_VISIBLE ScopedNotifierCallback :
- private PrivateImplementationPattern<ScopedNotifierCallback>
+ private Pimp<ScopedNotifierCallback>
{
public:
ScopedNotifierCallback(Environment * const, const NotifierCallbackFunction &);
@@ -94,7 +94,7 @@ namespace paludis
void remove_now();
};
- extern template class PrivateImplementationPattern<ScopedNotifierCallback>;
+ extern template class Pimp<ScopedNotifierCallback>;
}
diff --git a/paludis/output_manager_factory.cc b/paludis/output_manager_factory.cc
index d1cf499..37bd78d 100644
--- a/paludis/output_manager_factory.cc
+++ b/paludis/output_manager_factory.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/output_manager_factory.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/member_iterator-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -77,7 +77,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<OutputManagerFactory>
+ struct Imp<OutputManagerFactory>
{
Keys keys;
std::list<void *> dl_opened;
@@ -91,7 +91,7 @@ namespace paludis
}
OutputManagerFactory::OutputManagerFactory() :
- PrivateImplementationPattern<OutputManagerFactory>()
+ Pimp<OutputManagerFactory>()
{
/* we might want to make this plugin loadable at some point */
add_manager(BufferOutputManager::factory_managers(), BufferOutputManager::factory_create);
@@ -145,7 +145,7 @@ OutputManagerFactory::add_manager(
}
}
-template class PrivateImplementationPattern<OutputManagerFactory>;
+template class Pimp<OutputManagerFactory>;
template class Singleton<OutputManagerFactory>;
template class WrappedForwardIterator<OutputManagerFactory::ConstIteratorTag, const std::string>;
diff --git a/paludis/output_manager_factory.hh b/paludis/output_manager_factory.hh
index a9de65f..367f4d8 100644
--- a/paludis/output_manager_factory.hh
+++ b/paludis/output_manager_factory.hh
@@ -24,7 +24,7 @@
#include <paludis/output_manager-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/map-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/set-fwd.hh>
#include <paludis/util/singleton.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -34,7 +34,7 @@
namespace paludis
{
class PALUDIS_VISIBLE OutputManagerFactory :
- private PrivateImplementationPattern<OutputManagerFactory>,
+ private Pimp<OutputManagerFactory>,
public Singleton<OutputManagerFactory>
{
friend class Singleton<OutputManagerFactory>;
@@ -101,7 +101,7 @@ namespace paludis
ConstIterator end_keys() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template class PrivateImplementationPattern<OutputManagerFactory>;
+ extern template class Pimp<OutputManagerFactory>;
extern template class Singleton<OutputManagerFactory>;
extern template class WrappedForwardIterator<OutputManagerFactory::ConstIteratorTag, const std::string>;
}
diff --git a/paludis/output_manager_from_environment.cc b/paludis/output_manager_from_environment.cc
index cac5249..b4b2b8b 100644
--- a/paludis/output_manager_from_environment.cc
+++ b/paludis/output_manager_from_environment.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/output_manager_from_environment.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/options.hh>
#include <paludis/environment.hh>
@@ -30,7 +30,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<OutputManagerFromEnvironment>
+ struct Imp<OutputManagerFromEnvironment>
{
const Environment * const env;
const std::shared_ptr<const PackageID> id;
@@ -39,7 +39,7 @@ namespace paludis
std::shared_ptr<OutputManager> result;
- Implementation(const Environment * const e, const std::shared_ptr<const PackageID> & i,
+ Imp(const Environment * const e, const std::shared_ptr<const PackageID> & i,
const OutputExclusivity x, const ClientOutputFeatures & c) :
env(e),
id(i),
@@ -55,7 +55,7 @@ OutputManagerFromEnvironment::OutputManagerFromEnvironment(
const std::shared_ptr<const PackageID> & i,
const OutputExclusivity x,
const ClientOutputFeatures & c) :
- PrivateImplementationPattern<OutputManagerFromEnvironment>(e, i, x, c)
+ Pimp<OutputManagerFromEnvironment>(e, i, x, c)
{
}
@@ -92,5 +92,5 @@ OutputManagerFromEnvironment::construct_standard_if_unconstructed()
}
}
-template class PrivateImplementationPattern<OutputManagerFromEnvironment>;
+template class Pimp<OutputManagerFromEnvironment>;
diff --git a/paludis/output_manager_from_environment.hh b/paludis/output_manager_from_environment.hh
index 314a7e6..eb187ae 100644
--- a/paludis/output_manager_from_environment.hh
+++ b/paludis/output_manager_from_environment.hh
@@ -22,7 +22,7 @@
#include <paludis/output_manager_from_environment-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -32,7 +32,7 @@
namespace paludis
{
class PALUDIS_VISIBLE OutputManagerFromEnvironment :
- private PrivateImplementationPattern<OutputManagerFromEnvironment>
+ private Pimp<OutputManagerFromEnvironment>
{
public:
OutputManagerFromEnvironment(
@@ -50,7 +50,7 @@ namespace paludis
void construct_standard_if_unconstructed();
};
- extern template class PrivateImplementationPattern<OutputManagerFromEnvironment>;
+ extern template class Pimp<OutputManagerFromEnvironment>;
}
#endif
diff --git a/paludis/package_database.cc b/paludis/package_database.cc
index 1b02e8f..cb0247c 100644
--- a/paludis/package_database.cc
+++ b/paludis/package_database.cc
@@ -27,7 +27,7 @@
#include <paludis/filter.hh>
#include <paludis/filtered_generator.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/join.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -152,7 +152,7 @@ AmbiguousPackageNameError::name() const
namespace paludis
{
template<>
- struct Implementation<PackageDatabase>
+ struct Imp<PackageDatabase>
{
std::list<std::shared_ptr<Repository> > repositories;
std::multimap<int, std::list<std::shared_ptr<Repository> >::iterator> repository_importances;
@@ -161,7 +161,7 @@ namespace paludis
}
PackageDatabase::PackageDatabase(const Environment * const e) :
- PrivateImplementationPattern<PackageDatabase>()
+ Pimp<PackageDatabase>()
{
_imp->environment = e;
}
diff --git a/paludis/package_database.hh b/paludis/package_database.hh
index f1efdea..2bc9ffc 100644
--- a/paludis/package_database.hh
+++ b/paludis/package_database.hh
@@ -28,7 +28,7 @@
#include <paludis/filter-fwd.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/join.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/version_spec.hh>
@@ -218,7 +218,7 @@ namespace paludis
* \ingroup g_package_database
*/
class PALUDIS_VISIBLE PackageDatabase :
- private PrivateImplementationPattern<PackageDatabase>
+ private Pimp<PackageDatabase>
{
private:
static const Filter & all_filter() PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/package_id.cc b/paludis/package_id.cc
index aa0a80a..4b89195 100644
--- a/paludis/package_id.cc
+++ b/paludis/package_id.cc
@@ -19,7 +19,7 @@
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/sequence-impl.hh>
#include <paludis/util/set.hh>
@@ -45,7 +45,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<PackageID>
+ struct Imp<PackageID>
{
mutable std::list<std::shared_ptr<const Mask> > masks;
mutable std::list<std::shared_ptr<const OverriddenMask> > overridden_masks;
@@ -65,8 +65,8 @@ namespace paludis
}
PackageID::PackageID() :
- PrivateImplementationPattern<PackageID>(),
- _imp(PrivateImplementationPattern<PackageID>::_imp)
+ Pimp<PackageID>(),
+ _imp(Pimp<PackageID>::_imp)
{
}
@@ -172,14 +172,14 @@ paludis::operator== (const PackageID & a, const PackageID & b)
namespace paludis
{
template <>
- struct Implementation<PackageIDComparator>
+ struct Imp<PackageIDComparator>
{
std::unordered_map<RepositoryName, unsigned, Hash<RepositoryName> > m;
};
}
PackageIDComparator::PackageIDComparator(const PackageDatabase * const db) :
- PrivateImplementationPattern<PackageIDComparator>()
+ Pimp<PackageIDComparator>()
{
unsigned c(0);
for (PackageDatabase::RepositoryConstIterator r(db->begin_repositories()),
@@ -188,7 +188,7 @@ PackageIDComparator::PackageIDComparator(const PackageDatabase * const db) :
}
PackageIDComparator::PackageIDComparator(const PackageIDComparator & other) :
- PrivateImplementationPattern<PackageIDComparator>()
+ Pimp<PackageIDComparator>()
{
_imp->m = other._imp->m;
}
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index 782b5ed..4cd9584 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -24,7 +24,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/operators.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/fs_entry-fwd.hh>
@@ -91,12 +91,12 @@ namespace paludis
* \ingroup g_package_id
*/
class PALUDIS_VISIBLE PackageID :
- private PrivateImplementationPattern<PackageID>,
+ private Pimp<PackageID>,
public equality_operators::HasEqualityOperators,
public MetadataKeyHolder
{
private:
- PrivateImplementationPattern<PackageID>::ImpPtr & _imp;
+ Pimp<PackageID>::ImpPtr & _imp;
protected:
/**
@@ -471,7 +471,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE PackageIDComparator :
- private PrivateImplementationPattern<PackageIDComparator>
+ private Pimp<PackageIDComparator>
{
public:
///\name Standard library typedefs
diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc
index 355cb47..cd8bab3 100644
--- a/paludis/paludislike_options_conf.cc
+++ b/paludis/paludislike_options_conf.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/paludislike_options_conf.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/stringify.hh>
@@ -150,7 +150,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<PaludisLikeOptionsConf>
+ struct Imp<PaludisLikeOptionsConf>
{
const PaludisLikeOptionsConfParams params;
@@ -158,7 +158,7 @@ namespace paludis
SetNamesWithValuesGroups set_specs;
SpecsWithValuesGroups wildcard_specs;
- Implementation(const PaludisLikeOptionsConfParams & p) :
+ Imp(const PaludisLikeOptionsConfParams & p) :
params(p)
{
}
@@ -166,7 +166,7 @@ namespace paludis
}
PaludisLikeOptionsConf::PaludisLikeOptionsConf(const PaludisLikeOptionsConfParams & params) :
- PrivateImplementationPattern<PaludisLikeOptionsConf>(params)
+ Pimp<PaludisLikeOptionsConf>(params)
{
}
@@ -623,5 +623,5 @@ PaludisLikeOptionsConf::known_choice_value_names(
return result;
}
-template class PrivateImplementationPattern<PaludisLikeOptionsConf>;
+template class Pimp<PaludisLikeOptionsConf>;
diff --git a/paludis/paludislike_options_conf.hh b/paludis/paludislike_options_conf.hh
index b8f1050..fc6d64e 100644
--- a/paludis/paludislike_options_conf.hh
+++ b/paludis/paludislike_options_conf.hh
@@ -22,7 +22,7 @@
#include <paludis/paludislike_options_conf-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/tribool-fwd.hh>
#include <paludis/util/set-fwd.hh>
@@ -78,7 +78,7 @@ namespace paludis
* \since 0.44
*/
class PALUDIS_VISIBLE PaludisLikeOptionsConf :
- private PrivateImplementationPattern<PaludisLikeOptionsConf>
+ private Pimp<PaludisLikeOptionsConf>
{
public:
PaludisLikeOptionsConf(const PaludisLikeOptionsConfParams &);
@@ -107,7 +107,7 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template class PrivateImplementationPattern<PaludisLikeOptionsConf>;
+ extern template class Pimp<PaludisLikeOptionsConf>;
}
diff --git a/paludis/query_visitor.cc b/paludis/query_visitor.cc
index 80fb4b4..9b3f0c6 100644
--- a/paludis/query_visitor.cc
+++ b/paludis/query_visitor.cc
@@ -26,7 +26,7 @@
#include <paludis/filter.hh>
#include <paludis/filtered_generator.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -40,7 +40,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<QueryVisitor>
+ struct Imp<QueryVisitor>
{
bool result;
const DepList * const dep_list;
@@ -49,7 +49,7 @@ namespace paludis
const std::shared_ptr<const PackageID> id;
std::set<SetName> recursing_sets;
- Implementation(const DepList * const d, std::shared_ptr<const DestinationsSet> dd,
+ Imp(const DepList * const d, std::shared_ptr<const DestinationsSet> dd,
const Environment * const e, const std::shared_ptr<const PackageID> & p) :
result(true),
dep_list(d),
@@ -63,7 +63,7 @@ namespace paludis
QueryVisitor::QueryVisitor(const DepList * const d, const std::shared_ptr<const DestinationsSet> & dd,
const Environment * const e, const std::shared_ptr<const PackageID> & id) :
- PrivateImplementationPattern<QueryVisitor>(d, dd, e, id)
+ Pimp<QueryVisitor>(d, dd, e, id)
{
}
diff --git a/paludis/query_visitor.hh b/paludis/query_visitor.hh
index 202aacf..f889a18 100644
--- a/paludis/query_visitor.hh
+++ b/paludis/query_visitor.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_QUERY_VISITOR_HH 1
#include <paludis/dep_list-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/dep_spec-fwd.hh>
/** \file
@@ -43,7 +43,7 @@ namespace paludis
* \nosubgrouping
*/
class QueryVisitor :
- private PrivateImplementationPattern<QueryVisitor>
+ private Pimp<QueryVisitor>
{
public:
///\name Basic operations
diff --git a/paludis/range_rewriter.cc b/paludis/range_rewriter.cc
index 87bd5ee..a38dc9e 100644
--- a/paludis/range_rewriter.cc
+++ b/paludis/range_rewriter.cc
@@ -26,7 +26,7 @@
#include <paludis/util/join.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/options.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/dep_spec.hh>
@@ -194,12 +194,12 @@ namespace
namespace paludis
{
template <>
- struct Implementation<RangeRewriter>
+ struct Imp<RangeRewriter>
{
bool invalid;
std::shared_ptr<RangeRewrittenPackageDepSpecData> spec_data;
- Implementation() :
+ Imp() :
invalid(false)
{
}
@@ -207,7 +207,7 @@ namespace paludis
}
RangeRewriter::RangeRewriter() :
- PrivateImplementationPattern<RangeRewriter>()
+ Pimp<RangeRewriter>()
{
}
diff --git a/paludis/range_rewriter.hh b/paludis/range_rewriter.hh
index 24aa26a..41962f6 100644
--- a/paludis/range_rewriter.hh
+++ b/paludis/range_rewriter.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_RANGE_REWRITER_HH 1
#include <paludis/spec_tree.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
/** \file
* Declarations for RangeRewriter, which is used internally by Deplist.
@@ -44,7 +44,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE RangeRewriter :
- private PrivateImplementationPattern<RangeRewriter>
+ private Pimp<RangeRewriter>
{
public:
///\name Basic operations
diff --git a/paludis/report_task.cc b/paludis/report_task.cc
index bfefc30..d7a7c9c 100644
--- a/paludis/report_task.cc
+++ b/paludis/report_task.cc
@@ -28,7 +28,7 @@
#include <paludis/generator.hh>
#include <paludis/filter.hh>
#include <paludis/filtered_generator.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/util/make_named_values.hh>
@@ -116,11 +116,11 @@ namespace
namespace paludis
{
template<>
- struct Implementation<ReportTask>
+ struct Imp<ReportTask>
{
Environment * const env;
- Implementation(Environment * const e) :
+ Imp(Environment * const e) :
env(e)
{
}
@@ -128,7 +128,7 @@ namespace paludis
}
ReportTask::ReportTask(Environment * const env) :
- PrivateImplementationPattern<ReportTask>(env)
+ Pimp<ReportTask>(env)
{
}
diff --git a/paludis/report_task.hh b/paludis/report_task.hh
index 6597d03..20ba664 100644
--- a/paludis/report_task.hh
+++ b/paludis/report_task.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPORT_TASK_HH
#define PALUDIS_GUARD_PALUDIS_REPORT_TASK_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/repository.hh>
#include <paludis/dep_tag-fwd.hh>
@@ -45,7 +45,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ReportTask :
- private PrivateImplementationPattern<ReportTask>
+ private Pimp<ReportTask>
{
protected:
///\name Basic operations
diff --git a/paludis/repositories/accounts/accounts_dep_key.cc b/paludis/repositories/accounts/accounts_dep_key.cc
index 702ea4d..dc8d8d9 100644
--- a/paludis/repositories/accounts/accounts_dep_key.cc
+++ b/paludis/repositories/accounts/accounts_dep_key.cc
@@ -28,7 +28,7 @@
#include <paludis/dep_spec.hh>
#include <paludis/formatter.hh>
#include <paludis/environment.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <sstream>
#include <list>
@@ -38,14 +38,14 @@ using namespace paludis::accounts_repository;
namespace paludis
{
template <>
- struct Implementation<AccountsDepKey>
+ struct Imp<AccountsDepKey>
{
const Environment * const env;
const std::shared_ptr<std::list<std::shared_ptr<PackageDepSpec> > > specs;
const std::shared_ptr<DependencySpecTree> tree;
const std::shared_ptr<DependenciesLabelSequence> initial_labels;
- Implementation(const Environment * const e, const std::shared_ptr<const Set<std::string> > & s) :
+ Imp(const Environment * const e, const std::shared_ptr<const Set<std::string> > & s) :
env(e),
specs(new std::list<std::shared_ptr<PackageDepSpec> >),
tree(new DependencySpecTree(std::make_shared<AllDepSpec>())),
@@ -68,7 +68,7 @@ namespace paludis
AccountsDepKey::AccountsDepKey(const Environment * const e,
const std::shared_ptr<const Set<std::string> > & s) :
- PrivateImplementationPattern<AccountsDepKey>(e, s)
+ Pimp<AccountsDepKey>(e, s)
{
}
diff --git a/paludis/repositories/accounts/accounts_dep_key.hh b/paludis/repositories/accounts/accounts_dep_key.hh
index 839f37c..b31cdc2 100644
--- a/paludis/repositories/accounts/accounts_dep_key.hh
+++ b/paludis/repositories/accounts/accounts_dep_key.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_ACCOUNTS_DEP_KEY_HH 1
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -29,7 +29,7 @@ namespace paludis
{
class AccountsDepKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<AccountsDepKey>
+ private Pimp<AccountsDepKey>
{
public:
AccountsDepKey(const Environment * const e,
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index 77b67a7..8609483 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/accounts/accounts_id.hh>
#include <paludis/repositories/accounts/accounts_dep_key.hh>
#include <paludis/repositories/accounts/accounts_installed_mask.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/options.hh>
#include <paludis/util/stringify.hh>
@@ -46,7 +46,7 @@ using namespace paludis::accounts_repository;
namespace paludis
{
template <>
- struct Implementation<AccountsID>
+ struct Imp<AccountsID>
{
const Environment * const env;
@@ -76,7 +76,7 @@ namespace paludis
mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > groupname_key;
mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > preferred_gid_key;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & f,
const FSEntry & l, const bool u, const bool m) :
@@ -99,8 +99,8 @@ AccountsID::AccountsID(const Environment * const e,
const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & f, const FSEntry & l,
const bool u, const bool m) :
- PrivateImplementationPattern<AccountsID>(e, q, r, f, l, u, m),
- _imp(PrivateImplementationPattern<AccountsID>::_imp)
+ Pimp<AccountsID>(e, q, r, f, l, u, m),
+ _imp(Pimp<AccountsID>::_imp)
{
if (_imp->mask)
add_mask(_imp->mask);
diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh
index 0740cac..f163a9e 100644
--- a/paludis/repositories/accounts/accounts_id.hh
+++ b/paludis/repositories/accounts/accounts_id.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_ACCOUNTS_ID_HH 1
#include <paludis/package_id.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -31,11 +31,11 @@ namespace paludis
class AccountsID :
public PackageID,
- private PrivateImplementationPattern<AccountsID>,
+ private Pimp<AccountsID>,
public std::enable_shared_from_this<AccountsID>
{
private:
- PrivateImplementationPattern<AccountsID>::ImpPtr & _imp;
+ Pimp<AccountsID>::ImpPtr & _imp;
void _add_metadata_keys() const;
void _need_file_keys() const;
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index 2335a98..a0367bb 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/accounts/accounts_repository_store.hh>
#include <paludis/repositories/accounts/dummy_accounts_handler.hh>
#include <paludis/repositories/accounts/passwd_accounts_handler.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/set.hh>
#include <paludis/util/active_object_ptr.hh>
@@ -72,7 +72,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<AccountsRepository>
+ struct Imp<AccountsRepository>
{
const std::shared_ptr<const AccountsRepositoryParams> params_if_not_installed;
const std::shared_ptr<const InstalledAccountsRepositoryParams> params_if_installed;
@@ -84,7 +84,7 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > > store;
- Implementation(AccountsRepository * const repo, const AccountsRepositoryParams & p) :
+ Imp(AccountsRepository * const repo, const AccountsRepositoryParams & p) :
params_if_not_installed(new AccountsRepositoryParams(p)),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format", mkt_significant, "accounts")),
store(DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > (
@@ -92,7 +92,7 @@ namespace paludis
{
}
- Implementation(AccountsRepository * const repo, const InstalledAccountsRepositoryParams & p) :
+ Imp(AccountsRepository * const repo, const InstalledAccountsRepositoryParams & p) :
params_if_installed(new InstalledAccountsRepositoryParams(p)),
handler_if_installed(make_handler(p.handler())),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format", mkt_significant, "installed-accounts")),
@@ -106,7 +106,7 @@ namespace paludis
}
AccountsRepository::AccountsRepository(const AccountsRepositoryParams & p) :
- PrivateImplementationPattern<AccountsRepository>(this, p),
+ Pimp<AccountsRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -118,13 +118,13 @@ AccountsRepository::AccountsRepository(const AccountsRepositoryParams & p) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<AccountsRepository>::_imp)
+ _imp(Pimp<AccountsRepository>::_imp)
{
_add_metadata_keys();
}
AccountsRepository::AccountsRepository(const InstalledAccountsRepositoryParams & p) :
- PrivateImplementationPattern<AccountsRepository>(this, p),
+ Pimp<AccountsRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -136,7 +136,7 @@ AccountsRepository::AccountsRepository(const InstalledAccountsRepositoryParams &
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<AccountsRepository>::_imp)
+ _imp(Pimp<AccountsRepository>::_imp)
{
_add_metadata_keys();
}
@@ -275,9 +275,9 @@ void
AccountsRepository::invalidate()
{
if (_imp->params_if_not_installed)
- _imp.reset(new Implementation<AccountsRepository>(this, *_imp->params_if_not_installed));
+ _imp.reset(new Imp<AccountsRepository>(this, *_imp->params_if_not_installed));
else
- _imp.reset(new Implementation<AccountsRepository>(this, *_imp->params_if_installed));
+ _imp.reset(new Imp<AccountsRepository>(this, *_imp->params_if_installed));
_add_metadata_keys();
}
@@ -458,5 +458,5 @@ AccountsRepository::accept_keywords_key() const
return make_null_shared_ptr();
}
-template class PrivateImplementationPattern<AccountsRepository>;
+template class Pimp<AccountsRepository>;
diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh
index 133a03d..6fb8d18 100644
--- a/paludis/repositories/accounts/accounts_repository.hh
+++ b/paludis/repositories/accounts/accounts_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/named_value.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/repository.hh>
namespace paludis
@@ -53,13 +53,13 @@ namespace paludis
};
class PALUDIS_VISIBLE AccountsRepository :
- private PrivateImplementationPattern<AccountsRepository>,
+ private Pimp<AccountsRepository>,
public Repository,
public RepositoryDestinationInterface,
public std::enable_shared_from_this<AccountsRepository>
{
private:
- PrivateImplementationPattern<AccountsRepository>::ImpPtr & _imp;
+ Pimp<AccountsRepository>::ImpPtr & _imp;
void _add_metadata_keys();
diff --git a/paludis/repositories/accounts/accounts_repository_store.cc b/paludis/repositories/accounts/accounts_repository_store.cc
index ff9ba0c..72b1684 100644
--- a/paludis/repositories/accounts/accounts_repository_store.cc
+++ b/paludis/repositories/accounts/accounts_repository_store.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/accounts/accounts_id.hh>
#include <paludis/repositories/accounts/installed_accounts_id.hh>
#include <paludis/repositories/accounts/accounts_exceptions.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -60,7 +60,7 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Implementation<AccountsRepositoryStore>
+ struct Imp<AccountsRepositoryStore>
{
const Environment * const env;
const AccountsRepository * const repo;
@@ -70,7 +70,7 @@ namespace paludis
mutable PackageNames package_names;
mutable IDs ids;
- Implementation(const Environment * const e, const AccountsRepository * const r, const bool i) :
+ Imp(const Environment * const e, const AccountsRepository * const r, const bool i) :
env(e),
repo(r),
installed(i),
@@ -86,7 +86,7 @@ AccountsRepositoryStore::AccountsRepositoryStore(
const Environment * const env,
const AccountsRepository * const repo,
const bool installed) :
- PrivateImplementationPattern<AccountsRepositoryStore>(env, repo, installed)
+ Pimp<AccountsRepositoryStore>(env, repo, installed)
{
_load(repo->shared_from_this());
}
@@ -315,5 +315,5 @@ AccountsRepositoryStore::package_ids(const QualifiedPackageName & p) const
return i->second;
}
-template class PrivateImplementationPattern<accounts_repository::AccountsRepositoryStore>;
+template class Pimp<accounts_repository::AccountsRepositoryStore>;
diff --git a/paludis/repositories/accounts/accounts_repository_store.hh b/paludis/repositories/accounts/accounts_repository_store.hh
index a192b9b..1e4477a 100644
--- a/paludis/repositories/accounts/accounts_repository_store.hh
+++ b/paludis/repositories/accounts/accounts_repository_store.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_ACCOUNTS_REPOSITORY_STORE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_ACCOUNTS_REPOSITORY_STORE_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -36,7 +36,7 @@ namespace paludis
struct AccountsRepository;
class PALUDIS_VISIBLE AccountsRepositoryStore :
- private PrivateImplementationPattern<AccountsRepositoryStore>
+ private Pimp<AccountsRepositoryStore>
{
private:
void _load(const std::shared_ptr<const Repository> & repo);
@@ -94,7 +94,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<accounts_repository::AccountsRepositoryStore>;
+ extern template class Pimp<accounts_repository::AccountsRepositoryStore>;
}
#endif
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index 08eeea3..ee90149 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/accounts/installed_accounts_id.hh>
#include <paludis/repositories/accounts/accounts_dep_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/options.hh>
#include <paludis/util/stringify.hh>
@@ -49,7 +49,7 @@ using namespace paludis::accounts_repository;
namespace paludis
{
template <>
- struct Implementation<InstalledAccountsID>
+ struct Imp<InstalledAccountsID>
{
const Environment * const env;
@@ -65,7 +65,7 @@ namespace paludis
const bool is_user;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
const bool u) :
env(e),
@@ -91,12 +91,12 @@ namespace
}
}
-const std::shared_ptr<Set<std::string> > Implementation<InstalledAccountsID>::behaviours_set = make_behaviours();
+const std::shared_ptr<Set<std::string> > Imp<InstalledAccountsID>::behaviours_set = make_behaviours();
InstalledAccountsID::InstalledAccountsID(const Environment * const e,
const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r, const bool u) :
- PrivateImplementationPattern<InstalledAccountsID>(e, q, r, u),
- _imp(PrivateImplementationPattern<InstalledAccountsID>::_imp)
+ Pimp<InstalledAccountsID>(e, q, r, u),
+ _imp(Pimp<InstalledAccountsID>::_imp)
{
add_metadata_key(_imp->behaviours_key);
}
diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh
index 3b7192d..1a55302 100644
--- a/paludis/repositories/accounts/installed_accounts_id.hh
+++ b/paludis/repositories/accounts/installed_accounts_id.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_ACCOUNTS_INSTALLED_ACCOUNTS_ID_HH 1
#include <paludis/package_id.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -31,11 +31,11 @@ namespace paludis
class InstalledAccountsID :
public PackageID,
- private PrivateImplementationPattern<InstalledAccountsID>,
+ private Pimp<InstalledAccountsID>,
public std::enable_shared_from_this<InstalledAccountsID>
{
private:
- PrivateImplementationPattern<InstalledAccountsID>::ImpPtr & _imp;
+ Pimp<InstalledAccountsID>::ImpPtr & _imp;
void _add_metadata_keys() const;
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index 1ae7bc2..f5644bc 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -19,7 +19,7 @@
*/
#include <paludis/environment.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/dep_spec.hh>
#include <paludis/dep_tag.hh>
#include <paludis/util/config_file.hh>
@@ -65,15 +65,15 @@ typedef std::unordered_map<
namespace paludis
{
template <>
- struct Implementation<CRANInstalledRepository>
+ struct Imp<CRANInstalledRepository>
{
CRANInstalledRepositoryParams params;
mutable bool has_ids;
mutable IDMap ids;
- Implementation(const CRANInstalledRepositoryParams &);
- ~Implementation();
+ Imp(const CRANInstalledRepositoryParams &);
+ ~Imp();
std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key;
@@ -81,7 +81,7 @@ namespace paludis
};
}
-Implementation<CRANInstalledRepository>::Implementation(const CRANInstalledRepositoryParams & p) :
+Imp<CRANInstalledRepository>::Imp(const CRANInstalledRepositoryParams & p) :
params(p),
has_ids(false),
location_key(new LiteralMetadataValueKey<FSEntry> ("location", "location", mkt_significant, params.location())),
@@ -90,13 +90,13 @@ Implementation<CRANInstalledRepository>::Implementation(const CRANInstalledRepos
{
}
-Implementation<CRANInstalledRepository>::~Implementation()
+Imp<CRANInstalledRepository>::~Imp()
{
}
#if 0
void
-Implementation<CRANInstalledRepository>::need_ids() const
+Imp<CRANInstalledRepository>::need_ids() const
{
Context context("When loading CRANInstalledRepository IDs from '" + stringify(location) + "':");
@@ -170,8 +170,8 @@ CRANInstalledRepository::CRANInstalledRepository(const CRANInstalledRepositoryPa
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<CRANInstalledRepository>(p),
- _imp(PrivateImplementationPattern<CRANInstalledRepository>::_imp)
+ Pimp<CRANInstalledRepository>(p),
+ _imp(Pimp<CRANInstalledRepository>::_imp)
{
_add_metadata_keys();
}
@@ -452,7 +452,7 @@ CRANInstalledRepository::do_uninstall(const QualifiedPackageName & q, const Vers
void
CRANInstalledRepository::invalidate()
{
- _imp.reset(new Implementation<CRANInstalledRepository>(_imp->params));
+ _imp.reset(new Imp<CRANInstalledRepository>(_imp->params));
_add_metadata_keys();
}
diff --git a/paludis/repositories/cran/cran_installed_repository.hh b/paludis/repositories/cran/cran_installed_repository.hh
index 3f4630a..8c1a09c 100644
--- a/paludis/repositories/cran/cran_installed_repository.hh
+++ b/paludis/repositories/cran/cran_installed_repository.hh
@@ -23,7 +23,7 @@
#include <paludis/repository.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/map-fwd.hh>
@@ -65,10 +65,10 @@ namespace paludis
class PALUDIS_VISIBLE CRANInstalledRepository :
public Repository,
public RepositoryDestinationInterface,
- public PrivateImplementationPattern<CRANInstalledRepository>
+ public Pimp<CRANInstalledRepository>
{
private:
- PrivateImplementationPattern<CRANInstalledRepository>::ImpPtr & _imp;
+ Pimp<CRANInstalledRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_ids() const;
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index a84bfce..a2fb66e 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -31,7 +31,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/return_literal_function.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/literal_metadata_key.hh>
@@ -52,7 +52,7 @@ using namespace paludis::cranrepository;
namespace paludis
{
template <>
- struct Implementation<CRANPackageID>
+ struct Imp<CRANPackageID>
{
const Environment * const env;
@@ -76,7 +76,7 @@ namespace paludis
std::shared_ptr<DependenciesLabelSequence> suggests_labels;
std::shared_ptr<DependenciesLabelSequence> depends_labels;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const std::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
env(e),
repository(r),
@@ -90,7 +90,7 @@ namespace paludis
depends_labels->push_back(std::make_shared<DependenciesBuildLabel>("Depends", return_literal_function(true)));
}
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const std::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
env(e),
repository(c),
@@ -108,8 +108,8 @@ namespace paludis
}
CRANPackageID::CRANPackageID(const Environment * const env, const std::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
- PrivateImplementationPattern<CRANPackageID>(env, r, f),
- _imp(PrivateImplementationPattern<CRANPackageID>::_imp)
+ Pimp<CRANPackageID>(env, r, f),
+ _imp(Pimp<CRANPackageID>::_imp)
{
Context context("When parsing file '" + stringify(f) + "' to create a CRAN Package ID:");
@@ -277,8 +277,8 @@ CRANPackageID::CRANPackageID(const Environment * const env, const std::shared_pt
CRANPackageID::CRANPackageID(const Environment * const e,
const std::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
- PrivateImplementationPattern<CRANPackageID>(e, c, r, t),
- _imp(PrivateImplementationPattern<CRANPackageID>::_imp)
+ Pimp<CRANPackageID>(e, c, r, t),
+ _imp(Pimp<CRANPackageID>::_imp)
{
Context context("When creating contained ID '" + stringify(t) + "' in " + stringify(*r) + "':");
diff --git a/paludis/repositories/cran/cran_package_id.hh b/paludis/repositories/cran/cran_package_id.hh
index 0ecf2d3..6d32ce5 100644
--- a/paludis/repositories/cran/cran_package_id.hh
+++ b/paludis/repositories/cran/cran_package_id.hh
@@ -33,11 +33,11 @@ namespace paludis
{
class PALUDIS_VISIBLE CRANPackageID :
public PackageID,
- private PrivateImplementationPattern<CRANPackageID>,
+ private Pimp<CRANPackageID>,
public std::enable_shared_from_this<CRANPackageID>
{
private:
- PrivateImplementationPattern<CRANPackageID>::ImpPtr & _imp;
+ Pimp<CRANPackageID>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index fadd8db..83a5204 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -35,7 +35,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/map.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/system.hh>
@@ -65,7 +65,7 @@ typedef std::unordered_map<
namespace paludis
{
template <>
- struct Implementation<CRANRepository>
+ struct Imp<CRANRepository>
{
CRANRepositoryParams params;
@@ -73,8 +73,8 @@ namespace paludis
mutable bool has_ids;
mutable IDMap ids;
- Implementation(const CRANRepositoryParams &, const std::shared_ptr<Mutex> &);
- ~Implementation();
+ Imp(const CRANRepositoryParams &, const std::shared_ptr<Mutex> &);
+ ~Imp();
std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
std::shared_ptr<const MetadataValueKey<FSEntry> > distdir_key;
@@ -86,7 +86,7 @@ namespace paludis
};
}
-Implementation<CRANRepository>::Implementation(const CRANRepositoryParams & p, const std::shared_ptr<Mutex> & m) :
+Imp<CRANRepository>::Imp(const CRANRepositoryParams & p, const std::shared_ptr<Mutex> & m) :
params(p),
big_nasty_mutex(m),
has_ids(false),
@@ -100,7 +100,7 @@ Implementation<CRANRepository>::Implementation(const CRANRepositoryParams & p, c
{
}
-Implementation<CRANRepository>::~Implementation()
+Imp<CRANRepository>::~Imp()
{
}
@@ -117,8 +117,8 @@ CRANRepository::CRANRepository(const CRANRepositoryParams & p) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<CRANRepository>(p, std::make_shared<Mutex>()),
- _imp(PrivateImplementationPattern<CRANRepository>::_imp)
+ Pimp<CRANRepository>(p, std::make_shared<Mutex>()),
+ _imp(Pimp<CRANRepository>::_imp)
{
_add_metadata_keys();
}
@@ -459,7 +459,7 @@ CRANRepositoryConfigurationError::CRANRepositoryConfigurationError(
void
CRANRepository::invalidate()
{
- _imp.reset(new Implementation<CRANRepository>(_imp->params, _imp->big_nasty_mutex));
+ _imp.reset(new Imp<CRANRepository>(_imp->params, _imp->big_nasty_mutex));
_add_metadata_keys();
}
diff --git a/paludis/repositories/cran/cran_repository.hh b/paludis/repositories/cran/cran_repository.hh
index e21dac5..1a7ecc2 100644
--- a/paludis/repositories/cran/cran_repository.hh
+++ b/paludis/repositories/cran/cran_repository.hh
@@ -23,7 +23,7 @@
#include <paludis/repository.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/environment-fwd.hh>
#include <memory>
#include <string>
@@ -75,11 +75,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE CRANRepository :
public Repository,
- private PrivateImplementationPattern<CRANRepository>,
+ private Pimp<CRANRepository>,
public std::enable_shared_from_this<CRANRepository>
{
private:
- PrivateImplementationPattern<CRANRepository>::ImpPtr & _imp;
+ Pimp<CRANRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_ids() const;
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.cc b/paludis/repositories/cran/dep_spec_pretty_printer.cc
index 6d00eac..f89abab 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/cran/dep_spec_pretty_printer.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/fs_entry.hh>
@@ -38,7 +38,7 @@ using namespace paludis::cranrepository;
namespace paludis
{
template <>
- struct Implementation<DepSpecPrettyPrinter>
+ struct Imp<DepSpecPrettyPrinter>
{
std::stringstream s;
const Environment * const env;
@@ -47,7 +47,7 @@ namespace paludis
const bool multiline;
bool need_comma;
- Implementation(
+ Imp(
const Environment * const e,
const GenericSpecTree::ItemFormatter & f,
const unsigned u,
@@ -64,7 +64,7 @@ namespace paludis
DepSpecPrettyPrinter::DepSpecPrettyPrinter(const Environment * const e,
const GenericSpecTree::ItemFormatter & f, const unsigned initial_indent, const bool multiline) :
- PrivateImplementationPattern<DepSpecPrettyPrinter>(e, f, initial_indent, multiline)
+ Pimp<DepSpecPrettyPrinter>(e, f, initial_indent, multiline)
{
}
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.hh b/paludis/repositories/cran/dep_spec_pretty_printer.hh
index 6db6d0b..d2ddf4a 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_CRAN_DEP_SPEC_PRETTY_PRINTER_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_CRAN_DEP_SPEC_PRETTY_PRINTER_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/spec_tree.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/formatter.hh>
@@ -37,7 +37,7 @@ namespace paludis
* \ingroup grpcranrepository
*/
class PALUDIS_VISIBLE DepSpecPrettyPrinter :
- private PrivateImplementationPattern<DepSpecPrettyPrinter>
+ private Pimp<DepSpecPrettyPrinter>
{
friend std::ostream & operator<< (std::ostream &, const DepSpecPrettyPrinter &);
diff --git a/paludis/repositories/cran/description_file.cc b/paludis/repositories/cran/description_file.cc
index f61f301..d1045e9 100644
--- a/paludis/repositories/cran/description_file.cc
+++ b/paludis/repositories/cran/description_file.cc
@@ -18,7 +18,7 @@
*/
#include "description_file.hh"
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/stringify.hh>
@@ -32,14 +32,14 @@ using namespace paludis::cranrepository;
namespace paludis
{
template <>
- struct Implementation<DescriptionFile>
+ struct Imp<DescriptionFile>
{
std::map<std::string, std::string> values;
};
}
DescriptionFile::DescriptionFile(const Source & sr) :
- PrivateImplementationPattern<DescriptionFile>()
+ Pimp<DescriptionFile>()
{
Context c("When parsing CRAN description file '" + sr.filename() + "':");
diff --git a/paludis/repositories/cran/description_file.hh b/paludis/repositories/cran/description_file.hh
index f738804..7984cd8 100644
--- a/paludis/repositories/cran/description_file.hh
+++ b/paludis/repositories/cran/description_file.hh
@@ -29,7 +29,7 @@ namespace paludis
{
class PALUDIS_VISIBLE DescriptionFile :
public ConfigFile,
- private PrivateImplementationPattern<DescriptionFile>
+ private Pimp<DescriptionFile>
{
private:
void _line(const std::string &);
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index 20df6a9..10d4d1f 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.cc
@@ -139,7 +139,7 @@ PackageIDKey::pretty_print(const Formatter<PackageID> & f) const
namespace paludis
{
template <>
- struct Implementation<DepKey>
+ struct Imp<DepKey>
{
const Environment * const env;
const std::string v;
@@ -152,7 +152,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::string & vv,
+ Imp(const Environment * const e, const std::string & vv,
const std::shared_ptr<const DependenciesLabelSequence> & s,
const std::string & r, const std::string & h, const MetadataKeyType & t) :
env(e),
@@ -168,8 +168,8 @@ namespace paludis
DepKey::DepKey(const Environment * const e, const std::string & r, const std::string & h, const std::string & v,
const std::shared_ptr<const DependenciesLabelSequence> & s, const MetadataKeyType t) :
- PrivateImplementationPattern<DepKey>(e, v, s, r, h, t),
- _imp(PrivateImplementationPattern<DepKey>::_imp)
+ Pimp<DepKey>(e, v, s, r, h, t),
+ _imp(Pimp<DepKey>::_imp)
{
}
diff --git a/paludis/repositories/cran/keys.hh b/paludis/repositories/cran/keys.hh
index 1831f6a..bb10301 100644
--- a/paludis/repositories/cran/keys.hh
+++ b/paludis/repositories/cran/keys.hh
@@ -85,10 +85,10 @@ namespace paludis
class DepKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<DepKey>
+ private Pimp<DepKey>
{
private:
- PrivateImplementationPattern<DepKey>::ImpPtr & _imp;
+ Pimp<DepKey>::ImpPtr & _imp;
public:
DepKey(const Environment * const,
diff --git a/paludis/repositories/cran/masks.cc b/paludis/repositories/cran/masks.cc
index 067bbdc..1612f61 100644
--- a/paludis/repositories/cran/masks.cc
+++ b/paludis/repositories/cran/masks.cc
@@ -18,7 +18,7 @@
*/
#include "masks.hh"
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
using namespace paludis;
using namespace paludis::cranrepository;
@@ -26,13 +26,13 @@ using namespace paludis::cranrepository;
namespace paludis
{
template <>
- struct Implementation<BrokenMask>
+ struct Imp<BrokenMask>
{
const char key;
const std::string description;
const std::string explanation;
- Implementation(const char k, const std::string & d, const std::string & e) :
+ Imp(const char k, const std::string & d, const std::string & e) :
key(k),
description(d),
explanation(e)
@@ -42,7 +42,7 @@ namespace paludis
}
BrokenMask::BrokenMask(const char c, const std::string & d, const std::string & e) :
- PrivateImplementationPattern<BrokenMask>(c, d, e)
+ Pimp<BrokenMask>(c, d, e)
{
}
diff --git a/paludis/repositories/cran/masks.hh b/paludis/repositories/cran/masks.hh
index 0f658c8..58d277b 100644
--- a/paludis/repositories/cran/masks.hh
+++ b/paludis/repositories/cran/masks.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_PALUDIS_REPOSITORIES_CRAN_MASKS_HH 1
#include <paludis/mask.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -29,7 +29,7 @@ namespace paludis
{
class BrokenMask :
public UnsupportedMask,
- private PrivateImplementationPattern<BrokenMask>
+ private Pimp<BrokenMask>
{
public:
BrokenMask(const char, const std::string &, const std::string &);
diff --git a/paludis/repositories/e/aa_visitor.cc b/paludis/repositories/e/aa_visitor.cc
index 0322ffe..e1b4048 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 b97d627..1dec5cc 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 991391c..03fe767 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 9f6d3a3..ecfb27c 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 ed91bad..0c74312 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 da2a582..78c81c3 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 a000e24..ef91959 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 a501825..f2f0c71 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 a2dfa9e..5dd7a99 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 134ae3b..00e921e 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 675b164..01754ad 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 a492208..7b3e27b 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 f5d7799..d409963 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 0b2dcac..12f4985 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 3650f3a..1e50699 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 da66a26..626113f 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 71b6f46..e25c1f3 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 cb30815..0379b59 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 698a8fd..e5e2ca7 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 218abf0..e2345c9 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 3af26c4..0c9e411 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 d1c4a3b..fdb7fd8 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 30f9a4e..ce6e1c4 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 81b46b6..cb15a45 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 c551fef..0b3ba46 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 38906b2..e0e5961 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 7ead11d..922b78c 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 ca82cc2..1d7c012 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 2073956..c4993cb 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 278de16..40127bb 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 4315516..692f008 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 a1ebebc..86bb324 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 7b3e485..2b7b2cd 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 a497b72..ec44068 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 aa7cc1a..6f5c561 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 611e955..3e9099d 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 6ee633c..5fea7b2 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 4910ad5..059b992 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 5ab0fbc..74d9387 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 15cb88b..c4c26d2 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 f1d5805..27c1c42 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 abedc19..3550a61 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 9d53b63..9aff0e2 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 b1daffe..6ca2933 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 7c328b2..d250cff 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 4c4346a..e85d4b7 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 ca9a2e9..81fcc19 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 ebaacba..ee240c8 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 25fc162..6d45170 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 599f6e6..2396412 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 240ed75..71b207c 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 1e88c03..aa45fe5 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 803a790..afd7d13 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 4f0abf3..00552c1 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 5458965..a20f0fe 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 8b0c022..44c8ae1 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 924a1e8..03a4b05 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 ad33dfa..75801a6 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 db266da..6c81f6c 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 86db379..48e46f1 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 5e411e2..d975541 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 5f70c6f..30fbebc 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 ca2efd2..eae5140 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 b10b94b..8c2ff9b 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 e4c55cf..7281bab 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 dcc1fea..05d6541 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 b7009ec..eb3d113 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 fcdf0f6..1e33aa3 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 2b03697..aeae22d 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 8982419..51bb9ca 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 f15e1fd..521e898 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 364b68f..4ef716b 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 f8465d6..214141a 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 83ee884..0408d85 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 e173495..9b2f210 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 12b11db..447e9de 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 b510d2c..529d1f4 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 81d16dc..4434322 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 1d56ab8..0346887 100644
--- a/paludis/repositories/e/xml_things_handle.hh
+++ b/paludis/repositories/e/xml_things_handle.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/e/glsa.hh>
#include <paludis/repositories/e/metadata_xml.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/singleton.hh>
#include <paludis/util/fs_entry-fwd.hh>
@@ -31,7 +31,7 @@ namespace paludis
namespace erepository
{
class PALUDIS_VISIBLE XMLThingsHandle :
- private PrivateImplementationPattern<XMLThingsHandle>,
+ private Pimp<XMLThingsHandle>,
public Singleton<XMLThingsHandle>
{
friend class Singleton<XMLThingsHandle>;
@@ -51,7 +51,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<erepository::XMLThingsHandle>;
+ extern template class Pimp<erepository::XMLThingsHandle>;
extern template class Singleton<erepository::XMLThingsHandle>;
}
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index bb0f111..2d84b83 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -32,21 +32,21 @@
#include <paludis/action.hh>
#include <paludis/literal_metadata_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<FakeInstalledRepository>
+ struct Imp<FakeInstalledRepository>
{
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key;
const bool supports_uninstall;
const bool is_suitable_destination;
- Implementation(const bool s, const bool b) :
+ Imp(const bool s, const bool b) :
format_key(new LiteralMetadataValueKey<std::string> (
"format", "format", mkt_significant, "installed_fake")),
installed_root_key(new LiteralMetadataValueKey<FSEntry> (
@@ -67,8 +67,8 @@ FakeInstalledRepository::FakeInstalledRepository(const FakeInstalledRepositoryPa
n::provides_interface() = this,
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<FakeInstalledRepository>(p.supports_uninstall(), p.suitable_destination()),
- _imp(PrivateImplementationPattern<FakeInstalledRepository>::_imp)
+ Pimp<FakeInstalledRepository>(p.supports_uninstall(), p.suitable_destination()),
+ _imp(Pimp<FakeInstalledRepository>::_imp)
{
add_metadata_key(_imp->format_key);
add_metadata_key(_imp->installed_root_key);
diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh
index c0d50fb..9306cc6 100644
--- a/paludis/repositories/fake/fake_installed_repository.hh
+++ b/paludis/repositories/fake/fake_installed_repository.hh
@@ -52,10 +52,10 @@ namespace paludis
public FakeRepositoryBase,
public RepositoryDestinationInterface,
public RepositoryProvidesInterface,
- private PrivateImplementationPattern<FakeInstalledRepository>
+ private Pimp<FakeInstalledRepository>
{
private:
- PrivateImplementationPattern<FakeInstalledRepository>::ImpPtr & _imp;
+ Pimp<FakeInstalledRepository>::ImpPtr & _imp;
protected:
/* RepositoryDestinationInterface */
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 2449828..f70efeb 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -31,7 +31,7 @@
#include <paludis/user_dep_spec.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/set.hh>
#include <paludis/util/create_iterator-impl.hh>
@@ -53,14 +53,14 @@ using namespace paludis::fakerepository;
namespace paludis
{
template <typename C_>
- struct Implementation<FakeMetadataValueKey<C_> >
+ struct Imp<FakeMetadataValueKey<C_> >
{
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
C_ value;
- Implementation(const std::string & r, const std::string & h, const MetadataKeyType t, const C_ & c) :
+ Imp(const std::string & r, const std::string & h, const MetadataKeyType t, const C_ & c) :
raw_name(r),
human_name(h),
type(t),
@@ -73,8 +73,8 @@ namespace paludis
template <typename C_>
FakeMetadataValueKey<C_>::FakeMetadataValueKey(
const std::string & r, const std::string & h, const MetadataKeyType t, const C_ & c) :
- PrivateImplementationPattern<FakeMetadataValueKey<C_> >(r, h, t, c),
- _imp(PrivateImplementationPattern<FakeMetadataValueKey<C_> >::_imp)
+ Pimp<FakeMetadataValueKey<C_> >(r, h, t, c),
+ _imp(Pimp<FakeMetadataValueKey<C_> >::_imp)
{
}
@@ -128,7 +128,7 @@ FakeMetadataValueKey<C_>::set_value(const C_ & c)
namespace paludis
{
template <typename C_>
- struct Implementation<FakeMetadataCollectionKey<C_> >
+ struct Imp<FakeMetadataCollectionKey<C_> >
{
std::shared_ptr<C_> collection;
const PackageID * const id;
@@ -138,7 +138,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const PackageID * const i, const Environment * const e,
+ Imp(const PackageID * const i, const Environment * const e,
const std::string & r, const std::string & h, const MetadataKeyType t) :
id(i),
env(e),
@@ -154,8 +154,8 @@ template <typename C_>
FakeMetadataCollectionKey<C_>::FakeMetadataCollectionKey(
const std::string & r, const std::string & h, const MetadataKeyType t, const PackageID * const i,
const Environment * const e) :
- PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >(i, e, r, h, t),
- _imp(PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >::_imp)
+ Pimp<FakeMetadataCollectionKey<C_> >(i, e, r, h, t),
+ _imp(Pimp<FakeMetadataCollectionKey<C_> >::_imp)
{
}
@@ -210,7 +210,7 @@ FakeMetadataKeywordSetKey::set_from_string(const std::string & s)
namespace paludis
{
template <typename C_>
- struct Implementation<FakeMetadataSpecTreeKey<C_> >
+ struct Imp<FakeMetadataSpecTreeKey<C_> >
{
std::shared_ptr<const C_> value;
std::string string_value;
@@ -220,7 +220,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::function<const std::shared_ptr<const C_> (const std::string &)> & f,
+ Imp(const std::function<const std::shared_ptr<const C_> (const std::string &)> & f,
const std::string & r, const std::string & h, const MetadataKeyType t) :
func(f),
raw_name(r),
@@ -231,7 +231,7 @@ namespace paludis
};
template <>
- struct Implementation<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
+ struct Imp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
{
std::shared_ptr<const FetchableURISpecTree> value;
std::string string_value;
@@ -242,7 +242,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::function<const std::shared_ptr<const FetchableURISpecTree> (const std::string &)> & f,
+ Imp(const std::function<const std::shared_ptr<const FetchableURISpecTree> (const std::string &)> & f,
const std::string & r, const std::string & h, const MetadataKeyType t) :
func(f),
initial_label(new URIListedThenMirrorsLabel("listed-then-mirrors")),
@@ -254,7 +254,7 @@ namespace paludis
};
template <>
- struct Implementation<FakeMetadataSpecTreeKey<DependencySpecTree> >
+ struct Imp<FakeMetadataSpecTreeKey<DependencySpecTree> >
{
std::shared_ptr<const DependencySpecTree> value;
std::string string_value;
@@ -265,7 +265,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::function<const std::shared_ptr<const DependencySpecTree> (const std::string &)> & f,
+ Imp(const std::function<const std::shared_ptr<const DependencySpecTree> (const std::string &)> & f,
const std::shared_ptr<const DependenciesLabelSequence> & s,
const std::string & r, const std::string & h, const MetadataKeyType t) :
func(f),
@@ -281,8 +281,8 @@ namespace paludis
template <typename C_>
FakeMetadataSpecTreeKey<C_>::FakeMetadataSpecTreeKey(const std::string & r, const std::string & h, const std::string & v,
const std::function<const std::shared_ptr<const C_> (const std::string &)> & f, const MetadataKeyType t) :
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<C_> >(f, r, h, t),
- _imp(PrivateImplementationPattern<FakeMetadataSpecTreeKey<C_> >::_imp)
+ Pimp<FakeMetadataSpecTreeKey<C_> >(f, r, h, t),
+ _imp(Pimp<FakeMetadataSpecTreeKey<C_> >::_imp)
{
set_from_string(v);
}
@@ -344,8 +344,8 @@ FakeMetadataSpecTreeKey<C_>::pretty_print_flat(const typename C_::ItemFormatter
FakeMetadataSpecTreeKey<FetchableURISpecTree>::FakeMetadataSpecTreeKey(const std::string & r, const std::string & h, const std::string & v,
const std::function<const std::shared_ptr<const FetchableURISpecTree> (const std::string &)> & f, const MetadataKeyType t) :
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<FetchableURISpecTree> >(f, r, h, t),
- _imp(PrivateImplementationPattern<FakeMetadataSpecTreeKey<FetchableURISpecTree> >::_imp)
+ Pimp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >(f, r, h, t),
+ _imp(Pimp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >::_imp)
{
set_from_string(v);
}
@@ -406,8 +406,8 @@ FakeMetadataSpecTreeKey<FetchableURISpecTree>::initial_label() const
FakeMetadataSpecTreeKey<DependencySpecTree>::FakeMetadataSpecTreeKey(const std::string & r, const std::string & h, const std::string & v,
const std::function<const std::shared_ptr<const DependencySpecTree> (const std::string &)> & f,
const std::shared_ptr<const DependenciesLabelSequence> & s, const MetadataKeyType t) :
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<DependencySpecTree> >(f, s, r, h, t),
- _imp(PrivateImplementationPattern<FakeMetadataSpecTreeKey<DependencySpecTree> >::_imp)
+ Pimp<FakeMetadataSpecTreeKey<DependencySpecTree> >(f, s, r, h, t),
+ _imp(Pimp<FakeMetadataSpecTreeKey<DependencySpecTree> >::_imp)
{
set_from_string(v);
}
@@ -468,14 +468,14 @@ FakeMetadataSpecTreeKey<DependencySpecTree>::type() const
namespace paludis
{
template <>
- struct Implementation<FakeMetadataChoicesKey>
+ struct Imp<FakeMetadataChoicesKey>
{
const Environment * const env;
const std::shared_ptr<const PackageID> id;
std::shared_ptr<Choices> value;
std::map<std::string, std::shared_ptr<Choice> > choices;
- Implementation(const Environment * const e, const std::shared_ptr<const PackageID> & i) :
+ Imp(const Environment * const e, const std::shared_ptr<const PackageID> & i) :
env(e),
id(i),
value(new Choices)
@@ -550,8 +550,8 @@ namespace
FakeMetadataChoicesKey::FakeMetadataChoicesKey(const Environment * const e,
const std::shared_ptr<const PackageID> & i) :
- PrivateImplementationPattern<FakeMetadataChoicesKey>(e, i),
- _imp(PrivateImplementationPattern<FakeMetadataChoicesKey>::_imp)
+ Pimp<FakeMetadataChoicesKey>(e, i),
+ _imp(Pimp<FakeMetadataChoicesKey>::_imp)
{
}
@@ -608,13 +608,13 @@ FakeMetadataChoicesKey::type() const
namespace paludis
{
template <>
- struct Implementation<FakeUnacceptedMask>
+ struct Imp<FakeUnacceptedMask>
{
const char key;
const std::string description;
const std::shared_ptr<const MetadataKey> unaccepted_key;
- Implementation(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
+ Imp(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
key(k),
description(d),
unaccepted_key(u)
@@ -624,7 +624,7 @@ namespace paludis
}
FakeUnacceptedMask::FakeUnacceptedMask(const char c, const std::string & s, const std::shared_ptr<const MetadataKey> & k) :
- PrivateImplementationPattern<FakeUnacceptedMask>(c, s, k)
+ Pimp<FakeUnacceptedMask>(c, s, k)
{
}
@@ -681,7 +681,7 @@ namespace paludis
using namespace std::placeholders;
template <>
- struct Implementation<FakePackageID>
+ struct Imp<FakePackageID>
{
mutable Mutex mutex;
@@ -717,7 +717,7 @@ namespace paludis
std::shared_ptr<Mask> unsupported_mask;
mutable bool has_masks;
- Implementation(const Environment * const e, const std::shared_ptr<const FakeRepositoryBase> & r,
+ Imp(const Environment * const e, const std::shared_ptr<const FakeRepositoryBase> & r,
const QualifiedPackageName & q, const VersionSpec & v, const PackageID * const id) :
env(e),
repository(r),
@@ -746,8 +746,8 @@ namespace paludis
FakePackageID::FakePackageID(const Environment * const e, const std::shared_ptr<const FakeRepositoryBase> & r,
const QualifiedPackageName & q, const VersionSpec & v) :
- PrivateImplementationPattern<FakePackageID>(e, r, q, v, this),
- _imp(PrivateImplementationPattern<FakePackageID>::_imp)
+ Pimp<FakePackageID>(e, r, q, v, this),
+ _imp(Pimp<FakePackageID>::_imp)
{
add_metadata_key(_imp->keywords);
}
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index e4e4494..a0b17fb 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -33,10 +33,10 @@ namespace paludis
template <typename C_>
class PALUDIS_VISIBLE FakeMetadataValueKey :
public MetadataValueKey<C_>,
- private PrivateImplementationPattern<FakeMetadataValueKey<C_> >
+ private Pimp<FakeMetadataValueKey<C_> >
{
protected:
- typename PrivateImplementationPattern<FakeMetadataValueKey<C_> >::ImpPtr & _imp;
+ typename Pimp<FakeMetadataValueKey<C_> >::ImpPtr & _imp;
public:
FakeMetadataValueKey(const std::string &, const std::string &, const MetadataKeyType,
@@ -58,10 +58,10 @@ namespace paludis
template <typename C_>
class PALUDIS_VISIBLE FakeMetadataCollectionKey :
public MetadataCollectionKey<C_>,
- private PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >
+ private Pimp<FakeMetadataCollectionKey<C_> >
{
protected:
- typename PrivateImplementationPattern<FakeMetadataCollectionKey<C_> >::ImpPtr & _imp;
+ typename Pimp<FakeMetadataCollectionKey<C_> >::ImpPtr & _imp;
FakeMetadataCollectionKey(const std::string &, const std::string &, const MetadataKeyType,
const PackageID * const, const Environment * const);
@@ -92,10 +92,10 @@ namespace paludis
template <typename C_>
class PALUDIS_VISIBLE FakeMetadataSpecTreeKey :
public MetadataSpecTreeKey<C_>,
- private PrivateImplementationPattern<FakeMetadataSpecTreeKey<C_> >
+ private Pimp<FakeMetadataSpecTreeKey<C_> >
{
private:
- typename PrivateImplementationPattern<FakeMetadataSpecTreeKey<C_> >::ImpPtr & _imp;
+ typename Pimp<FakeMetadataSpecTreeKey<C_> >::ImpPtr & _imp;
public:
FakeMetadataSpecTreeKey(const std::string &, const std::string &, const std::string &,
@@ -121,10 +121,10 @@ namespace paludis
template <>
class PALUDIS_VISIBLE FakeMetadataSpecTreeKey<FetchableURISpecTree> :
public MetadataSpecTreeKey<FetchableURISpecTree>,
- private PrivateImplementationPattern<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
+ private Pimp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >
{
private:
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<FetchableURISpecTree> >::ImpPtr & _imp;
+ Pimp<FakeMetadataSpecTreeKey<FetchableURISpecTree> >::ImpPtr & _imp;
public:
FakeMetadataSpecTreeKey(const std::string &, const std::string &, const std::string &,
@@ -154,10 +154,10 @@ namespace paludis
template <>
class PALUDIS_VISIBLE FakeMetadataSpecTreeKey<DependencySpecTree> :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<FakeMetadataSpecTreeKey<DependencySpecTree> >
+ private Pimp<FakeMetadataSpecTreeKey<DependencySpecTree> >
{
private:
- PrivateImplementationPattern<FakeMetadataSpecTreeKey<DependencySpecTree> >::ImpPtr & _imp;
+ Pimp<FakeMetadataSpecTreeKey<DependencySpecTree> >::ImpPtr & _imp;
public:
FakeMetadataSpecTreeKey(const std::string &, const std::string &, const std::string &,
@@ -187,10 +187,10 @@ namespace paludis
class PALUDIS_VISIBLE FakeMetadataChoicesKey :
public MetadataValueKey<std::shared_ptr<const Choices> >,
- private PrivateImplementationPattern<FakeMetadataChoicesKey>
+ private Pimp<FakeMetadataChoicesKey>
{
private:
- PrivateImplementationPattern<FakeMetadataChoicesKey>::ImpPtr & _imp;
+ Pimp<FakeMetadataChoicesKey>::ImpPtr & _imp;
public:
FakeMetadataChoicesKey(
@@ -208,7 +208,7 @@ namespace paludis
class PALUDIS_VISIBLE FakeUnacceptedMask :
public UnacceptedMask,
- private PrivateImplementationPattern<FakeUnacceptedMask>
+ private Pimp<FakeUnacceptedMask>
{
public:
FakeUnacceptedMask(const char, const std::string &, const std::shared_ptr<const MetadataKey> &);
@@ -241,11 +241,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE FakePackageID :
public PackageID,
- private PrivateImplementationPattern<FakePackageID>,
+ private Pimp<FakePackageID>,
public std::enable_shared_from_this<FakePackageID>
{
private:
- PrivateImplementationPattern<FakePackageID>::ImpPtr & _imp;
+ Pimp<FakePackageID>::ImpPtr & _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index 83bb447..fa61e29 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/repositories/fake/fake_package_id.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -38,12 +38,12 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<FakeRepository>
+ struct Imp<FakeRepository>
{
std::shared_ptr<FakeRepository::VirtualsSequence> virtual_packages;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation() :
+ Imp() :
virtual_packages(new FakeRepository::VirtualsSequence),
format_key(new LiteralMetadataValueKey<std::string> (
"format", "format", mkt_significant, "fake"))
@@ -53,7 +53,7 @@ namespace paludis
}
FakeRepository::FakeRepository(const FakeRepositoryParams & params) :
- PrivateImplementationPattern<FakeRepository>(),
+ Pimp<FakeRepository>(),
FakeRepositoryBase(params.environment(), params.name(), make_named_values<RepositoryCapabilities>(
n::destination_interface() = static_cast<RepositoryDestinationInterface *>(0),
n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
@@ -63,7 +63,7 @@ FakeRepository::FakeRepository(const FakeRepositoryParams & params) :
n::virtuals_interface() = (*DistributionData::get_instance()->distribution_from_string(
params.environment()->distribution())).support_old_style_virtuals() ? this : 0
)),
- _imp(PrivateImplementationPattern<FakeRepository>::_imp)
+ _imp(Pimp<FakeRepository>::_imp)
{
add_metadata_key(_imp->format_key);
}
diff --git a/paludis/repositories/fake/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh
index 77272af..8b9c886 100644
--- a/paludis/repositories/fake/fake_repository.hh
+++ b/paludis/repositories/fake/fake_repository.hh
@@ -51,12 +51,12 @@ namespace paludis
* \ingroup grpfakerepository
*/
class PALUDIS_VISIBLE FakeRepository :
- private PrivateImplementationPattern<FakeRepository>,
+ private Pimp<FakeRepository>,
public FakeRepositoryBase,
public RepositoryVirtualsInterface
{
private:
- PrivateImplementationPattern<FakeRepository>::ImpPtr & _imp;
+ Pimp<FakeRepository>::ImpPtr & _imp;
public:
///\name Basic operations
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index 2b28bdf..8f9a97e 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/fake/fake_repository_base.hh>
#include <paludis/repositories/fake/fake_package_id.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
@@ -33,7 +33,7 @@
#include <algorithm>
/** \file
- * Implementation for FakeRepositoryBase.
+ * Imp for FakeRepositoryBase.
*
* \ingroup grpfakerepository
*/
@@ -43,7 +43,7 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<FakeRepositoryBase>
+ struct Imp<FakeRepositoryBase>
{
std::shared_ptr<CategoryNamePartSet> category_names;
std::map<CategoryNamePart, std::shared_ptr<PackageNamePartSet> > package_names;
@@ -51,10 +51,10 @@ namespace paludis
const Environment * const env;
- Implementation(const Environment * const);
+ Imp(const Environment * const);
};
- Implementation<FakeRepositoryBase>::Implementation(const Environment * const e) :
+ Imp<FakeRepositoryBase>::Imp(const Environment * const e) :
category_names(new CategoryNamePartSet),
env(e)
{
@@ -64,8 +64,8 @@ namespace paludis
FakeRepositoryBase::FakeRepositoryBase(const Environment * const e,
const RepositoryName & our_name, const RepositoryCapabilities & caps) :
Repository(e, our_name, caps),
- PrivateImplementationPattern<FakeRepositoryBase>(e),
- _imp(PrivateImplementationPattern<FakeRepositoryBase>::_imp)
+ Pimp<FakeRepositoryBase>(e),
+ _imp(Pimp<FakeRepositoryBase>::_imp)
{
}
diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh
index 762c5c7..83bd07b 100644
--- a/paludis/repositories/fake/fake_repository_base.hh
+++ b/paludis/repositories/fake/fake_repository_base.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/action-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
/** \file
* Declarations for the FakeRepositoryBase class.
@@ -44,11 +44,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE FakeRepositoryBase :
public Repository,
- private PrivateImplementationPattern<FakeRepositoryBase>,
+ private Pimp<FakeRepositoryBase>,
public std::enable_shared_from_this<FakeRepositoryBase>
{
private:
- PrivateImplementationPattern<FakeRepositoryBase>::ImpPtr & _imp;
+ Pimp<FakeRepositoryBase>::ImpPtr & _imp;
protected:
/**
diff --git a/paludis/repositories/gems/gem_specification.cc b/paludis/repositories/gems/gem_specification.cc
index a223bd6..961a01c 100644
--- a/paludis/repositories/gems/gem_specification.cc
+++ b/paludis/repositories/gems/gem_specification.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/gems/gem_specification.hh>
#include <paludis/repositories/gems/yaml.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/make_named_values.hh>
@@ -41,7 +41,7 @@ using namespace paludis::gems;
namespace paludis
{
template <>
- struct Implementation<GemSpecification>
+ struct Imp<GemSpecification>
{
mutable Mutex mutex;
@@ -65,7 +65,7 @@ namespace paludis
mutable bool has_masks;
- Implementation(const Environment * const e, const std::shared_ptr<const Repository> & r) :
+ Imp(const Environment * const e, const std::shared_ptr<const Repository> & r) :
environment(e),
repository(r),
has_masks(false)
@@ -195,9 +195,9 @@ namespace
struct TopVisitor
{
- Implementation<GemSpecification> * const _imp;
+ Imp<GemSpecification> * const _imp;
- TopVisitor(Implementation<GemSpecification> * const i) :
+ TopVisitor(Imp<GemSpecification> * const i) :
_imp(i)
{
}
@@ -245,8 +245,8 @@ namespace
GemSpecification::GemSpecification(const Environment * const e,
const std::shared_ptr<const Repository> & r, const yaml::Node & node) :
- PrivateImplementationPattern<GemSpecification>(e, r),
- _imp(PrivateImplementationPattern<GemSpecification>::_imp)
+ Pimp<GemSpecification>(e, r),
+ _imp(Pimp<GemSpecification>::_imp)
{
TopVisitor v(_imp.get());
node.accept(v);
@@ -267,8 +267,8 @@ GemSpecification::GemSpecification(const Environment * const e,
GemSpecification::GemSpecification(const Environment * const e, const std::shared_ptr<const Repository> & r,
const PackageNamePart & q, const VersionSpec & v, const FSEntry & f) :
- PrivateImplementationPattern<GemSpecification>(e, r),
- _imp(PrivateImplementationPattern<GemSpecification>::_imp)
+ Pimp<GemSpecification>(e, r),
+ _imp(Pimp<GemSpecification>::_imp)
{
_imp->name_part = stringify(q);
_imp->version = stringify(v);
diff --git a/paludis/repositories/gems/gem_specification.hh b/paludis/repositories/gems/gem_specification.hh
index c6bd958..26f44c0 100644
--- a/paludis/repositories/gems/gem_specification.hh
+++ b/paludis/repositories/gems/gem_specification.hh
@@ -25,7 +25,7 @@
#include <paludis/package_id.hh>
#include <paludis/name-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <string>
@@ -60,11 +60,11 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE GemSpecification :
- private PrivateImplementationPattern<GemSpecification>,
+ private Pimp<GemSpecification>,
public PackageID
{
private:
- PrivateImplementationPattern<GemSpecification>::ImpPtr & _imp;
+ Pimp<GemSpecification>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/gems/gem_specifications.cc b/paludis/repositories/gems/gem_specifications.cc
index 4ed7848..9516275 100644
--- a/paludis/repositories/gems/gem_specifications.cc
+++ b/paludis/repositories/gems/gem_specifications.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/gems/yaml.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -38,7 +38,7 @@ typedef std::unordered_map<std::pair<QualifiedPackageName, VersionSpec>, std::sh
namespace paludis
{
template <>
- struct Implementation<GemSpecifications>
+ struct Imp<GemSpecifications>
{
Specs specs;
};
@@ -103,12 +103,12 @@ namespace
struct GemsVisitor
{
- Implementation<GemSpecifications> * const _imp;
+ Imp<GemSpecifications> * const _imp;
const Environment * const environment;
const std::shared_ptr<const Repository> repository;
GemsVisitor(const Environment * const e,
- const std::shared_ptr<const Repository> & r, Implementation<GemSpecifications> * const i) :
+ const std::shared_ptr<const Repository> & r, Imp<GemSpecifications> * const i) :
_imp(i),
environment(e),
repository(r)
@@ -156,12 +156,12 @@ namespace
struct TopVisitor
{
- Implementation<GemSpecifications> * const _imp;
+ Imp<GemSpecifications> * const _imp;
const Environment * const environment;
const std::shared_ptr<const Repository> repository;
TopVisitor(const Environment * const e,
- const std::shared_ptr<const Repository> & r, Implementation<GemSpecifications> * const i) :
+ const std::shared_ptr<const Repository> & r, Imp<GemSpecifications> * const i) :
_imp(i),
environment(e),
repository(r)
@@ -196,7 +196,7 @@ namespace
GemSpecifications::GemSpecifications(const Environment * const e,
const std::shared_ptr<const Repository> & r, const yaml::Node & n) :
- PrivateImplementationPattern<GemSpecifications>()
+ Pimp<GemSpecifications>()
{
TopVisitor v(e, r, _imp.get());
n.accept(v);
diff --git a/paludis/repositories/gems/gem_specifications.hh b/paludis/repositories/gems/gem_specifications.hh
index 96b613a..c767d69 100644
--- a/paludis/repositories/gems/gem_specifications.hh
+++ b/paludis/repositories/gems/gem_specifications.hh
@@ -23,7 +23,7 @@
#include <paludis/repositories/gems/gem_specification-fwd.hh>
#include <paludis/repositories/gems/yaml-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/name-fwd.hh>
@@ -44,7 +44,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE GemSpecifications :
- private PrivateImplementationPattern<GemSpecifications>
+ private Pimp<GemSpecifications>
{
public:
///\name Basic operations
diff --git a/paludis/repositories/gems/gems_repository.cc b/paludis/repositories/gems/gems_repository.cc
index 45c1fff..48163ed 100644
--- a/paludis/repositories/gems/gems_repository.cc
+++ b/paludis/repositories/gems/gems_repository.cc
@@ -25,7 +25,7 @@
#include <paludis/repositories/gems/exceptions.hh>
#include <paludis/repositories/gems/extra_distribution_data.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/system.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
@@ -47,7 +47,7 @@ using namespace paludis;
namespace paludis
{
template <>
- struct Implementation<GemsRepository>
+ struct Imp<GemsRepository>
{
const gems::RepositoryParams params;
@@ -67,7 +67,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<std::string> > sync_options_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const gems::RepositoryParams p, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
+ Imp(const gems::RepositoryParams p, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
params(p),
big_nasty_mutex(m),
has_category_names(false),
@@ -99,8 +99,8 @@ GemsRepository::GemsRepository(const gems::RepositoryParams & params) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<GemsRepository>(params),
- _imp(PrivateImplementationPattern<GemsRepository>::_imp)
+ Pimp<GemsRepository>(params),
+ _imp(Pimp<GemsRepository>::_imp)
{
_add_metadata_keys();
}
@@ -126,7 +126,7 @@ GemsRepository::invalidate()
{
Lock l(*_imp->big_nasty_mutex);
- _imp.reset(new Implementation<GemsRepository>(_imp->params, _imp->big_nasty_mutex));
+ _imp.reset(new Imp<GemsRepository>(_imp->params, _imp->big_nasty_mutex));
_add_metadata_keys();
}
diff --git a/paludis/repositories/gems/gems_repository.hh b/paludis/repositories/gems/gems_repository.hh
index cac9353..d9e0152 100644
--- a/paludis/repositories/gems/gems_repository.hh
+++ b/paludis/repositories/gems/gems_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/repositories/gems/params-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
namespace paludis
@@ -35,11 +35,11 @@ namespace paludis
*/
class PALUDIS_VISIBLE GemsRepository :
public Repository,
- private PrivateImplementationPattern<GemsRepository>,
+ private Pimp<GemsRepository>,
public std::enable_shared_from_this<GemsRepository>
{
private:
- PrivateImplementationPattern<GemsRepository>::ImpPtr & _imp;
+ Pimp<GemsRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_category_names() const;
diff --git a/paludis/repositories/gems/installed_gems_repository.cc b/paludis/repositories/gems/installed_gems_repository.cc
index 3fd9448..27deb5b 100644
--- a/paludis/repositories/gems/installed_gems_repository.cc
+++ b/paludis/repositories/gems/installed_gems_repository.cc
@@ -26,7 +26,7 @@
#include <paludis/package_database.hh>
#include <paludis/environment.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
@@ -56,7 +56,7 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace paludis
{
template <>
- struct Implementation<InstalledGemsRepository>
+ struct Imp<InstalledGemsRepository>
{
const std::shared_ptr<Mutex> big_nasty_mutex;
@@ -74,7 +74,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const gems::InstalledRepositoryParams p,
+ Imp(const gems::InstalledRepositoryParams p,
std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
big_nasty_mutex(m),
params(p),
@@ -104,8 +104,8 @@ InstalledGemsRepository::InstalledGemsRepository(const gems::InstalledRepository
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<InstalledGemsRepository>(params),
- _imp(PrivateImplementationPattern<InstalledGemsRepository>::_imp)
+ Pimp<InstalledGemsRepository>(params),
+ _imp(Pimp<InstalledGemsRepository>::_imp)
{
_add_metadata_keys();
}
@@ -128,7 +128,7 @@ void
InstalledGemsRepository::invalidate()
{
Lock l(*_imp->big_nasty_mutex);
- _imp.reset(new Implementation<InstalledGemsRepository>(_imp->params, _imp->big_nasty_mutex));
+ _imp.reset(new Imp<InstalledGemsRepository>(_imp->params, _imp->big_nasty_mutex));
_add_metadata_keys();
}
diff --git a/paludis/repositories/gems/installed_gems_repository.hh b/paludis/repositories/gems/installed_gems_repository.hh
index 7d1f0f0..cd7bdce 100644
--- a/paludis/repositories/gems/installed_gems_repository.hh
+++ b/paludis/repositories/gems/installed_gems_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/repositories/gems/params-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
namespace paludis
@@ -37,10 +37,10 @@ namespace paludis
public Repository,
public RepositoryDestinationInterface,
public std::enable_shared_from_this<InstalledGemsRepository>,
- private PrivateImplementationPattern<InstalledGemsRepository>
+ private Pimp<InstalledGemsRepository>
{
private:
- PrivateImplementationPattern<InstalledGemsRepository>::ImpPtr & _imp;
+ Pimp<InstalledGemsRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
void need_category_names() const;
diff --git a/paludis/repositories/gems/yaml.cc b/paludis/repositories/gems/yaml.cc
index 23eecdc..d4f2827 100644
--- a/paludis/repositories/gems/yaml.cc
+++ b/paludis/repositories/gems/yaml.cc
@@ -18,7 +18,7 @@
*/
#include "yaml.hh"
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <functional>
@@ -38,11 +38,11 @@ Node::~Node()
namespace paludis
{
template <>
- struct Implementation<StringNode>
+ struct Imp<StringNode>
{
const std::string text;
- Implementation(const std::string & t) :
+ Imp(const std::string & t) :
text(t)
{
}
@@ -62,7 +62,7 @@ namespace paludis
}
StringNode::StringNode(const std::string & t) :
- PrivateImplementationPattern<StringNode>(t)
+ Pimp<StringNode>(t)
{
}
@@ -79,14 +79,14 @@ StringNode::text() const
namespace paludis
{
template <>
- struct Implementation<SequenceNode>
+ struct Imp<SequenceNode>
{
std::list<const Node *> nodes;
};
}
SequenceNode::SequenceNode() :
- PrivateImplementationPattern<SequenceNode>()
+ Pimp<SequenceNode>()
{
}
@@ -115,14 +115,14 @@ SequenceNode::end() const
namespace paludis
{
template <>
- struct Implementation<MapNode>
+ struct Imp<MapNode>
{
std::list<std::pair<const Node *, const Node *> > nodes;
};
}
MapNode::MapNode() :
- PrivateImplementationPattern<MapNode>()
+ Pimp<MapNode>()
{
}
@@ -278,13 +278,13 @@ namespace
namespace paludis
{
template <>
- struct Implementation<Document>
+ struct Imp<Document>
{
struct Register
{
- Implementation<Document> * _imp;
+ Imp<Document> * _imp;
- Register(Implementation<Document> * imp) :
+ Register(Imp<Document> * imp) :
_imp(imp)
{
NodeManager::get_instance()->register_document(_imp->parser.get());
@@ -303,7 +303,7 @@ namespace paludis
Register reg;
- Implementation(const std::string & s) :
+ Imp(const std::string & s) :
top(0),
parser(syck_new_parser(), call_unless_null(syck_free_parser)),
data(strdup(s.c_str()), call_unless_null(std::free)),
@@ -315,7 +315,7 @@ namespace paludis
}
Document::Document(const std::string & s) :
- PrivateImplementationPattern<Document>(s)
+ Pimp<Document>(s)
{
Context c("When parsing yaml document:");
@@ -353,14 +353,14 @@ Document::top() const
namespace paludis
{
template <>
- struct Implementation<NodeManager>
+ struct Imp<NodeManager>
{
std::map<const void *, std::list<std::shared_ptr<const Node> > > store;
};
}
NodeManager::NodeManager() :
- PrivateImplementationPattern<NodeManager>()
+ Pimp<NodeManager>()
{
}
diff --git a/paludis/repositories/gems/yaml.hh b/paludis/repositories/gems/yaml.hh
index cedfc63..c36f6b9 100644
--- a/paludis/repositories/gems/yaml.hh
+++ b/paludis/repositories/gems/yaml.hh
@@ -24,7 +24,7 @@
#include <paludis/util/simple_visitor.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/singleton.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/type_list.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -66,7 +66,7 @@ namespace paludis
class PALUDIS_VISIBLE StringNode :
public Node,
public ImplementAcceptMethods<Node, StringNode>,
- private PrivateImplementationPattern<StringNode>
+ private Pimp<StringNode>
{
public:
///\name Basic operations
@@ -92,7 +92,7 @@ namespace paludis
class PALUDIS_VISIBLE SequenceNode :
public Node,
public ImplementAcceptMethods<Node, SequenceNode>,
- private PrivateImplementationPattern<SequenceNode>
+ private Pimp<SequenceNode>
{
public:
///\name Basic operations
@@ -128,7 +128,7 @@ namespace paludis
class PALUDIS_VISIBLE MapNode :
public Node,
public ImplementAcceptMethods<Node, MapNode>,
- private PrivateImplementationPattern<MapNode>
+ private Pimp<MapNode>
{
public:
///\name Basic operations
@@ -163,7 +163,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE Document :
- private PrivateImplementationPattern<Document>
+ private Pimp<Document>
{
public:
///\name Basic operations
@@ -188,7 +188,7 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE NodeManager :
- private PrivateImplementationPattern<NodeManager>,
+ private Pimp<NodeManager>,
public Singleton<NodeManager>
{
friend class Singleton<NodeManager>;
diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc
index c52077c..40cd0ed 100644
--- a/paludis/repositories/repository/repository_id.cc
+++ b/paludis/repositories/repository/repository_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/repository/repository_id.hh>
#include <paludis/repositories/repository/repository_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
@@ -40,7 +40,7 @@ using namespace paludis::repository_repository;
namespace paludis
{
template <>
- struct Implementation<RepositoryID>
+ struct Imp<RepositoryID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -50,7 +50,7 @@ namespace paludis
const std::shared_ptr<LiteralMetadataStringSetKey> behaviours_key;
static const std::shared_ptr<Set<std::string> > behaviours_set;
- Implementation(const RepositoryIDParams & e) :
+ Imp(const RepositoryIDParams & e) :
env(e.environment()),
name(e.name()),
version("0", VersionSpecOptions()),
@@ -72,11 +72,11 @@ namespace
}
}
-const std::shared_ptr<Set<std::string> > Implementation<RepositoryID>::behaviours_set = make_behaviours();
+const std::shared_ptr<Set<std::string> > Imp<RepositoryID>::behaviours_set = make_behaviours();
RepositoryID::RepositoryID(const RepositoryIDParams & entry) :
- PrivateImplementationPattern<RepositoryID>(entry),
- _imp(PrivateImplementationPattern<RepositoryID>::_imp)
+ Pimp<RepositoryID>(entry),
+ _imp(Pimp<RepositoryID>::_imp)
{
add_metadata_key(_imp->behaviours_key);
}
@@ -302,5 +302,5 @@ RepositoryID::slot_key() const
return make_null_shared_ptr();
}
-template class PrivateImplementationPattern<RepositoryID>;
+template class Pimp<RepositoryID>;
diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh
index 0ca2062..9389846 100644
--- a/paludis/repositories/repository/repository_id.hh
+++ b/paludis/repositories/repository/repository_id.hh
@@ -45,10 +45,10 @@ namespace paludis
class PALUDIS_VISIBLE RepositoryID :
public PackageID,
- private PrivateImplementationPattern<RepositoryID>
+ private Pimp<RepositoryID>
{
private:
- PrivateImplementationPattern<RepositoryID>::ImpPtr & _imp;
+ Pimp<RepositoryID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/repository/repository_repository.cc b/paludis/repositories/repository/repository_repository.cc
index 2ae486a..052f93b 100644
--- a/paludis/repositories/repository/repository_repository.cc
+++ b/paludis/repositories/repository/repository_repository.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/repository/repository_repository.hh>
#include <paludis/repositories/repository/repository_repository_store.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/active_object_ptr.hh>
#include <paludis/util/deferred_construction_ptr.hh>
#include <paludis/util/stringify.hh>
@@ -54,7 +54,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<RepositoryRepository>
+ struct Imp<RepositoryRepository>
{
const RepositoryRepositoryParams params;
@@ -66,7 +66,7 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<
std::shared_ptr<RepositoryRepositoryStore> > > store;
- Implementation(const RepositoryRepository * const repo, const RepositoryRepositoryParams & p) :
+ Imp(const RepositoryRepository * const repo, const RepositoryRepositoryParams & p) :
params(p),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format",
mkt_significant, "repository")),
@@ -88,7 +88,7 @@ RepositoryRepositoryConfigurationError::RepositoryRepositoryConfigurationError(c
}
RepositoryRepository::RepositoryRepository(const RepositoryRepositoryParams & p) :
- PrivateImplementationPattern<RepositoryRepository>(this, p),
+ Pimp<RepositoryRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -100,7 +100,7 @@ RepositoryRepository::RepositoryRepository(const RepositoryRepositoryParams & p)
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<RepositoryRepository>::_imp)
+ _imp(Pimp<RepositoryRepository>::_imp)
{
_add_metadata_keys();
}
@@ -157,7 +157,7 @@ RepositoryRepository::installed_root_key() const
void
RepositoryRepository::invalidate()
{
- _imp.reset(new Implementation<RepositoryRepository>(this, _imp->params));
+ _imp.reset(new Imp<RepositoryRepository>(this, _imp->params));
_add_metadata_keys();
}
@@ -494,5 +494,5 @@ RepositoryRepository::merge(const MergeParams & m)
}
}
-template class PrivateImplementationPattern<repository_repository::RepositoryRepository>;
+template class Pimp<repository_repository::RepositoryRepository>;
diff --git a/paludis/repositories/repository/repository_repository.hh b/paludis/repositories/repository/repository_repository.hh
index 0257ead..c86ac15 100644
--- a/paludis/repositories/repository/repository_repository.hh
+++ b/paludis/repositories/repository/repository_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/repository/repository_repository-fwd.hh>
#include <paludis/repository.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
namespace paludis
@@ -55,13 +55,13 @@ namespace paludis
};
class PALUDIS_VISIBLE RepositoryRepository :
- private PrivateImplementationPattern<RepositoryRepository>,
+ private Pimp<RepositoryRepository>,
public Repository,
public RepositoryDestinationInterface,
public std::enable_shared_from_this<RepositoryRepository>
{
private:
- PrivateImplementationPattern<RepositoryRepository>::ImpPtr & _imp;
+ Pimp<RepositoryRepository>::ImpPtr & _imp;
void _add_metadata_keys();
@@ -138,7 +138,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<repository_repository::RepositoryRepository>;
+ extern template class Pimp<repository_repository::RepositoryRepository>;
}
#endif
diff --git a/paludis/repositories/repository/repository_repository_store.cc b/paludis/repositories/repository/repository_repository_store.cc
index 0669af4..6a53271 100644
--- a/paludis/repositories/repository/repository_repository_store.cc
+++ b/paludis/repositories/repository/repository_repository_store.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/repository/repository_repository_store.hh>
#include <paludis/repositories/repository/repository_id.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/set.hh>
@@ -52,7 +52,7 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Implementation<RepositoryRepositoryStore>
+ struct Imp<RepositoryRepositoryStore>
{
const Environment * const env;
const RepositoryRepository * const repo;
@@ -60,7 +60,7 @@ namespace paludis
mutable PackageNames package_names;
mutable IDs ids;
- Implementation(const Environment * const e, const RepositoryRepository * const r) :
+ Imp(const Environment * const e, const RepositoryRepository * const r) :
env(e),
repo(r),
categories(new CategoryNamePartSet)
@@ -72,7 +72,7 @@ namespace paludis
RepositoryRepositoryStore::RepositoryRepositoryStore(
const Environment * const env,
const RepositoryRepository * const repo) :
- PrivateImplementationPattern<RepositoryRepositoryStore>(env, repo)
+ Pimp<RepositoryRepositoryStore>(env, repo)
{
_populate();
}
@@ -158,5 +158,5 @@ RepositoryRepositoryStore::package_ids(const QualifiedPackageName & p) const
return i->second;
}
-template class PrivateImplementationPattern<repository_repository::RepositoryRepositoryStore>;
+template class Pimp<repository_repository::RepositoryRepositoryStore>;
diff --git a/paludis/repositories/repository/repository_repository_store.hh b/paludis/repositories/repository/repository_repository_store.hh
index a19ce0d..17388ee 100644
--- a/paludis/repositories/repository/repository_repository_store.hh
+++ b/paludis/repositories/repository/repository_repository_store.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_REPOSITORY_REPOSITORY_REPOSITORY_STORE_HH 1
#include <paludis/repositories/repository/repository_repository-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -33,7 +33,7 @@ namespace paludis
namespace repository_repository
{
class PALUDIS_VISIBLE RepositoryRepositoryStore :
- private PrivateImplementationPattern<RepositoryRepositoryStore>
+ private Pimp<RepositoryRepositoryStore>
{
private:
void _populate();
@@ -65,7 +65,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<repository_repository::RepositoryRepositoryStore>;
+ extern template class Pimp<repository_repository::RepositoryRepositoryStore>;
}
#endif
diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index f620676..3fb8625 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unavailable/unavailable_package_id.hh>
#include <paludis/repositories/unavailable/unavailable_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
@@ -40,7 +40,7 @@ using namespace paludis::unavailable_repository;
namespace paludis
{
template <>
- struct Implementation<UnavailablePackageID>
+ struct Imp<UnavailablePackageID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -54,7 +54,7 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key;
const std::shared_ptr<const Mask> mask;
- Implementation(
+ Imp(
const UnavailablePackageIDParams & e) :
env(e.environment()),
name(e.name()),
@@ -73,8 +73,8 @@ namespace paludis
}
UnavailablePackageID::UnavailablePackageID(const UnavailablePackageIDParams & entry) :
- PrivateImplementationPattern<UnavailablePackageID>(entry),
- _imp(PrivateImplementationPattern<UnavailablePackageID>::_imp)
+ Pimp<UnavailablePackageID>(entry),
+ _imp(Pimp<UnavailablePackageID>::_imp)
{
add_metadata_key(_imp->slot_key);
add_metadata_key(_imp->description_key);
@@ -329,5 +329,5 @@ UnavailablePackageID::slot_key() const
return _imp->slot_key;
}
-template class PrivateImplementationPattern<UnavailablePackageID>;
+template class Pimp<UnavailablePackageID>;
diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index 45fe75f..f19af1e 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -59,10 +59,10 @@ namespace paludis
class PALUDIS_VISIBLE UnavailablePackageID :
public PackageID,
- private PrivateImplementationPattern<UnavailablePackageID>
+ private Pimp<UnavailablePackageID>
{
private:
- PrivateImplementationPattern<UnavailablePackageID>::ImpPtr & _imp;
+ Pimp<UnavailablePackageID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unavailable/unavailable_repository.cc b/paludis/repositories/unavailable/unavailable_repository.cc
index 22b5235..b86468a 100644
--- a/paludis/repositories/unavailable/unavailable_repository.cc
+++ b/paludis/repositories/unavailable/unavailable_repository.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unavailable/unavailable_repository.hh>
#include <paludis/repositories/unavailable/unavailable_repository_store.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/active_object_ptr.hh>
#include <paludis/util/deferred_construction_ptr.hh>
#include <paludis/util/stringify.hh>
@@ -48,7 +48,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<UnavailableRepository>
+ struct Imp<UnavailableRepository>
{
const UnavailableRepositoryParams params;
@@ -61,7 +61,7 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<
std::shared_ptr<UnavailableRepositoryStore> > > store;
- Implementation(const UnavailableRepository * const repo, const UnavailableRepositoryParams & p) :
+ Imp(const UnavailableRepository * const repo, const UnavailableRepositoryParams & p) :
params(p),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format",
mkt_significant, "unavailable")),
@@ -85,7 +85,7 @@ UnavailableRepositoryConfigurationError::UnavailableRepositoryConfigurationError
}
UnavailableRepository::UnavailableRepository(const UnavailableRepositoryParams & p) :
- PrivateImplementationPattern<UnavailableRepository>(this, p),
+ Pimp<UnavailableRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -97,7 +97,7 @@ UnavailableRepository::UnavailableRepository(const UnavailableRepositoryParams &
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<UnavailableRepository>::_imp)
+ _imp(Pimp<UnavailableRepository>::_imp)
{
_add_metadata_keys();
}
@@ -155,7 +155,7 @@ UnavailableRepository::installed_root_key() const
void
UnavailableRepository::invalidate()
{
- _imp.reset(new Implementation<UnavailableRepository>(this, _imp->params));
+ _imp.reset(new Imp<UnavailableRepository>(this, _imp->params));
_add_metadata_keys();
}
@@ -375,5 +375,5 @@ UnavailableRepository::sync_host_key() const
return _imp->sync_host_key;
}
-template class PrivateImplementationPattern<unavailable_repository::UnavailableRepository>;
+template class Pimp<unavailable_repository::UnavailableRepository>;
diff --git a/paludis/repositories/unavailable/unavailable_repository.hh b/paludis/repositories/unavailable/unavailable_repository.hh
index 28eba47..c206358 100644
--- a/paludis/repositories/unavailable/unavailable_repository.hh
+++ b/paludis/repositories/unavailable/unavailable_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repositories/unavailable/unavailable_repository-fwd.hh>
#include <paludis/repository.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
namespace paludis
@@ -55,12 +55,12 @@ namespace paludis
};
class PALUDIS_VISIBLE UnavailableRepository :
- private PrivateImplementationPattern<UnavailableRepository>,
+ private Pimp<UnavailableRepository>,
public Repository,
public std::enable_shared_from_this<UnavailableRepository>
{
private:
- PrivateImplementationPattern<UnavailableRepository>::ImpPtr & _imp;
+ Pimp<UnavailableRepository>::ImpPtr & _imp;
void _add_metadata_keys();
@@ -126,7 +126,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unavailable_repository::UnavailableRepository>;
+ extern template class Pimp<unavailable_repository::UnavailableRepository>;
}
#endif
diff --git a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
index 381fbc4..d70b6a7 100644
--- a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/set.hh>
#include <paludis/util/make_named_values.hh>
@@ -34,7 +34,7 @@ using namespace paludis::unavailable_repository;
namespace paludis
{
template <>
- struct Implementation<UnavailableRepositoryDependenciesKey>
+ struct Imp<UnavailableRepositoryDependenciesKey>
{
const Environment * const env;
const std::shared_ptr<const DependencySpecTree> value;
@@ -44,7 +44,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const std::string & r, const std::string & h, const MetadataKeyType t,
const std::string & v) :
env(e),
@@ -62,7 +62,7 @@ namespace paludis
UnavailableRepositoryDependenciesKey::UnavailableRepositoryDependenciesKey(const Environment * const env,
const std::string & r, const std::string & h, const MetadataKeyType t,
const std::string & v) :
- PrivateImplementationPattern<UnavailableRepositoryDependenciesKey>(env, r, h, t, v)
+ Pimp<UnavailableRepositoryDependenciesKey>(env, r, h, t, v)
{
}
diff --git a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh
index 31fe8cc..02e33a3 100644
--- a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_REPOSITORY_DEPENDENCIES_KEY_HH 1
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -29,7 +29,7 @@ namespace paludis
{
class UnavailableRepositoryDependenciesKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<UnavailableRepositoryDependenciesKey>
+ private Pimp<UnavailableRepositoryDependenciesKey>
{
public:
UnavailableRepositoryDependenciesKey(
diff --git a/paludis/repositories/unavailable/unavailable_repository_file.cc b/paludis/repositories/unavailable/unavailable_repository_file.cc
index 00e5d78..ff624a3 100644
--- a/paludis/repositories/unavailable/unavailable_repository_file.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_file.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unavailable/unavailable_repository_file.hh>
#include <paludis/repositories/unavailable/unavailable_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
#include <paludis/util/simple_parser.hh>
@@ -40,13 +40,13 @@ typedef std::list<UnavailableRepositoryFileEntry> Entries;
namespace paludis
{
template <>
- struct Implementation<UnavailableRepositoryFile>
+ struct Imp<UnavailableRepositoryFile>
{
std::string repo_name, homepage, description, sync, repo_format, dependencies;
bool autoconfigurable;
Entries entries;
- Implementation() :
+ Imp() :
autoconfigurable(false)
{
}
@@ -60,7 +60,7 @@ namespace paludis
}
UnavailableRepositoryFile::UnavailableRepositoryFile(const FSEntry & f) :
- PrivateImplementationPattern<UnavailableRepositoryFile>()
+ Pimp<UnavailableRepositoryFile>()
{
_load(f);
}
@@ -269,7 +269,7 @@ UnavailableRepositoryFile::autoconfigurable() const
return _imp->autoconfigurable;
}
-template class PrivateImplementationPattern<UnavailableRepositoryFile>;
+template class Pimp<UnavailableRepositoryFile>;
template class WrappedForwardIterator<UnavailableRepositoryFile::ConstIteratorTag,
const UnavailableRepositoryFileEntry>;
diff --git a/paludis/repositories/unavailable/unavailable_repository_file.hh b/paludis/repositories/unavailable/unavailable_repository_file.hh
index e013efe..0729e5f 100644
--- a/paludis/repositories/unavailable/unavailable_repository_file.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_file.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_REPOSITORY_FILE_HH 1
#include <paludis/repositories/unavailable/unavailable_repository_file-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/fs_entry.hh>
@@ -30,7 +30,7 @@ namespace paludis
namespace unavailable_repository
{
class PALUDIS_VISIBLE UnavailableRepositoryFile :
- private PrivateImplementationPattern<UnavailableRepositoryFile>
+ private Pimp<UnavailableRepositoryFile>
{
private:
void _load(const FSEntry &);
@@ -54,7 +54,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unavailable_repository::UnavailableRepositoryFile>;
+ extern template class Pimp<unavailable_repository::UnavailableRepositoryFile>;
}
#endif
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index dd84204..5786d2e 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unavailable/unavailable_repository_id.hh>
#include <paludis/repositories/unavailable/unavailable_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
@@ -42,7 +42,7 @@ using namespace paludis::unavailable_repository;
namespace paludis
{
template <>
- struct Implementation<UnavailableRepositoryID>
+ struct Imp<UnavailableRepositoryID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -56,7 +56,7 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<std::string> > format_key;
const std::shared_ptr<const Mask> mask;
- Implementation(
+ Imp(
const UnavailableRepositoryIDParams & e) :
env(e.environment()),
name(e.name()),
@@ -74,8 +74,8 @@ namespace paludis
}
UnavailableRepositoryID::UnavailableRepositoryID(const UnavailableRepositoryIDParams & entry) :
- PrivateImplementationPattern<UnavailableRepositoryID>(entry),
- _imp(PrivateImplementationPattern<UnavailableRepositoryID>::_imp)
+ Pimp<UnavailableRepositoryID>(entry),
+ _imp(Pimp<UnavailableRepositoryID>::_imp)
{
if (_imp->dependencies_key)
add_metadata_key(_imp->dependencies_key);
@@ -392,5 +392,5 @@ UnavailableRepositoryID::slot_key() const
return make_null_shared_ptr();
}
-template class PrivateImplementationPattern<UnavailableRepositoryID>;
+template class Pimp<UnavailableRepositoryID>;
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh
index 0e55853..bb93519 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_id.hh
@@ -58,11 +58,11 @@ namespace paludis
class PALUDIS_VISIBLE UnavailableRepositoryID :
public PackageID,
- private PrivateImplementationPattern<UnavailableRepositoryID>,
+ private Pimp<UnavailableRepositoryID>,
public std::enable_shared_from_this<UnavailableRepositoryID>
{
private:
- PrivateImplementationPattern<UnavailableRepositoryID>::ImpPtr & _imp;
+ Pimp<UnavailableRepositoryID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unavailable/unavailable_repository_store.cc b/paludis/repositories/unavailable/unavailable_repository_store.cc
index a4629ff..7d7cee7 100644
--- a/paludis/repositories/unavailable/unavailable_repository_store.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_store.cc
@@ -23,7 +23,7 @@
#include <paludis/repositories/unavailable/unavailable_repository_id.hh>
#include <paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh>
#include <paludis/repositories/unavailable/unavailable_mask.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/dir_iterator.hh>
@@ -58,7 +58,7 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Implementation<UnavailableRepositoryStore>
+ struct Imp<UnavailableRepositoryStore>
{
const UnavailableRepository * const repo;
mutable std::shared_ptr<CategoryNamePartSet> categories;
@@ -67,7 +67,7 @@ namespace paludis
std::set<std::string> seen_repo_names;
- Implementation(const UnavailableRepository * const r) :
+ Imp(const UnavailableRepository * const r) :
repo(r),
categories(new CategoryNamePartSet)
{
@@ -79,7 +79,7 @@ UnavailableRepositoryStore::UnavailableRepositoryStore(
const Environment * const env,
const UnavailableRepository * const repo,
const FSEntry & f) :
- PrivateImplementationPattern<UnavailableRepositoryStore>(repo)
+ Pimp<UnavailableRepositoryStore>(repo)
{
_populate(env, f);
}
@@ -272,5 +272,5 @@ UnavailableRepositoryStore::package_ids(const QualifiedPackageName & p) const
return i->second;
}
-template class PrivateImplementationPattern<unavailable_repository::UnavailableRepositoryStore>;
+template class Pimp<unavailable_repository::UnavailableRepositoryStore>;
diff --git a/paludis/repositories/unavailable/unavailable_repository_store.hh b/paludis/repositories/unavailable/unavailable_repository_store.hh
index 2d23c94..917b3d4 100644
--- a/paludis/repositories/unavailable/unavailable_repository_store.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_store.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNAVAILABLE_UNAVAILABLE_REPOSITORY_STORE_HH 1
#include <paludis/repositories/unavailable/unavailable_repository-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -33,7 +33,7 @@ namespace paludis
namespace unavailable_repository
{
class PALUDIS_VISIBLE UnavailableRepositoryStore :
- private PrivateImplementationPattern<UnavailableRepositoryStore>
+ private Pimp<UnavailableRepositoryStore>
{
private:
void _populate(const Environment * const env, const FSEntry & f);
@@ -66,7 +66,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unavailable_repository::UnavailableRepositoryStore>;
+ extern template class Pimp<unavailable_repository::UnavailableRepositoryStore>;
}
#endif
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index a4a2313..1b0be76 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/unpackaged/installed_repository.hh>
#include <paludis/ndbam.hh>
#include <paludis/ndbam_unmerger.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/system.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
@@ -384,7 +384,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<InstalledUnpackagedID>
+ struct Imp<InstalledUnpackagedID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -408,7 +408,7 @@ namespace paludis
static const std::shared_ptr<Set<std::string> > behaviours_set;
- Implementation(
+ Imp(
const Environment * const e,
const PackageID * const id,
const QualifiedPackageName & q,
@@ -474,13 +474,13 @@ namespace
}
}
-const std::shared_ptr<Set<std::string> > Implementation<InstalledUnpackagedID>::behaviours_set = make_behaviours();
+const std::shared_ptr<Set<std::string> > Imp<InstalledUnpackagedID>::behaviours_set = make_behaviours();
InstalledUnpackagedID::InstalledUnpackagedID(const Environment * const e, const QualifiedPackageName & q,
const VersionSpec & v, const SlotName & s, const RepositoryName & n, const FSEntry & l,
const std::string &, const FSEntry & ro, const NDBAM * const d) :
- PrivateImplementationPattern<InstalledUnpackagedID>(e, this, q, v, s, n, l, ro, d),
- _imp(PrivateImplementationPattern<InstalledUnpackagedID>::_imp)
+ Pimp<InstalledUnpackagedID>(e, this, q, v, s, n, l, ro, d),
+ _imp(Pimp<InstalledUnpackagedID>::_imp)
{
add_metadata_key(_imp->fs_location_key);
add_metadata_key(_imp->slot_key);
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index 7cb5bba..afefc9b 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -24,7 +24,7 @@
#include <paludis/name-fwd.hh>
#include <paludis/action-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/ndbam-fwd.hh>
#include <memory>
@@ -35,11 +35,11 @@ namespace paludis
{
class InstalledUnpackagedID :
public PackageID,
- private PrivateImplementationPattern<InstalledUnpackagedID>,
+ private Pimp<InstalledUnpackagedID>,
public std::enable_shared_from_this<InstalledUnpackagedID>
{
private:
- PrivateImplementationPattern<InstalledUnpackagedID>::ImpPtr & _imp;
+ Pimp<InstalledUnpackagedID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index e37da76..42c7d9c 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/unpackaged/exceptions.hh>
#include <paludis/ndbam.hh>
#include <paludis/ndbam_merger.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/set.hh>
@@ -65,7 +65,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<InstalledUnpackagedRepository>
+ struct Imp<InstalledUnpackagedRepository>
{
const InstalledUnpackagedRepositoryParams params;
mutable NDBAM ndbam;
@@ -74,7 +74,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const InstalledUnpackagedRepositoryParams & p) :
+ Imp(const InstalledUnpackagedRepositoryParams & p) :
params(p),
ndbam(p.location(), &supported_installed_unpackaged, "installed_unpackaged-1", user_version_spec_options()),
location_key(new LiteralMetadataValueKey<FSEntry> ("location", "location",
@@ -90,7 +90,7 @@ namespace paludis
InstalledUnpackagedRepository::InstalledUnpackagedRepository(
const RepositoryName & n, const InstalledUnpackagedRepositoryParams & p) :
- PrivateImplementationPattern<InstalledUnpackagedRepository>(p),
+ Pimp<InstalledUnpackagedRepository>(p),
Repository(p.environment(), n, make_named_values<RepositoryCapabilities>(
n::destination_interface() = this,
n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
@@ -99,7 +99,7 @@ InstalledUnpackagedRepository::InstalledUnpackagedRepository(
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<InstalledUnpackagedRepository>::_imp)
+ _imp(Pimp<InstalledUnpackagedRepository>::_imp)
{
_add_metadata_keys();
}
@@ -412,7 +412,7 @@ InstalledUnpackagedRepository::want_pre_post_phases() const
void
InstalledUnpackagedRepository::invalidate()
{
- _imp.reset(new Implementation<InstalledUnpackagedRepository>(_imp->params));
+ _imp.reset(new Imp<InstalledUnpackagedRepository>(_imp->params));
_add_metadata_keys();
}
diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh
index adf9281..fbc1d1a 100644
--- a/paludis/repositories/unpackaged/installed_repository.hh
+++ b/paludis/repositories/unpackaged/installed_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/named_value.hh>
namespace paludis
@@ -45,12 +45,12 @@ namespace paludis
}
class PALUDIS_VISIBLE InstalledUnpackagedRepository :
- private PrivateImplementationPattern<InstalledUnpackagedRepository>,
+ private Pimp<InstalledUnpackagedRepository>,
public Repository,
public RepositoryDestinationInterface
{
private:
- PrivateImplementationPattern<InstalledUnpackagedRepository>::ImpPtr & _imp;
+ Pimp<InstalledUnpackagedRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
protected:
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 9bfc395..6e7506a 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/unpackaged/unpackaged_id.hh>
#include <paludis/repositories/unpackaged/unpackaged_key.hh>
#include <paludis/repositories/unpackaged/unpackaged_stripper.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
@@ -47,7 +47,7 @@ using namespace paludis::unpackaged_repositories;
namespace paludis
{
template <>
- struct Implementation<UnpackagedID>
+ struct Imp<UnpackagedID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -64,7 +64,7 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<std::string> > description_key;
const std::shared_ptr<const UnpackagedChoicesKey> choices_key;
- Implementation(const Environment * const e,
+ Imp(const Environment * const e,
const QualifiedPackageName & q,
const VersionSpec & v,
const SlotName & s,
@@ -100,8 +100,8 @@ namespace paludis
UnpackagedID::UnpackagedID(const Environment * const e, const QualifiedPackageName & q,
const VersionSpec & v, const SlotName & s, const RepositoryName & n, const FSEntry & l,
const std::string & b, const std::string & r, const std::string & d) :
- PrivateImplementationPattern<UnpackagedID>(e, q, v, s, n, l, b, r, d, this),
- _imp(PrivateImplementationPattern<UnpackagedID>::_imp)
+ Pimp<UnpackagedID>(e, q, v, s, n, l, b, r, d, this),
+ _imp(Pimp<UnpackagedID>::_imp)
{
add_metadata_key(_imp->slot_key);
add_metadata_key(_imp->fs_location_key);
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index ce1e91d..c1a732f 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -23,7 +23,7 @@
#include <paludis/package_id.hh>
#include <paludis/name-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <memory>
namespace paludis
@@ -32,11 +32,11 @@ namespace paludis
{
class UnpackagedID :
public PackageID,
- private PrivateImplementationPattern<UnpackagedID>,
+ private Pimp<UnpackagedID>,
public std::enable_shared_from_this<UnpackagedID>
{
private:
- PrivateImplementationPattern<UnpackagedID>::ImpPtr & _imp;
+ Pimp<UnpackagedID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unpackaged/unpackaged_key.cc b/paludis/repositories/unpackaged/unpackaged_key.cc
index d9069a5..7a4fe46 100644
--- a/paludis/repositories/unpackaged/unpackaged_key.cc
+++ b/paludis/repositories/unpackaged/unpackaged_key.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unpackaged/unpackaged_key.hh>
#include <paludis/repositories/unpackaged/unpackaged_id.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/set.hh>
@@ -36,7 +36,7 @@ using namespace paludis::unpackaged_repositories;
namespace paludis
{
template <>
- struct Implementation<UnpackagedDependencyKey>
+ struct Imp<UnpackagedDependencyKey>
{
const Environment * const env;
const std::shared_ptr<const DependencySpecTree> value;
@@ -46,7 +46,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::string & v,
+ Imp(const Environment * const e, const std::string & v,
const std::shared_ptr<const DependenciesLabelSequence> & l,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
@@ -64,7 +64,7 @@ UnpackagedDependencyKey::UnpackagedDependencyKey(const Environment * const env,
const std::string & r, const std::string & h, const MetadataKeyType t,
const std::shared_ptr<const DependenciesLabelSequence> & l,
const std::string & v) :
- PrivateImplementationPattern<UnpackagedDependencyKey>(env, v, l, r, h, t)
+ Pimp<UnpackagedDependencyKey>(env, v, l, r, h, t)
{
}
@@ -121,7 +121,7 @@ UnpackagedDependencyKey::initial_labels() const
namespace paludis
{
template <>
- struct Implementation<UnpackagedChoicesKey>
+ struct Imp<UnpackagedChoicesKey>
{
const Environment * const env;
const UnpackagedID * const id;
@@ -133,7 +133,7 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const UnpackagedID * const i,
+ Imp(const Environment * const e, const UnpackagedID * const i,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
id(i),
@@ -147,7 +147,7 @@ namespace paludis
UnpackagedChoicesKey::UnpackagedChoicesKey(const Environment * const env, const std::string & r, const std::string & h,
const MetadataKeyType t, const UnpackagedID * const id) :
- PrivateImplementationPattern<UnpackagedChoicesKey>(env, id, r, h, t)
+ Pimp<UnpackagedChoicesKey>(env, id, r, h, t)
{
}
diff --git a/paludis/repositories/unpackaged/unpackaged_key.hh b/paludis/repositories/unpackaged/unpackaged_key.hh
index 9173ed6..ffcb076 100644
--- a/paludis/repositories/unpackaged/unpackaged_key.hh
+++ b/paludis/repositories/unpackaged/unpackaged_key.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNPACKAGED_UNPACKAGED_KEY_HH 1
#include <paludis/metadata_key.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -31,7 +31,7 @@ namespace paludis
class UnpackagedDependencyKey :
public MetadataSpecTreeKey<DependencySpecTree>,
- private PrivateImplementationPattern<UnpackagedDependencyKey>
+ private Pimp<UnpackagedDependencyKey>
{
public:
UnpackagedDependencyKey(const Environment * const env,
@@ -56,7 +56,7 @@ namespace paludis
class UnpackagedChoicesKey :
public MetadataValueKey<std::shared_ptr<const Choices> >,
- private PrivateImplementationPattern<UnpackagedChoicesKey>
+ private Pimp<UnpackagedChoicesKey>
{
public:
UnpackagedChoicesKey(const Environment * const env,
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.cc b/paludis/repositories/unpackaged/unpackaged_repository.cc
index c3f6d14..06fa3e6 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/unpackaged/exceptions.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/destringify.hh>
@@ -40,7 +40,7 @@ using namespace paludis::unpackaged_repositories;
namespace paludis
{
template <>
- struct Implementation<UnpackagedRepository>
+ struct Imp<UnpackagedRepository>
{
const UnpackagedRepositoryParams params;
std::shared_ptr<const PackageID> id;
@@ -58,7 +58,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<std::string> > run_dependencies_key;
std::shared_ptr<const MetadataValueKey<std::string> > description_key;
- Implementation(const RepositoryName & n,
+ Imp(const RepositoryName & n,
const UnpackagedRepositoryParams & p) :
params(p),
id(new UnpackagedID(params.environment(), params.name(), params.version(), params.slot(), n, params.location(),
@@ -94,7 +94,7 @@ namespace paludis
UnpackagedRepository::UnpackagedRepository(const RepositoryName & n,
const UnpackagedRepositoryParams & params) :
- PrivateImplementationPattern<UnpackagedRepository>(n, params),
+ Pimp<UnpackagedRepository>(n, params),
Repository(params.environment(), n, make_named_values<RepositoryCapabilities>(
n::destination_interface() = static_cast<RepositoryDestinationInterface *>(0),
n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
@@ -103,7 +103,7 @@ UnpackagedRepository::UnpackagedRepository(const RepositoryName & n,
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<UnpackagedRepository>::_imp)
+ _imp(Pimp<UnpackagedRepository>::_imp)
{
_add_metadata_keys();
}
@@ -184,7 +184,7 @@ UnpackagedRepository::is_unimportant() const
void
UnpackagedRepository::invalidate()
{
- _imp.reset(new Implementation<UnpackagedRepository>(name(), _imp->params));
+ _imp.reset(new Imp<UnpackagedRepository>(name(), _imp->params));
_add_metadata_keys();
}
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh
index b8b435f..0e73ffc 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.hh
+++ b/paludis/repositories/unpackaged/unpackaged_repository.hh
@@ -22,7 +22,7 @@
#include <paludis/repository.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
namespace paludis
{
@@ -58,11 +58,11 @@ namespace paludis
}
class PALUDIS_VISIBLE UnpackagedRepository :
- private PrivateImplementationPattern<UnpackagedRepository>,
+ private Pimp<UnpackagedRepository>,
public Repository
{
private:
- PrivateImplementationPattern<UnpackagedRepository>::ImpPtr & _imp;
+ Pimp<UnpackagedRepository>::ImpPtr & _imp;
void _add_metadata_keys() const;
protected:
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.cc b/paludis/repositories/unpackaged/unpackaged_stripper.cc
index 0dd34bb..244357a 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.cc
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unpackaged/unpackaged_stripper.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/output_manager.hh>
#include <ostream>
@@ -30,11 +30,11 @@ using namespace paludis::unpackaged_repositories;
namespace paludis
{
template <>
- struct Implementation<UnpackagedStripper>
+ struct Imp<UnpackagedStripper>
{
UnpackagedStripperOptions options;
- Implementation(const UnpackagedStripperOptions & o) :
+ Imp(const UnpackagedStripperOptions & o) :
options(o)
{
}
@@ -48,8 +48,8 @@ UnpackagedStripper::UnpackagedStripper(const UnpackagedStripperOptions & options
n::split() = options.split(),
n::strip() = options.strip()
)),
- PrivateImplementationPattern<UnpackagedStripper>(options),
- _imp(PrivateImplementationPattern<UnpackagedStripper>::_imp)
+ Pimp<UnpackagedStripper>(options),
+ _imp(Pimp<UnpackagedStripper>::_imp)
{
}
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.hh b/paludis/repositories/unpackaged/unpackaged_stripper.hh
index c948e6d..846ba15 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.hh
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.hh
@@ -51,10 +51,10 @@ namespace paludis
class UnpackagedStripper :
public Stripper,
- private PrivateImplementationPattern<UnpackagedStripper>
+ private Pimp<UnpackagedStripper>
{
private:
- PrivateImplementationPattern<UnpackagedStripper>::ImpPtr & _imp;
+ Pimp<UnpackagedStripper>::ImpPtr & _imp;
protected:
virtual void on_strip(const FSEntry &);
diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc
index 596b50b..9edaaa7 100644
--- a/paludis/repositories/unwritten/unwritten_id.cc
+++ b/paludis/repositories/unwritten/unwritten_id.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unwritten/unwritten_id.hh>
#include <paludis/repositories/unwritten/unwritten_repository.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
@@ -38,7 +38,7 @@ using namespace paludis::unwritten_repository;
namespace paludis
{
template <>
- struct Implementation<UnwrittenID>
+ struct Imp<UnwrittenID>
{
const Environment * const env;
const QualifiedPackageName name;
@@ -55,7 +55,7 @@ namespace paludis
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key;
const std::shared_ptr<const Mask> mask;
- Implementation(
+ Imp(
const UnwrittenIDParams & e) :
env(e.environment()),
name(e.name()),
@@ -76,8 +76,8 @@ namespace paludis
}
UnwrittenID::UnwrittenID(const UnwrittenIDParams & entry) :
- PrivateImplementationPattern<UnwrittenID>(entry),
- _imp(PrivateImplementationPattern<UnwrittenID>::_imp)
+ Pimp<UnwrittenID>(entry),
+ _imp(Pimp<UnwrittenID>::_imp)
{
if (_imp->slot_key)
add_metadata_key(_imp->slot_key);
@@ -319,5 +319,5 @@ UnwrittenID::choices_key() const
return _imp->choices_key;
}
-template class PrivateImplementationPattern<UnwrittenID>;
+template class Pimp<UnwrittenID>;
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index ebd327d..374d657 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -65,10 +65,10 @@ namespace paludis
class PALUDIS_VISIBLE UnwrittenID :
public PackageID,
- private PrivateImplementationPattern<UnwrittenID>
+ private Pimp<UnwrittenID>
{
private:
- PrivateImplementationPattern<UnwrittenID>::ImpPtr & _imp;
+ Pimp<UnwrittenID>::ImpPtr & _imp;
protected:
void need_keys_added() const;
diff --git a/paludis/repositories/unwritten/unwritten_repository.cc b/paludis/repositories/unwritten/unwritten_repository.cc
index fcdfb4a..46a2ed5 100644
--- a/paludis/repositories/unwritten/unwritten_repository.cc
+++ b/paludis/repositories/unwritten/unwritten_repository.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/unwritten/unwritten_repository.hh>
#include <paludis/repositories/unwritten/unwritten_repository_store.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/active_object_ptr.hh>
#include <paludis/util/deferred_construction_ptr.hh>
#include <paludis/util/stringify.hh>
@@ -48,7 +48,7 @@ namespace
namespace paludis
{
template <>
- struct Implementation<UnwrittenRepository>
+ struct Imp<UnwrittenRepository>
{
const UnwrittenRepositoryParams params;
@@ -61,7 +61,7 @@ namespace paludis
const ActiveObjectPtr<DeferredConstructionPtr<
std::shared_ptr<UnwrittenRepositoryStore> > > store;
- Implementation(const UnwrittenRepository * const repo, const UnwrittenRepositoryParams & p) :
+ Imp(const UnwrittenRepository * const repo, const UnwrittenRepositoryParams & p) :
params(p),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format",
mkt_significant, "unwritten")),
@@ -85,7 +85,7 @@ UnwrittenRepositoryConfigurationError::UnwrittenRepositoryConfigurationError(con
}
UnwrittenRepository::UnwrittenRepository(const UnwrittenRepositoryParams & p) :
- PrivateImplementationPattern<UnwrittenRepository>(this, p),
+ Pimp<UnwrittenRepository>(this, p),
Repository(
p.environment(),
p.name(),
@@ -97,7 +97,7 @@ UnwrittenRepository::UnwrittenRepository(const UnwrittenRepositoryParams & p) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- _imp(PrivateImplementationPattern<UnwrittenRepository>::_imp)
+ _imp(Pimp<UnwrittenRepository>::_imp)
{
_add_metadata_keys();
}
@@ -155,7 +155,7 @@ UnwrittenRepository::installed_root_key() const
void
UnwrittenRepository::invalidate()
{
- _imp.reset(new Implementation<UnwrittenRepository>(this, _imp->params));
+ _imp.reset(new Imp<UnwrittenRepository>(this, _imp->params));
_add_metadata_keys();
}
@@ -375,5 +375,5 @@ UnwrittenRepository::sync_host_key() const
return _imp->sync_host_key;
}
-template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepository>;
+template class Pimp<unwritten_repository::UnwrittenRepository>;
diff --git a/paludis/repositories/unwritten/unwritten_repository.hh b/paludis/repositories/unwritten/unwritten_repository.hh
index b49c01b..31a22e3 100644
--- a/paludis/repositories/unwritten/unwritten_repository.hh
+++ b/paludis/repositories/unwritten/unwritten_repository.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_HH 1
#include <paludis/repository.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/attributes.hh>
namespace paludis
@@ -54,12 +54,12 @@ namespace paludis
};
class PALUDIS_VISIBLE UnwrittenRepository :
- private PrivateImplementationPattern<UnwrittenRepository>,
+ private Pimp<UnwrittenRepository>,
public Repository,
public std::enable_shared_from_this<UnwrittenRepository>
{
private:
- PrivateImplementationPattern<UnwrittenRepository>::ImpPtr & _imp;
+ Pimp<UnwrittenRepository>::ImpPtr & _imp;
void _add_metadata_keys();
@@ -125,7 +125,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepository>;
+ extern template class Pimp<unwritten_repository::UnwrittenRepository>;
}
#endif
diff --git a/paludis/repositories/unwritten/unwritten_repository_file.cc b/paludis/repositories/unwritten/unwritten_repository_file.cc
index 04dedd4..5b19e37 100644
--- a/paludis/repositories/unwritten/unwritten_repository_file.cc
+++ b/paludis/repositories/unwritten/unwritten_repository_file.cc
@@ -36,7 +36,7 @@
#include <paludis/user_dep_spec.hh>
#include <paludis/spec_tree.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -50,7 +50,7 @@ typedef std::list<UnwrittenRepositoryFileEntry> Entries;
namespace paludis
{
template <>
- struct Implementation<UnwrittenRepositoryFile>
+ struct Imp<UnwrittenRepositoryFile>
{
Entries entries;
};
@@ -63,7 +63,7 @@ namespace paludis
}
UnwrittenRepositoryFile::UnwrittenRepositoryFile(const FSEntry & f) :
- PrivateImplementationPattern<UnwrittenRepositoryFile>()
+ Pimp<UnwrittenRepositoryFile>()
{
_load(f);
}
@@ -349,7 +349,7 @@ UnwrittenRepositoryFile::_load(const FSEntry & f)
_imp->entries.push_back(*entry);
}
-template class PrivateImplementationPattern<UnwrittenRepositoryFile>;
+template class Pimp<UnwrittenRepositoryFile>;
template class WrappedForwardIterator<UnwrittenRepositoryFile::ConstIteratorTag,
const UnwrittenRepositoryFileEntry>;
diff --git a/paludis/repositories/unwritten/unwritten_repository_file.hh b/paludis/repositories/unwritten/unwritten_repository_file.hh
index 5448608..c7fc0aa 100644
--- a/paludis/repositories/unwritten/unwritten_repository_file.hh
+++ b/paludis/repositories/unwritten/unwritten_repository_file.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_FILE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_FILE_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/named_value.hh>
@@ -62,7 +62,7 @@ namespace paludis
};
class PALUDIS_VISIBLE UnwrittenRepositoryFile :
- private PrivateImplementationPattern<UnwrittenRepositoryFile>
+ private Pimp<UnwrittenRepositoryFile>
{
private:
void _load(const FSEntry &);
@@ -78,7 +78,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepositoryFile>;
+ extern template class Pimp<unwritten_repository::UnwrittenRepositoryFile>;
}
#endif
diff --git a/paludis/repositories/unwritten/unwritten_repository_store.cc b/paludis/repositories/unwritten/unwritten_repository_store.cc
index 63164e5..a7dc6ca 100644
--- a/paludis/repositories/unwritten/unwritten_repository_store.cc
+++ b/paludis/repositories/unwritten/unwritten_repository_store.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/unwritten/unwritten_repository_file.hh>
#include <paludis/repositories/unwritten/unwritten_id.hh>
#include <paludis/repositories/unwritten/unwritten_mask.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/dir_iterator.hh>
@@ -55,14 +55,14 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Implementation<UnwrittenRepositoryStore>
+ struct Imp<UnwrittenRepositoryStore>
{
const UnwrittenRepository * const repo;
mutable std::shared_ptr<CategoryNamePartSet> categories;
mutable PackageNames package_names;
mutable IDs ids;
- Implementation(const UnwrittenRepository * const r) :
+ Imp(const UnwrittenRepository * const r) :
repo(r),
categories(new CategoryNamePartSet)
{
@@ -74,7 +74,7 @@ UnwrittenRepositoryStore::UnwrittenRepositoryStore(
const Environment * const env,
const UnwrittenRepository * const repo,
const FSEntry & f) :
- PrivateImplementationPattern<UnwrittenRepositoryStore>(repo)
+ Pimp<UnwrittenRepositoryStore>(repo)
{
_populate(env, f);
}
@@ -197,5 +197,5 @@ UnwrittenRepositoryStore::package_ids(const QualifiedPackageName & p) const
return i->second;
}
-template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepositoryStore>;
+template class Pimp<unwritten_repository::UnwrittenRepositoryStore>;
diff --git a/paludis/repositories/unwritten/unwritten_repository_store.hh b/paludis/repositories/unwritten/unwritten_repository_store.hh
index 06f9a76..73517ba 100644
--- a/paludis/repositories/unwritten/unwritten_repository_store.hh
+++ b/paludis/repositories/unwritten/unwritten_repository_store.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_STORE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNWRITTEN_UNWRITTEN_REPOSITORY_STORE_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -34,7 +34,7 @@ namespace paludis
struct UnwrittenRepository;
class PALUDIS_VISIBLE UnwrittenRepositoryStore :
- private PrivateImplementationPattern<UnwrittenRepositoryStore>
+ private Pimp<UnwrittenRepositoryStore>
{
private:
void _populate_one(const Environment * const env, const FSEntry & f);
@@ -67,7 +67,7 @@ namespace paludis
};
}
- extern template class PrivateImplementationPattern<unwritten_repository::UnwrittenRepositoryStore>;
+ extern template class Pimp<unwritten_repository::UnwrittenRepositoryStore>;
}
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 677c8c7..cf6afff 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -26,7 +26,7 @@
#include <paludis/literal_metadata_key.hh>
#include <paludis/action.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
#include <paludis/util/map.hh>
@@ -49,7 +49,7 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace paludis
{
template<>
- struct Implementation<InstalledVirtualsRepository>
+ struct Imp<InstalledVirtualsRepository>
{
const Environment * const env;
const FSEntry root;
@@ -61,7 +61,7 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Implementation(const Environment * const e, const FSEntry & r, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
+ Imp(const Environment * const e, const FSEntry & r, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
env(e),
root(r),
ids_mutex(m),
@@ -117,8 +117,8 @@ InstalledVirtualsRepository::InstalledVirtualsRepository(const Environment * con
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- PrivateImplementationPattern<InstalledVirtualsRepository>(env, r),
- _imp(PrivateImplementationPattern<InstalledVirtualsRepository>::_imp)
+ Pimp<InstalledVirtualsRepository>(env, r),
+ _imp(Pimp<InstalledVirtualsRepository>::_imp)
{
add_metadata_key(_imp->root_key);
add_metadata_key(_imp->format_key);
@@ -222,7 +222,7 @@ InstalledVirtualsRepository::has_category_named(const CategoryNamePart & c) cons
void
InstalledVirtualsRepository::invalidate()
{
- _imp.reset(new Implementation<InstalledVirtualsRepository>(_imp->env, _imp->root, _imp->ids_mutex));
+ _imp.reset(new Imp<InstalledVirtualsRepository>(_imp->env, _imp->root, _imp->ids_mutex));
}
void
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index d14386a..a3ad32f 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -36,10 +36,10 @@ namespace paludis
public Repository,
public RepositoryDestinationInterface,
public std::enable_shared_from_this<InstalledVirtualsRepository>,
- private PrivateImplementationPattern<InstalledVirtualsRepository>
+ private Pimp<InstalledVirtualsRepository>
{
private:
- PrivateImplementationPattern<InstalledVirtualsRepository>::ImpPtr & _imp;
+ Pimp<InstalledVirtualsRepository>::ImpPtr & _imp;
void need_ids() const;
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 19b679b..b6f617f 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/virtuals/installed_virtuals_repository.hh>
#include <paludis/repositories/virtuals/virtuals_repository.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/make_named_values.hh>
@@ -50,7 +50,7 @@ using namespace paludis::virtuals;
namespace paludis
{
template <>
- struct Implementation<VirtualsDepKey>
+ struct Imp<VirtualsDepKey>
{
const Environment * const env;
const std::shared_ptr<DependencySpecTree> value;
@@ -60,7 +60,7 @@ namespace paludis
const std::string raw_name;
const std::string human_name;
- Implementation(const Environment * const e, const std::shared_ptr<const PackageID> & v,
+ Imp(const Environment * const e, const std::shared_ptr<const PackageID> & v,
const std::shared_ptr<const DependenciesLabelSequence> & l,
bool exact, const std::string & h, const std::string & r) :
env(e),
@@ -94,8 +94,8 @@ VirtualsDepKey::VirtualsDepKey(const Environment * const e, const std::string &
const std::shared_ptr<const PackageID> & v,
const std::shared_ptr<const DependenciesLabelSequence> & l,
const bool exact) :
- PrivateImplementationPattern<VirtualsDepKey>(e, v, l, exact, r, h),
- _imp(PrivateImplementationPattern<VirtualsDepKey>::_imp)
+ Pimp<VirtualsDepKey>(e, v, l, exact, r, h),
+ _imp(Pimp<VirtualsDepKey>::_imp)
{
}
@@ -160,7 +160,7 @@ VirtualsDepKey::initial_labels() const
namespace paludis
{
template <>
- struct Implementation<VirtualsPackageID>
+ struct Imp<VirtualsPackageID>
{
const Environment * const env;
const std::shared_ptr<const Repository> repository;
@@ -174,7 +174,7 @@ namespace paludis
mutable bool has_masks;
mutable Mutex mutex;
- Implementation(
+ Imp(
const Environment * const e,
const std::shared_ptr<const Repository> & o,
const QualifiedPackageName & n,
@@ -205,8 +205,8 @@ VirtualsPackageID::VirtualsPackageID(
const QualifiedPackageName & virtual_name,
const std::shared_ptr<const PackageID> & virtual_for,
const bool exact) :
- PrivateImplementationPattern<VirtualsPackageID>(e, owner, virtual_name, virtual_for, exact),
- _imp(PrivateImplementationPattern<VirtualsPackageID>::_imp)
+ Pimp<VirtualsPackageID>(e, owner, virtual_name, virtual_for, exact),
+ _imp(Pimp<VirtualsPackageID>::_imp)
{
add_metadata_key(_imp->virtual_for);
add_metadata_key(_imp->bdep);
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index 5bf39c7..d774468 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_VIRTUALS_PACKAGE_ID_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_VIRTUALS_PACKAGE_ID_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include