diff options
author | 2011-04-04 09:05:11 +0100 | |
---|---|---|
committer | 2011-04-04 09:05:11 +0100 | |
commit | 658a603da143398c3fbf3db3d335ffc92bb7cbb5 (patch) | |
tree | 52f642b927f840355d27564dece84589b2be4966 | |
parent | 24abae91fd231c1c4d64bf2819f7322b822d5206 (diff) | |
download | paludis-658a603da143398c3fbf3db3d335ffc92bb7cbb5.tar.gz paludis-658a603da143398c3fbf3db3d335ffc92bb7cbb5.tar.xz |
Naming consistency
-rw-r--r-- | paludis/changed_choices.cc | 2 | ||||
-rw-r--r-- | paludis/changed_choices.hh | 2 | ||||
-rw-r--r-- | paludis/partially_made_package_dep_spec.cc | 4 | ||||
-rw-r--r-- | paludis/partially_made_package_dep_spec.hh | 50 | ||||
-rw-r--r-- | paludis/resolver/decider.cc | 4 | ||||
-rw-r--r-- | src/clients/cave/cmd_print_spec.cc | 4 |
6 files changed, 33 insertions, 33 deletions
diff --git a/paludis/changed_choices.cc b/paludis/changed_choices.cc index 844346e6c..4ed5af09f 100644 --- a/paludis/changed_choices.cc +++ b/paludis/changed_choices.cc @@ -59,7 +59,7 @@ ChangedChoices::empty() const } void -ChangedChoices::add_additional_requirements_to(PartiallyMadePackageDepSpec & spec) const +ChangedChoices::add_constraints_to(PartiallyMadePackageDepSpec & spec) const { for (auto o(_imp->overrides.begin()), o_end(_imp->overrides.end()) ; o != o_end ; ++o) diff --git a/paludis/changed_choices.hh b/paludis/changed_choices.hh index 59670cf79..754c582e8 100644 --- a/paludis/changed_choices.hh +++ b/paludis/changed_choices.hh @@ -47,7 +47,7 @@ namespace paludis bool empty() const PALUDIS_ATTRIBUTE((warn_unused_result)); - void add_additional_requirements_to(PartiallyMadePackageDepSpec &) const; + void add_constraints_to(PartiallyMadePackageDepSpec &) const; void serialise(Serialiser &) const; diff --git a/paludis/partially_made_package_dep_spec.cc b/paludis/partially_made_package_dep_spec.cc index 1153a9174..7fad45450 100644 --- a/paludis/partially_made_package_dep_spec.cc +++ b/paludis/partially_made_package_dep_spec.cc @@ -607,7 +607,7 @@ PartiallyMadePackageDepSpec::version_constraint(const VersionSpec & vs, const Ve } PartiallyMadePackageDepSpec & -PartiallyMadePackageDepSpec::clear_version_requirements() +PartiallyMadePackageDepSpec::clear_version() { _imp->data->all_versions.reset(); return *this; @@ -632,7 +632,7 @@ PartiallyMadePackageDepSpec::choice_constraint(const std::shared_ptr<const Choic } PartiallyMadePackageDepSpec & -PartiallyMadePackageDepSpec::clear_choice_requirements() +PartiallyMadePackageDepSpec::clear_choices() { _imp->data->all_choices.reset(); return *this; diff --git a/paludis/partially_made_package_dep_spec.hh b/paludis/partially_made_package_dep_spec.hh index 97f02e479..01dbb56ae 100644 --- a/paludis/partially_made_package_dep_spec.hh +++ b/paludis/partially_made_package_dep_spec.hh @@ -51,19 +51,19 @@ namespace paludis ///\} /** - * Set our package requirements, return ourself. + * Set our package constraints, return ourself. */ PartiallyMadePackageDepSpec & package(const QualifiedPackageName &); /** - * Clear our package requirements, return ourself. + * Clear our package constraints, return ourself. * * \since 0.55 */ PartiallyMadePackageDepSpec & clear_package(); /** - * Set our exact slot requirements, return ourself. + * Set our exact slot constraints, return ourself. * * \since 0.61 */ @@ -71,7 +71,7 @@ namespace paludis const SlotName &, const bool); /** - * Set our locked slot requirements, return ourself. + * Set our locked slot constraints, return ourself. * * \since 0.61 */ @@ -79,104 +79,104 @@ namespace paludis const bool); /** - * Clear our exact slot requirements, return ourself. + * Clear our exact slot constraints, return ourself. * * \since 0.61 */ PartiallyMadePackageDepSpec & clear_exact_slot(); /** - * Clear our any slot requirements, return ourself. + * Clear our any slot constraints, return ourself. * * \since 0.61 */ PartiallyMadePackageDepSpec & clear_any_slot(); /** - * Set our in-repository requirement, return ourself. + * Set our in-repository constraint, return ourself. */ PartiallyMadePackageDepSpec & in_repository(const RepositoryName &); /** - * Clear our in-repository requirement, return ourself. + * Clear our in-repository constraint, return ourself. * * \since 0.55 */ PartiallyMadePackageDepSpec & clear_in_repository(); /** - * Set our from-repository requirement, return ourself. + * Set our from-repository constraint, return ourself. */ PartiallyMadePackageDepSpec & from_repository(const RepositoryName &); /** - * Clear our from-repository requirement, return ourself. + * Clear our from-repository constraint, return ourself. * * \since 0.55 */ PartiallyMadePackageDepSpec & clear_from_repository(); /** - * Set our installable-to-repository requirement, return ourself. + * Set our installable-to-repository constraint, return ourself. * * \since 0.61 */ PartiallyMadePackageDepSpec & installable_to_repository(const RepositoryName &, const bool); /** - * Clear our installable-to-repository requirement, return ourself. + * Clear our installable-to-repository constraint, return ourself. * * \since 0.55 */ PartiallyMadePackageDepSpec & clear_installable_to_repository(); /** - * Set our installed-at-path requirement, return ourself. + * Set our installed-at-path constraint, return ourself. * * \since 0.32 */ PartiallyMadePackageDepSpec & installed_at_path(const FSPath &); /** - * Clear our installed-at-path requirement, return ourself. + * Clear our installed-at-path constraint, return ourself. * * \since 0.55 */ PartiallyMadePackageDepSpec & clear_installed_at_path(); /** - * Set our installable-to-path requirement, return ourself. + * Set our installable-to-path constraint, return ourself. * * \since 0.61 */ PartiallyMadePackageDepSpec & installable_to_path(const FSPath &, const bool include_masked); /** - * Clear our installable-to-path requirement, return ourself. + * Clear our installable-to-path constraint, return ourself. * * \since 0.55 */ PartiallyMadePackageDepSpec & clear_installable_to_path(); /** - * Set our package name part requirements, return ourself. + * Set our package name part constraints, return ourself. */ PartiallyMadePackageDepSpec & package_name_part(const PackageNamePart &); /** - * Clear our package name part requirements, return ourself. + * Clear our package name part constraints, return ourself. * * \since 0.55 */ PartiallyMadePackageDepSpec & clear_package_name_part(); /** - * Set our category name part requirements, return ourself. + * Set our category name part constraints, return ourself. */ PartiallyMadePackageDepSpec & category_name_part(const CategoryNamePart &); /** - * Clear our category name part requirements, return ourself. + * Clear our category name part constraints, return ourself. * * \since 0.55 */ @@ -191,11 +191,11 @@ namespace paludis const VersionSpec &, const VersionOperator &, const VersionConstraintCombiner); /** - * Clear all version requirement, return ourself. + * Clear all version constraints, return ourself. * * \since 0.55 */ - PartiallyMadePackageDepSpec & clear_version_requirements(); + PartiallyMadePackageDepSpec & clear_version(); /** * Add a choice constraint, return ourself. @@ -206,17 +206,17 @@ namespace paludis const std::shared_ptr<const ChoiceConstraint> &); /** - * Add a key requirement, return ourself. + * Add a key constraint, return ourself. */ PartiallyMadePackageDepSpec & key_constraint( const std::string & key, const KeyConstraintOperation, const std::string & pattern); /** - * Clear choice requirements, return ourself. + * Clear choice constraints, return ourself. * * \since 0.61 */ - PartiallyMadePackageDepSpec & clear_choice_requirements(); + PartiallyMadePackageDepSpec & clear_choices(); /** * Turn ourselves into a PackageDepSpec. diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 75bc9c98c..69c3f5918 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -1071,11 +1071,11 @@ Decider::_make_spec_for_preloading(const PackageDepSpec & spec, /* we don't want to copy use deps from the constraint, since things like * [foo?] start to get weird when there's no longer an associated ID. */ - result.clear_choice_requirements(); + result.clear_choices(); /* but we do want to impose our own ChangedChoices if necessary. */ if (changed_choices) - changed_choices->add_additional_requirements_to(result); + changed_choices->add_constraints_to(result); return result; } diff --git a/src/clients/cave/cmd_print_spec.cc b/src/clients/cave/cmd_print_spec.cc index ccf12b73b..ad6f36015 100644 --- a/src/clients/cave/cmd_print_spec.cc +++ b/src/clients/cave/cmd_print_spec.cc @@ -235,7 +235,7 @@ namespace if (cmdline.a_version_requirement.specified()) { - s.clear_version_requirements(); + s.clear_version(); for (args::StringSetArg::ConstIterator a(cmdline.a_version_requirement.begin_args()), a_end(cmdline.a_version_requirement.end_args()) ; @@ -253,7 +253,7 @@ namespace if (cmdline.a_additional_requirement.specified()) { - s.clear_choice_requirements(); + s.clear_choices(); for (args::StringSetArg::ConstIterator a(cmdline.a_additional_requirement.begin_args()), a_end(cmdline.a_additional_requirement.end_args()) ; |