diff options
author | 2011-04-04 08:30:07 +0100 | |
---|---|---|
committer | 2011-04-04 08:33:00 +0100 | |
commit | c4bf825943d9999192931bca740a603dfb5b0ce4 (patch) | |
tree | 15f63e87ad1dd61a97e49a54d530cef12d3e9d76 | |
parent | 6d8fa49055b5c43117d98c020187be9bfa4fb2c6 (diff) | |
download | paludis-c4bf825943d9999192931bca740a603dfb5b0ce4.tar.gz paludis-c4bf825943d9999192931bca740a603dfb5b0ce4.tar.xz |
Make names consistent
-rw-r--r-- | paludis/generator.cc | 10 | ||||
-rw-r--r-- | paludis/package_dep_spec_properties.cc | 10 | ||||
-rw-r--r-- | paludis/package_dep_spec_properties.hh | 20 | ||||
-rw-r--r-- | paludis/paludislike_options_conf.cc | 10 | ||||
-rw-r--r-- | paludis/resolver/match_qpns.cc | 10 | ||||
-rw-r--r-- | src/clients/cave/cmd_execute_resolution.cc | 10 |
6 files changed, 35 insertions, 35 deletions
diff --git a/paludis/generator.cc b/paludis/generator.cc index bbee96285..b6fe5e44f 100644 --- a/paludis/generator.cc +++ b/paludis/generator.cc @@ -305,20 +305,20 @@ namespace const RepositoryContentMayExcludes & x) const { if (package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>( - n::has_any_slot_requirement() = indeterminate, + n::has_any_slot_constraint() = indeterminate, n::has_category_name_part() = indeterminate, - n::has_choice_requirements() = indeterminate, - n::has_exact_slot_requirement() = indeterminate, + n::has_choice_constraints() = indeterminate, + n::has_exact_slot_constraint() = indeterminate, n::has_from_repository() = indeterminate, n::has_in_repository() = false, n::has_installable_to_path() = indeterminate, n::has_installable_to_repository() = indeterminate, n::has_installed_at_path() = false, - n::has_key_requirements() = indeterminate, + n::has_key_constraints() = indeterminate, n::has_package() = indeterminate, n::has_package_name_part() = indeterminate, n::has_tag() = indeterminate, - n::has_version_requirements() = indeterminate + n::has_version_constraints() = indeterminate ))) return AllGeneratorHandlerBase::repositories(env, x); diff --git a/paludis/package_dep_spec_properties.cc b/paludis/package_dep_spec_properties.cc index 62a85633b..5dfaa8627 100644 --- a/paludis/package_dep_spec_properties.cc +++ b/paludis/package_dep_spec_properties.cc @@ -41,19 +41,19 @@ paludis::package_dep_spec_has_properties(const PackageDepSpec & spec, const Pack { bool result(true); - result = result && check(bool(spec.all_choice_constraints()) && ! spec.all_choice_constraints()->empty(), properties.has_choice_requirements()); + result = result && check(bool(spec.all_choice_constraints()) && ! spec.all_choice_constraints()->empty(), properties.has_choice_constraints()); result = result && check(bool(spec.category_name_part_constraint()), properties.has_category_name_part()); result = result && check(bool(spec.from_repository_constraint()), properties.has_from_repository()); - result = result && check(bool(spec.all_key_constraints()) && ! spec.all_key_constraints()->empty(), properties.has_key_requirements()); + result = result && check(bool(spec.all_key_constraints()) && ! spec.all_key_constraints()->empty(), properties.has_key_constraints()); result = result && check(bool(spec.in_repository_constraint()), properties.has_in_repository()); result = result && check(bool(spec.installable_to_path_constraint()), properties.has_installable_to_path()); result = result && check(bool(spec.installable_to_repository_constraint()), properties.has_installable_to_repository()); result = result && check(bool(spec.installed_at_path_constraint()), properties.has_installed_at_path()); result = result && check(bool(spec.package_name_constraint()), properties.has_package()); result = result && check(bool(spec.package_name_part_constraint()), properties.has_package_name_part()); - result = result && check(bool(spec.exact_slot_constraint()), properties.has_exact_slot_requirement()); - result = result && check(bool(spec.any_slot_constraint()), properties.has_any_slot_requirement()); - result = result && check(bool(spec.all_version_constraints()) && ! spec.all_version_constraints()->empty(), properties.has_version_requirements()); + result = result && check(bool(spec.exact_slot_constraint()), properties.has_exact_slot_constraint()); + result = result && check(bool(spec.any_slot_constraint()), properties.has_any_slot_constraint()); + result = result && check(bool(spec.all_version_constraints()) && ! spec.all_version_constraints()->empty(), properties.has_version_constraints()); return result; } diff --git a/paludis/package_dep_spec_properties.hh b/paludis/package_dep_spec_properties.hh index 093b58428..dedd625b3 100644 --- a/paludis/package_dep_spec_properties.hh +++ b/paludis/package_dep_spec_properties.hh @@ -28,20 +28,20 @@ namespace paludis { namespace n { - typedef Name<struct name_has_any_slot_requirement> has_any_slot_requirement; + typedef Name<struct name_has_any_slot_constraint> has_any_slot_constraint; typedef Name<struct name_has_category_name_part> has_category_name_part; - typedef Name<struct name_has_choice_requirements> has_choice_requirements; - typedef Name<struct name_has_exact_slot_requirement> has_exact_slot_requirement; + typedef Name<struct name_has_choice_constraints> has_choice_constraints; + typedef Name<struct name_has_exact_slot_constraint> has_exact_slot_constraint; typedef Name<struct name_has_from_repository> has_from_repository; typedef Name<struct name_has_in_repository> has_in_repository; typedef Name<struct name_has_installable_to_path> has_installable_to_path; typedef Name<struct name_has_installable_to_repository> has_installable_to_repository; typedef Name<struct name_has_installed_at_path> has_installed_at_path; - typedef Name<struct name_has_key_requirements> has_key_requirements; + typedef Name<struct name_has_key_constraints> has_key_constraints; typedef Name<struct name_has_package> has_package; typedef Name<struct name_has_package_name_part> has_package_name_part; typedef Name<struct name_has_tag> has_tag; - typedef Name<struct name_has_version_requirements> has_version_requirements; + typedef Name<struct name_has_version_constraints> has_version_constraints; } /** @@ -52,20 +52,20 @@ namespace paludis */ struct PackageDepSpecProperties { - NamedValue<n::has_any_slot_requirement, Tribool> has_any_slot_requirement; + NamedValue<n::has_any_slot_constraint, Tribool> has_any_slot_constraint; NamedValue<n::has_category_name_part, Tribool> has_category_name_part; - NamedValue<n::has_choice_requirements, Tribool> has_choice_requirements; - NamedValue<n::has_exact_slot_requirement, Tribool> has_exact_slot_requirement; + NamedValue<n::has_choice_constraints, Tribool> has_choice_constraints; + NamedValue<n::has_exact_slot_constraint, Tribool> has_exact_slot_constraint; NamedValue<n::has_from_repository, Tribool> has_from_repository; NamedValue<n::has_in_repository, Tribool> has_in_repository; NamedValue<n::has_installable_to_path, Tribool> has_installable_to_path; NamedValue<n::has_installable_to_repository, Tribool> has_installable_to_repository; NamedValue<n::has_installed_at_path, Tribool> has_installed_at_path; - NamedValue<n::has_key_requirements, Tribool> has_key_requirements; + NamedValue<n::has_key_constraints, Tribool> has_key_constraints; NamedValue<n::has_package, Tribool> has_package; NamedValue<n::has_package_name_part, Tribool> has_package_name_part; NamedValue<n::has_tag, Tribool> has_tag; - NamedValue<n::has_version_requirements, Tribool> has_version_requirements; + NamedValue<n::has_version_constraints, Tribool> has_version_constraints; }; } diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc index 52b47d3f6..5a35e9bc4 100644 --- a/paludis/paludislike_options_conf.cc +++ b/paludis/paludislike_options_conf.cc @@ -341,20 +341,20 @@ namespace bool match_anything(const PackageDepSpec & spec) { return package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>( - n::has_any_slot_requirement() = indeterminate, + n::has_any_slot_constraint() = indeterminate, n::has_category_name_part() = false, - n::has_choice_requirements() = false, - n::has_exact_slot_requirement() = false, + n::has_choice_constraints() = false, + n::has_exact_slot_constraint() = false, n::has_from_repository() = false, n::has_in_repository() = false, n::has_installable_to_path() = false, n::has_installable_to_repository() = false, n::has_installed_at_path() = false, - n::has_key_requirements() = false, + n::has_key_constraints() = false, n::has_package() = false, n::has_package_name_part() = false, n::has_tag() = false, - n::has_version_requirements() = false + n::has_version_constraints() = false )); } diff --git a/paludis/resolver/match_qpns.cc b/paludis/resolver/match_qpns.cc index bb9c98eb7..e277e848a 100644 --- a/paludis/resolver/match_qpns.cc +++ b/paludis/resolver/match_qpns.cc @@ -41,20 +41,20 @@ paludis::resolver::match_qpns( * either can be wildcards (we could work for :slot too, * but we're lazy) */ if (! package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>( - n::has_any_slot_requirement() = false, + n::has_any_slot_constraint() = false, n::has_category_name_part() = indeterminate, - n::has_choice_requirements() = false, - n::has_exact_slot_requirement() = false, + n::has_choice_constraints() = false, + n::has_exact_slot_constraint() = false, n::has_from_repository() = false, n::has_in_repository() = false, n::has_installable_to_path() = false, n::has_installable_to_repository() = false, n::has_installed_at_path() = false, - n::has_key_requirements() = false, + n::has_key_constraints() = false, n::has_package() = indeterminate, n::has_package_name_part() = indeterminate, n::has_tag() = false, - n::has_version_requirements() = false + n::has_version_constraints() = false ))) return false; diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc index ffbc61d1b..bcf30bc87 100644 --- a/src/clients/cave/cmd_execute_resolution.cc +++ b/src/clients/cave/cmd_execute_resolution.cc @@ -685,20 +685,20 @@ namespace PackageDepSpec spec(parse_user_package_dep_spec(std::get<2>(p), env.get(), { updso_no_disambiguation })); if (package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>( - n::has_any_slot_requirement() = false, + n::has_any_slot_constraint() = false, n::has_category_name_part() = false, - n::has_choice_requirements() = false, - n::has_exact_slot_requirement() = false, + n::has_choice_constraints() = false, + n::has_exact_slot_constraint() = false, n::has_from_repository() = false, n::has_in_repository() = false, n::has_installable_to_path() = false, n::has_installable_to_repository() = false, n::has_installed_at_path() = false, - n::has_key_requirements() = false, + n::has_key_constraints() = false, n::has_package() = true, n::has_package_name_part() = false, n::has_tag() = indeterminate, - n::has_version_requirements() = false + n::has_version_constraints() = false ))) { any = true; |