aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-27 20:04:01 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-27 20:13:27 +0000
commiteef0a4a7287dd35d0224a915ee46ae81e8977ec6 (patch)
tree76ab185c16341db1230e1d1e76e63859a815e03a
parente15546d2c1118e12506b48c8868e1f52cee44b8b (diff)
downloadpaludis-eef0a4a7287dd35d0224a915ee46ae81e8977ec6.tar.gz
paludis-eef0a4a7287dd35d0224a915ee46ae81e8977ec6.tar.xz
Remove old elike choices
-rw-r--r--paludis/elike_choices-fwd.hh2
-rw-r--r--paludis/elike_choices.cc149
-rw-r--r--paludis/elike_choices.hh52
3 files changed, 0 insertions, 203 deletions
diff --git a/paludis/elike_choices-fwd.hh b/paludis/elike_choices-fwd.hh
index 1d69eae..25df2e8 100644
--- a/paludis/elike_choices-fwd.hh
+++ b/paludis/elike_choices-fwd.hh
@@ -27,8 +27,6 @@
namespace paludis
{
- struct ELikeStripChoiceValue;
- struct ELikeSplitChoiceValue;
struct ELikeOptionalTestsChoiceValue;
struct ELikeRecommendedTestsChoiceValue;
struct ELikeExpensiveTestsChoiceValue;
diff --git a/paludis/elike_choices.cc b/paludis/elike_choices.cc
index 61c9788..d7cd238 100644
--- a/paludis/elike_choices.cc
+++ b/paludis/elike_choices.cc
@@ -79,155 +79,6 @@ namespace
}
const UnprefixedChoiceName
-ELikeStripChoiceValue::canonical_unprefixed_name()
-{
- return UnprefixedChoiceName("strip");
-}
-
-const ChoiceNameWithPrefix
-ELikeStripChoiceValue::canonical_name_with_prefix()
-{
- return ChoiceNameWithPrefix(stringify(canonical_build_options_prefix()) + ":" + stringify(canonical_unprefixed_name()));
-}
-
-ELikeStripChoiceValue::ELikeStripChoiceValue(const std::shared_ptr<const PackageID> & id,
- const Environment * const env, const std::shared_ptr<const Choice> & choice, const Tribool forced_value) :
- _enabled(forced_value.is_indeterminate() ? ! env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_false() :
- forced_value.is_true() ? true : false),
- _forced(! forced_value.is_indeterminate())
-{
-}
-
-const UnprefixedChoiceName
-ELikeStripChoiceValue::unprefixed_name() const
-{
- return canonical_unprefixed_name();
-}
-
-const ChoiceNameWithPrefix
-ELikeStripChoiceValue::name_with_prefix() const
-{
- return canonical_name_with_prefix();
-}
-
-bool
-ELikeStripChoiceValue::enabled() const
-{
- return _enabled;
-}
-
-bool
-ELikeStripChoiceValue::enabled_by_default() const
-{
- return true;
-}
-
-bool
-ELikeStripChoiceValue::locked() const
-{
- return false;
-}
-
-const std::string
-ELikeStripChoiceValue::description() const
-{
- return "Strip binaries and libraries before installation";
-}
-
-bool
-ELikeStripChoiceValue::explicitly_listed() const
-{
- return true;
-}
-
-const std::string
-ELikeStripChoiceValue::parameter() const
-{
- return "";
-}
-
-const std::shared_ptr<const PermittedChoiceValueParameterValues>
-ELikeStripChoiceValue::permitted_parameter_values() const
-{
- return make_null_shared_ptr();
-}
-
-const UnprefixedChoiceName
-ELikeSplitChoiceValue::canonical_unprefixed_name()
-{
- return UnprefixedChoiceName("split");
-}
-
-const ChoiceNameWithPrefix
-ELikeSplitChoiceValue::canonical_name_with_prefix()
-{
- return ChoiceNameWithPrefix(stringify(canonical_build_options_prefix()) + ":" + stringify(canonical_unprefixed_name()));
-}
-
-ELikeSplitChoiceValue::ELikeSplitChoiceValue(const std::shared_ptr<const PackageID> & id,
- const Environment * const env, const std::shared_ptr<const Choice> & choice,
- const Tribool forced_value) :
- _enabled(forced_value.is_indeterminate() ? ! env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_false() :
- forced_value.is_true() ? true : false),
- _forced(! forced_value.is_indeterminate())
-{
-}
-
-const UnprefixedChoiceName
-ELikeSplitChoiceValue::unprefixed_name() const
-{
- return canonical_unprefixed_name();
-}
-
-const ChoiceNameWithPrefix
-ELikeSplitChoiceValue::name_with_prefix() const
-{
- return canonical_name_with_prefix();
-}
-
-bool
-ELikeSplitChoiceValue::enabled() const
-{
- return _enabled;
-}
-
-bool
-ELikeSplitChoiceValue::enabled_by_default() const
-{
- return true;
-}
-
-bool
-ELikeSplitChoiceValue::locked() const
-{
- return false;
-}
-
-const std::string
-ELikeSplitChoiceValue::description() const
-{
- return "Split debugging information out from binaries and libraries before installation";
-}
-
-bool
-ELikeSplitChoiceValue::explicitly_listed() const
-{
- return true;
-}
-
-const std::string
-ELikeSplitChoiceValue::parameter() const
-{
- return "";
-}
-
-const std::shared_ptr<const PermittedChoiceValueParameterValues>
-ELikeSplitChoiceValue::permitted_parameter_values() const
-{
- return make_null_shared_ptr();
-}
-
-const UnprefixedChoiceName
ELikeOptionalTestsChoiceValue::canonical_unprefixed_name()
{
return UnprefixedChoiceName("optional_tests");
diff --git a/paludis/elike_choices.hh b/paludis/elike_choices.hh
index 9d8d4de..ac07b97 100644
--- a/paludis/elike_choices.hh
+++ b/paludis/elike_choices.hh
@@ -29,58 +29,6 @@
namespace paludis
{
- class PALUDIS_VISIBLE ELikeStripChoiceValue :
- public ChoiceValue
- {
- private:
- const bool _enabled;
- const bool _forced;
-
- public:
- ELikeStripChoiceValue(const std::shared_ptr<const PackageID> &,
- const Environment * const env, const std::shared_ptr<const Choice> &, const Tribool forced_value);
-
- virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool explicitly_listed() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
- static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result));
- static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result));
- };
-
- class PALUDIS_VISIBLE ELikeSplitChoiceValue :
- public ChoiceValue
- {
- private:
- const bool _enabled;
- const bool _forced;
-
- public:
- ELikeSplitChoiceValue(const std::shared_ptr<const PackageID> &,
- const Environment * const env, const std::shared_ptr<const Choice> &, const Tribool forced_value);
-
- virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool explicitly_listed() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
- static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result));
- static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result));
- };
-
class PALUDIS_VISIBLE ELikeOptionalTestsChoiceValue :
public ChoiceValue
{