aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-05 04:43:18 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-05 04:43:18 +0100
commit129acafc8937a5143633c8e21c3e260dfb38df7e (patch)
tree63bc413309bc4721aeb238df44d92d45cfc4bbe6
parent58d38200b5a29264f4b15311461038143acb9149 (diff)
downloadpaludis-129acafc8937a5143633c8e21c3e260dfb38df7e.tar.gz
paludis-129acafc8937a5143633c8e21c3e260dfb38df7e.tar.xz
RestrictSpecTree -> PlainTextSpecTree
-rw-r--r--doc/api/cplusplus/examples/example_dep_spec_flattener.cc8
-rw-r--r--doc/api/cplusplus/examples/example_metadata_key.cc4
-rw-r--r--paludis/dep_spec_flattener.cc2
-rw-r--r--paludis/dep_tree-fwd.hh4
-rw-r--r--paludis/dep_tree.cc10
-rw-r--r--paludis/dep_tree.hh14
-rw-r--r--paludis/metadata_key.cc2
-rw-r--r--paludis/metadata_key.hh2
-rw-r--r--paludis/repositories/e/dep_parser.cc26
-rw-r--r--paludis/repositories/e/dep_parser.hh4
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc4
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh2
-rw-r--r--paludis/repositories/e/e_key.cc28
-rw-r--r--paludis/repositories/e/e_key.hh18
-rw-r--r--paludis/repositories/e/e_repository_id.hh2
-rw-r--r--paludis/repositories/e/ebuild_entries.cc12
-rw-r--r--paludis/repositories/e/ebuild_id.cc6
-rw-r--r--paludis/repositories/e/ebuild_id.hh2
-rw-r--r--paludis/repositories/e/qa/metadata_keys.cc4
-rw-r--r--paludis/repositories/e/qa/restrict_key.cc10
-rw-r--r--paludis/repositories/e/qa/spec_keys.cc2
-rw-r--r--paludis/repositories/fake/fake_package_id.cc4
-rw-r--r--python/dep_spec.cc6
-rw-r--r--python/formatter.cc12
-rw-r--r--python/metadata_key.cc6
-rw-r--r--python/nice_names.nn2
-rw-r--r--ruby/dep_spec.cc2
-rw-r--r--ruby/metadata_key.cc12
-rw-r--r--ruby/nice_names.nn2
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc2
-rw-r--r--src/clients/inquisitio/key_extractor.cc2
-rw-r--r--src/clients/instruo/instruo.cc4
-rw-r--r--src/clients/paludis/applets.cc2
-rw-r--r--src/clients/paludis/info.cc2
-rw-r--r--src/clients/qualudis/qualudis.cc2
-rw-r--r--src/output/console_query_task.cc2
-rw-r--r--src/output/mask_displayer.cc2
37 files changed, 115 insertions, 115 deletions
diff --git a/doc/api/cplusplus/examples/example_dep_spec_flattener.cc b/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
index 9d3f73a..5bd5925 100644
--- a/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
+++ b/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
@@ -85,13 +85,13 @@ int main(int argc, char * argv[])
* Instead, we use PackageID::find_metadata to see if the key we
* want exists, and then visitor_cast<> to see whether it's of a
* suitable type (the key could be something other than a
- * MetadataSpecTreeKey<RestrictSpecTree>). */
+ * MetadataSpecTreeKey<PlainTextSpecTree>). */
if ((*i)->end_metadata() != (*i)->find_metadata("RESTRICT") &&
- visitor_cast<const MetadataSpecTreeKey<RestrictSpecTree> >(**(*i)->find_metadata("RESTRICT")))
+ visitor_cast<const MetadataSpecTreeKey<PlainTextSpecTree> >(**(*i)->find_metadata("RESTRICT")))
{
- DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec> restricts(env.get());
+ DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(env.get());
- visitor_cast<const MetadataSpecTreeKey<RestrictSpecTree> >(
+ visitor_cast<const MetadataSpecTreeKey<PlainTextSpecTree> >(
**(*i)->find_metadata("RESTRICT"))->value()->accept(restricts);
cout << " " << left << setw(24) << "Restricts:" << " "
diff --git a/doc/api/cplusplus/examples/example_metadata_key.cc b/doc/api/cplusplus/examples/example_metadata_key.cc
index be7c3ec..1cf28cf 100644
--- a/doc/api/cplusplus/examples/example_metadata_key.cc
+++ b/doc/api/cplusplus/examples/example_metadata_key.cc
@@ -130,9 +130,9 @@ namespace
}
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & key)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & key)
{
- cout << indent << left << setw(30) << " Class:" << " " << "MetadataSpecTreeKey<RestrictSpecTree>" << endl;
+ cout << indent << left << setw(30) << " Class:" << " " << "MetadataSpecTreeKey<PlainTextSpecTree>" << endl;
cout << indent << left << setw(30) << " Value:" << " " << key.pretty_print_flat(formatter) << endl;
}
diff --git a/paludis/dep_spec_flattener.cc b/paludis/dep_spec_flattener.cc
index f40460c..2cb7555 100644
--- a/paludis/dep_spec_flattener.cc
+++ b/paludis/dep_spec_flattener.cc
@@ -145,6 +145,6 @@ DepSpecFlattener<Heirarchy_, Item_>::visit_leaf(const Item_ & p)
template class DepSpecFlattener<ProvideSpecTree, PackageDepSpec>;
template class DepSpecFlattener<SetSpecTree, PackageDepSpec>;
-template class DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec>;
+template class DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>;
template class DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>;
diff --git a/paludis/dep_tree-fwd.hh b/paludis/dep_tree-fwd.hh
index 96b88d2..8b5356f 100644
--- a/paludis/dep_tree-fwd.hh
+++ b/paludis/dep_tree-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,7 +34,7 @@ namespace paludis
struct SimpleURISpecTree;
struct FlattenableSpecTree;
struct ProvideSpecTree;
- struct RestrictSpecTree;
+ struct PlainTextSpecTree;
struct DependencySpecTree;
struct SetSpecTree;
}
diff --git a/paludis/dep_tree.cc b/paludis/dep_tree.cc
index fa06ed7..0d8b0b2 100644
--- a/paludis/dep_tree.cc
+++ b/paludis/dep_tree.cc
@@ -59,11 +59,11 @@ template class TreeLeaf<ProvideSpecTree, PackageDepSpec>;
template class ConstTreeSequence<ProvideSpecTree, AllDepSpec>;
template class ConstTreeSequence<ProvideSpecTree, ConditionalDepSpec>;
-template class ConstVisitor<RestrictSpecTree>;
-template class ConstAcceptInterface<RestrictSpecTree>;
-template class TreeLeaf<RestrictSpecTree, PlainTextDepSpec>;
-template class ConstTreeSequence<RestrictSpecTree, AllDepSpec>;
-template class ConstTreeSequence<RestrictSpecTree, ConditionalDepSpec>;
+template class ConstVisitor<PlainTextSpecTree>;
+template class ConstAcceptInterface<PlainTextSpecTree>;
+template class TreeLeaf<PlainTextSpecTree, PlainTextDepSpec>;
+template class ConstTreeSequence<PlainTextSpecTree, AllDepSpec>;
+template class ConstTreeSequence<PlainTextSpecTree, ConditionalDepSpec>;
template class ConstVisitor<DependencySpecTree>;
template class TreeLeaf<DependencySpecTree, PackageDepSpec>;
diff --git a/paludis/dep_tree.hh b/paludis/dep_tree.hh
index c383139..98e9d6e 100644
--- a/paludis/dep_tree.hh
+++ b/paludis/dep_tree.hh
@@ -214,19 +214,19 @@ namespace paludis
};
/**
- * A heirarchy of restrict keywords.
+ * A heirarchy of plain text values.
*
* \ingroup g_dep_spec
- * \since 0.26
+ * \since 0.30
* \nosubgrouping
*/
- struct RestrictSpecTree :
+ struct PlainTextSpecTree :
VisitorTypes<
- RestrictSpecTree,
+ PlainTextSpecTree,
DepSpec,
- TreeLeaf<RestrictSpecTree, PlainTextDepSpec>,
- ConstTreeSequence<RestrictSpecTree, AllDepSpec>,
- ConstTreeSequence<RestrictSpecTree, ConditionalDepSpec>
+ TreeLeaf<PlainTextSpecTree, PlainTextDepSpec>,
+ ConstTreeSequence<PlainTextSpecTree, AllDepSpec>,
+ ConstTreeSequence<PlainTextSpecTree, ConditionalDepSpec>
>
{
/**
diff --git a/paludis/metadata_key.cc b/paludis/metadata_key.cc
index b114609..3bb8ffe 100644
--- a/paludis/metadata_key.cc
+++ b/paludis/metadata_key.cc
@@ -149,7 +149,7 @@ template class MetadataCollectionKey<FSEntrySequence>;
template class MetadataSpecTreeKey<LicenseSpecTree>;
template class MetadataSpecTreeKey<ProvideSpecTree>;
-template class MetadataSpecTreeKey<RestrictSpecTree>;
+template class MetadataSpecTreeKey<PlainTextSpecTree>;
#ifndef PALUDIS_NO_EXPLICIT_FULLY_SPECIALISED
template class MetadataSpecTreeKey<FetchableURISpecTree>;
template class MetadataSpecTreeKey<DependencySpecTree>;
diff --git a/paludis/metadata_key.hh b/paludis/metadata_key.hh
index 67df1a6..52c7d02 100644
--- a/paludis/metadata_key.hh
+++ b/paludis/metadata_key.hh
@@ -73,7 +73,7 @@ namespace paludis
MetadataSpecTreeKey<FetchableURISpecTree>,
MetadataSpecTreeKey<SimpleURISpecTree>,
MetadataSpecTreeKey<ProvideSpecTree>,
- MetadataSpecTreeKey<RestrictSpecTree>,
+ MetadataSpecTreeKey<PlainTextSpecTree>,
MetadataValueKey<std::string>,
MetadataValueKey<long>,
MetadataValueKey<bool>,
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index f1df99a..2ae82c4 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -101,7 +101,7 @@ namespace
}
template <typename T_>
- void restrict_handler(const typename ParseStackTypes<T_>::Stack & h, const std::string & s)
+ void plain_text_handler(const typename ParseStackTypes<T_>::Stack & h, const std::string & s)
{
(*h.begin()).add_handler()(make_shared_ptr(new TreeLeaf<T_, PlainTextDepSpec>(make_shared_ptr(new PlainTextDepSpec(s)))));
}
@@ -395,32 +395,32 @@ paludis::erepository::parse_license(const std::string & s,
return (*stack.begin()).item();
}
-std::tr1::shared_ptr<RestrictSpecTree::ConstItem>
-paludis::erepository::parse_restrict(const std::string & s,
+std::tr1::shared_ptr<PlainTextSpecTree::ConstItem>
+paludis::erepository::parse_plain_text(const std::string & s,
const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI &)
{
using namespace std::tr1::placeholders;
- ParseStackTypes<RestrictSpecTree>::Stack stack;
- std::tr1::shared_ptr<ConstTreeSequence<RestrictSpecTree, AllDepSpec> > top(
- new ConstTreeSequence<RestrictSpecTree, AllDepSpec>(make_shared_ptr(new AllDepSpec)));
- stack.push_front(make_named_values<ParseStackTypes<RestrictSpecTree>::Item>(
- value_for<n::add_handler>(std::tr1::bind(&ConstTreeSequence<RestrictSpecTree, AllDepSpec>::add, top.get(), _1)),
+ ParseStackTypes<PlainTextSpecTree>::Stack stack;
+ std::tr1::shared_ptr<ConstTreeSequence<PlainTextSpecTree, AllDepSpec> > top(
+ new ConstTreeSequence<PlainTextSpecTree, AllDepSpec>(make_shared_ptr(new AllDepSpec)));
+ stack.push_front(make_named_values<ParseStackTypes<PlainTextSpecTree>::Item>(
+ value_for<n::add_handler>(std::tr1::bind(&ConstTreeSequence<PlainTextSpecTree, AllDepSpec>::add, top.get(), _1)),
value_for<n::item>(top)
));
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
- value_for<n::on_all>(std::tr1::bind(&any_all_handler<RestrictSpecTree, AllDepSpec>, std::tr1::ref(stack))),
+ value_for<n::on_all>(std::tr1::bind(&any_all_handler<PlainTextSpecTree, AllDepSpec>, std::tr1::ref(stack))),
value_for<n::on_annotations>(&discard_annotations),
value_for<n::on_any>(std::tr1::bind(&any_not_allowed_handler, s)),
value_for<n::on_arrow>(std::tr1::bind(&arrows_not_allowed_handler, s, _1, _2)),
value_for<n::on_error>(std::tr1::bind(&error_handler, s, _1)),
value_for<n::on_label>(std::tr1::bind(&labels_not_allowed_handler, s, _1)),
- value_for<n::on_pop>(std::tr1::bind(&pop_handler<RestrictSpecTree>, std::tr1::ref(stack), s)),
- value_for<n::on_should_be_empty>(std::tr1::bind(&should_be_empty_handler<RestrictSpecTree>, std::tr1::ref(stack), s)),
- value_for<n::on_string>(std::tr1::bind(&restrict_handler<RestrictSpecTree>, std::tr1::ref(stack), _1)),
- value_for<n::on_use>(std::tr1::bind(&use_handler<RestrictSpecTree>, std::tr1::ref(stack), _1, env, id)),
+ value_for<n::on_pop>(std::tr1::bind(&pop_handler<PlainTextSpecTree>, std::tr1::ref(stack), s)),
+ value_for<n::on_should_be_empty>(std::tr1::bind(&should_be_empty_handler<PlainTextSpecTree>, std::tr1::ref(stack), s)),
+ value_for<n::on_string>(std::tr1::bind(&plain_text_handler<PlainTextSpecTree>, std::tr1::ref(stack), _1)),
+ value_for<n::on_use>(std::tr1::bind(&use_handler<PlainTextSpecTree>, std::tr1::ref(stack), _1, env, id)),
value_for<n::on_use_under_any>(&do_nothing)
));
diff --git a/paludis/repositories/e/dep_parser.hh b/paludis/repositories/e/dep_parser.hh
index 20a46f2..506dd09 100644
--- a/paludis/repositories/e/dep_parser.hh
+++ b/paludis/repositories/e/dep_parser.hh
@@ -68,9 +68,9 @@ namespace paludis
const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
- * Parse a restrict.
+ * Parse a restrict or plain text heirarchy.
*/
- std::tr1::shared_ptr<RestrictSpecTree::ConstItem> parse_restrict(const std::string & s,
+ std::tr1::shared_ptr<PlainTextSpecTree::ConstItem> parse_plain_text(const std::string & s,
const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index fb1e94f..08f207d 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -263,7 +263,7 @@ EInstalledRepositoryID::need_keys_added() const
if (! vars->restrictions().name().empty())
if ((_imp->dir / vars->restrictions().name()).exists())
{
- _imp->restrictions.reset(new ERestrictKey(_imp->environment, shared_from_this(), vars->restrictions().name(),
+ _imp->restrictions.reset(new EPlainTextSpecKey(_imp->environment, shared_from_this(), vars->restrictions().name(),
vars->restrictions().description(),
file_contents(_imp->dir / vars->restrictions().name()), mkt_internal));
add_metadata_key(_imp->restrictions);
@@ -551,7 +551,7 @@ EInstalledRepositoryID::suggested_dependencies_key() const
return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
EInstalledRepositoryID::restrict_key() const
{
need_keys_added();
diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh
index d453368..a2ea2bc 100644
--- a/paludis/repositories/e/e_installed_repository_id.hh
+++ b/paludis/repositories/e/e_installed_repository_id.hh
@@ -66,7 +66,7 @@ namespace paludis
virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const;
virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index c318775..c49300a 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -303,10 +303,10 @@ EFetchableURIKey::initial_label() const
if (! _imp->initial_label)
{
- DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec> f(_imp->env);
+ DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> f(_imp->env);
if (_imp->id->restrict_key())
_imp->id->restrict_key()->value()->accept(f);
- for (DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec>::ConstIterator i(f.begin()), i_end(f.end()) ;
+ for (DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIterator i(f.begin()), i_end(f.end()) ;
i != i_end ; ++i)
{
if (_imp->id->eapi()->supported()->ebuild_options()->restrict_fetch()->end() !=
@@ -399,13 +399,13 @@ ESimpleURIKey::pretty_print_flat(const SimpleURISpecTree::ItemFormatter & f) con
namespace paludis
{
template <>
- struct Implementation<ERestrictKey>
+ struct Implementation<EPlainTextSpecKey>
{
const Environment * const env;
const std::tr1::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<const RestrictSpecTree::ConstItem> value;
+ mutable std::tr1::shared_ptr<const PlainTextSpecTree::ConstItem> value;
Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
env(e),
@@ -416,21 +416,21 @@ namespace paludis
};
}
-ERestrictKey::ERestrictKey(const Environment * const e,
+EPlainTextSpecKey::EPlainTextSpecKey(const Environment * const e,
const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
- MetadataSpecTreeKey<RestrictSpecTree>(r, h, t),
- PrivateImplementationPattern<ERestrictKey>(new Implementation<ERestrictKey>(e, id, v)),
- _imp(PrivateImplementationPattern<ERestrictKey>::_imp)
+ MetadataSpecTreeKey<PlainTextSpecTree>(r, h, t),
+ PrivateImplementationPattern<EPlainTextSpecKey>(new Implementation<EPlainTextSpecKey>(e, id, v)),
+ _imp(PrivateImplementationPattern<EPlainTextSpecKey>::_imp)
{
}
-ERestrictKey::~ERestrictKey()
+EPlainTextSpecKey::~EPlainTextSpecKey()
{
}
-const std::tr1::shared_ptr<const RestrictSpecTree::ConstItem>
-ERestrictKey::value() const
+const std::tr1::shared_ptr<const PlainTextSpecTree::ConstItem>
+EPlainTextSpecKey::value() const
{
Lock l(_imp->value_mutex);
@@ -438,12 +438,12 @@ ERestrictKey::value() const
return _imp->value;
Context context("When parsing metadata key '" + raw_name() + "' from '" + stringify(*_imp->id) + "':");
- _imp->value = parse_restrict(_imp->string_value, _imp->env, _imp->id, *_imp->id->eapi());
+ _imp->value = parse_plain_text(_imp->string_value, _imp->env, _imp->id, *_imp->id->eapi());
return _imp->value;
}
std::string
-ERestrictKey::pretty_print(const RestrictSpecTree::ItemFormatter & f) const
+EPlainTextSpecKey::pretty_print(const PlainTextSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true);
@@ -452,7 +452,7 @@ ERestrictKey::pretty_print(const RestrictSpecTree::ItemFormatter & f) const
}
std::string
-ERestrictKey::pretty_print_flat(const RestrictSpecTree::ItemFormatter & f) const
+EPlainTextSpecKey::pretty_print_flat(const PlainTextSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false);
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index 167fcfa..8baae3e 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -125,26 +125,26 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
};
- class ERestrictKey :
- public MetadataSpecTreeKey<RestrictSpecTree>,
- private PrivateImplementationPattern<ERestrictKey>
+ class EPlainTextSpecKey :
+ public MetadataSpecTreeKey<PlainTextSpecTree>,
+ private PrivateImplementationPattern<EPlainTextSpecKey>
{
private:
- PrivateImplementationPattern<ERestrictKey>::ImpPtr & _imp;
+ PrivateImplementationPattern<EPlainTextSpecKey>::ImpPtr & _imp;
public:
- ERestrictKey(const Environment * const,
+ EPlainTextSpecKey(const Environment * const,
const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
- ~ERestrictKey();
+ ~EPlainTextSpecKey();
- virtual const std::tr1::shared_ptr<const RestrictSpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const PlainTextSpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const RestrictSpecTree::ItemFormatter &) const
+ virtual std::string pretty_print(const PlainTextSpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const RestrictSpecTree::ItemFormatter &) const
+ virtual std::string pretty_print_flat(const PlainTextSpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
diff --git a/paludis/repositories/e/e_repository_id.hh b/paludis/repositories/e/e_repository_id.hh
index 3d7525f..76401f1 100644
--- a/paludis/repositories/e/e_repository_id.hh
+++ b/paludis/repositories/e/e_repository_id.hh
@@ -34,7 +34,7 @@ namespace paludis
virtual const std::tr1::shared_ptr<const EAPI> eapi() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const = 0;
virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const = 0;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const = 0;
virtual const std::tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const = 0;
virtual std::tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 4295107..e8f9db6 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -356,11 +356,11 @@ EbuildEntries::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
bool fetch_restrict(false), userpriv_restrict(false);
{
- DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
+ DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
if (id->restrict_key())
id->restrict_key()->value()->accept(restricts);
- for (DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec>::ConstIterator i(restricts.begin()), i_end(restricts.end()) ;
+ for (DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIterator i(restricts.begin()), i_end(restricts.end()) ;
i != i_end ; ++i)
{
if (id->eapi()->supported()->ebuild_options()->restrict_fetch()->end() !=
@@ -518,7 +518,7 @@ EbuildEntries::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
bool userpriv_restrict, test_restrict, strip_restrict;
{
- DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
+ DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
if (id->restrict_key())
id->restrict_key()->value()->accept(restricts);
@@ -730,7 +730,7 @@ EbuildEntries::info(const std::tr1::shared_ptr<const ERepositoryID> & id,
bool userpriv_restrict;
{
- DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
+ DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
if (id->restrict_key())
id->restrict_key()->value()->accept(restricts);
@@ -810,7 +810,7 @@ EbuildEntries::get_environment_variable(const std::tr1::shared_ptr<const EReposi
{
using namespace std::tr1::placeholders;
- DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
+ DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
if (id->restrict_key())
id->restrict_key()->value()->accept(restricts);
@@ -929,7 +929,7 @@ EbuildEntries::pretend(const std::tr1::shared_ptr<const ERepositoryID> & id,
bool userpriv_restrict;
{
- DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
+ DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
if (id->restrict_key())
id->restrict_key()->value()->accept(restricts);
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index a633b20..c0d19e9 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -78,7 +78,7 @@ namespace paludis
mutable std::tr1::shared_ptr<const EDependenciesKey> run_dependencies;
mutable std::tr1::shared_ptr<const EDependenciesKey> post_dependencies;
mutable std::tr1::shared_ptr<const EProvideKey> provide;
- mutable std::tr1::shared_ptr<const ERestrictKey> restrictions;
+ mutable std::tr1::shared_ptr<const EPlainTextSpecKey> restrictions;
mutable std::tr1::shared_ptr<const EFetchableURIKey> src_uri;
mutable std::tr1::shared_ptr<const ESimpleURIKey> homepage;
mutable std::tr1::shared_ptr<const ELicenseKey> license;
@@ -540,7 +540,7 @@ EbuildID::suggested_dependencies_key() const
return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
EbuildID::restrict_key() const
{
need_keys_added();
@@ -708,7 +708,7 @@ void
EbuildID::load_restrict(const std::string & r, const std::string & h, const std::string & v) const
{
Lock l(_imp->mutex);
- _imp->restrictions.reset(new ERestrictKey(_imp->environment, shared_from_this(), r, h, v, mkt_internal));
+ _imp->restrictions.reset(new EPlainTextSpecKey(_imp->environment, shared_from_this(), r, h, v, mkt_internal));
add_metadata_key(_imp->restrictions);
}
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index 97efef5..a09c871 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -84,7 +84,7 @@ namespace paludis
const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const;
virtual const std::tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const;
virtual const std::tr1::shared_ptr<const MetadataValueKey<bool> > transient_key() const;
diff --git a/paludis/repositories/e/qa/metadata_keys.cc b/paludis/repositories/e/qa/metadata_keys.cc
index 0fba8ee..f50e005 100644
--- a/paludis/repositories/e/qa/metadata_keys.cc
+++ b/paludis/repositories/e/qa/metadata_keys.cc
@@ -76,9 +76,9 @@ namespace
const std::tr1::shared_ptr<const RepositoryMaskInfo> & PALUDIS_ATTRIBUTE((unused)) i(k.value());
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
- const std::tr1::shared_ptr<RestrictSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
+ const std::tr1::shared_ptr<PlainTextSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
void visit(const MetadataSpecTreeKey<ProvideSpecTree> & k)
diff --git a/paludis/repositories/e/qa/restrict_key.cc b/paludis/repositories/e/qa/restrict_key.cc
index ad9bc80..9c647e2 100644
--- a/paludis/repositories/e/qa/restrict_key.cc
+++ b/paludis/repositories/e/qa/restrict_key.cc
@@ -54,12 +54,12 @@ namespace
};
struct RestrictChecker :
- ConstVisitor<RestrictSpecTree>,
- ConstVisitor<RestrictSpecTree>::VisitConstSequence<RestrictChecker, AllDepSpec>,
- ConstVisitor<RestrictSpecTree>::VisitConstSequence<RestrictChecker, ConditionalDepSpec>
+ ConstVisitor<PlainTextSpecTree>,
+ ConstVisitor<PlainTextSpecTree>::VisitConstSequence<RestrictChecker, AllDepSpec>,
+ ConstVisitor<PlainTextSpecTree>::VisitConstSequence<RestrictChecker, ConditionalDepSpec>
{
- using ConstVisitor<RestrictSpecTree>::VisitConstSequence<RestrictChecker, ConditionalDepSpec>::visit_sequence;
- using ConstVisitor<RestrictSpecTree>::VisitConstSequence<RestrictChecker, AllDepSpec>::visit_sequence;
+ using ConstVisitor<PlainTextSpecTree>::VisitConstSequence<RestrictChecker, ConditionalDepSpec>::visit_sequence;
+ using ConstVisitor<PlainTextSpecTree>::VisitConstSequence<RestrictChecker, AllDepSpec>::visit_sequence;
const std::set<std::string> & allowed_restricts;
diff --git a/paludis/repositories/e/qa/spec_keys.cc b/paludis/repositories/e/qa/spec_keys.cc
index 9c3f737..82965b5 100644
--- a/paludis/repositories/e/qa/spec_keys.cc
+++ b/paludis/repositories/e/qa/spec_keys.cc
@@ -487,7 +487,7 @@ namespace
}
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
try
{
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index d086986..f16a138 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -406,7 +406,7 @@ namespace paludis
std::tr1::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > run_dependencies;
std::tr1::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > post_dependencies;
std::tr1::shared_ptr<FakeMetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies;
- std::tr1::shared_ptr<FakeMetadataSpecTreeKey<RestrictSpecTree> > restrictions;
+ std::tr1::shared_ptr<FakeMetadataSpecTreeKey<PlainTextSpecTree> > restrictions;
std::tr1::shared_ptr<FakeMetadataSpecTreeKey<FetchableURISpecTree> > src_uri;
std::tr1::shared_ptr<FakeMetadataSpecTreeKey<SimpleURISpecTree> > homepage;
@@ -1098,7 +1098,7 @@ FakeMetadataKeywordSetKey::pretty_print_flat(const Formatter<KeywordName> & f) c
template class FakeMetadataSpecTreeKey<LicenseSpecTree>;
template class FakeMetadataSpecTreeKey<ProvideSpecTree>;
-template class FakeMetadataSpecTreeKey<RestrictSpecTree>;
+template class FakeMetadataSpecTreeKey<PlainTextSpecTree>;
#ifndef PALUDIS_NO_EXPLICIT_FULLY_SPECIALISED
template class FakeMetadataSpecTreeKey<FetchableURISpecTree>;
template class FakeMetadataSpecTreeKey<DependencySpecTree>;
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index bc381fa..9cdf3a6 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -695,7 +695,7 @@ struct AllowedTypes<ProvideSpecTree>
};
template<>
-struct AllowedTypes<RestrictSpecTree>
+struct AllowedTypes<PlainTextSpecTree>
{
AllowedTypes(const AllDepSpec &) {};
AllowedTypes(const ConditionalDepSpec &) {};
@@ -1088,7 +1088,7 @@ void expose_dep_spec()
RegisterSpecTreeToPython<DependencySpecTree>();
RegisterSpecTreeToPython<ProvideSpecTree>();
- RegisterSpecTreeToPython<RestrictSpecTree>();
+ RegisterSpecTreeToPython<PlainTextSpecTree>();
RegisterSpecTreeToPython<FetchableURISpecTree>();
RegisterSpecTreeToPython<SimpleURISpecTree>();
RegisterSpecTreeToPython<LicenseSpecTree>();
@@ -1096,7 +1096,7 @@ void expose_dep_spec()
RegisterSpecTreeSharedPtrFromPython<DependencySpecTree>();
RegisterSpecTreeSharedPtrFromPython<ProvideSpecTree>();
- RegisterSpecTreeSharedPtrFromPython<RestrictSpecTree>();
+ RegisterSpecTreeSharedPtrFromPython<PlainTextSpecTree>();
RegisterSpecTreeSharedPtrFromPython<FetchableURISpecTree>();
RegisterSpecTreeSharedPtrFromPython<SimpleURISpecTree>();
RegisterSpecTreeSharedPtrFromPython<LicenseSpecTree>();
diff --git a/python/formatter.cc b/python/formatter.cc
index f3bc389..c237e6c 100644
--- a/python/formatter.cc
+++ b/python/formatter.cc
@@ -666,17 +666,17 @@ void expose_formatter()
);
/**
- * RestrictSpecTreeFormatter
+ * PlainTextSpecTreeFormatter
*/
- bp::class_<RestrictSpecTree::ItemFormatter,
+ bp::class_<PlainTextSpecTree::ItemFormatter,
bp::bases<
CanFormat<ConditionalDepSpec>,
CanFormat<PlainTextDepSpec> >,
boost::noncopyable>
(
- "RestrictSpecTreeFormatter",
+ "PlainTextSpecTreeFormatter",
"A formatter that can handle any formattable type found in a\n"
- "RestrictSpecTree.",
+ "PlainTextSpecTree.",
bp::no_init
);
@@ -721,7 +721,7 @@ void expose_formatter()
bp::implicitly_convertible<StringifyFormatter, LicenseSpecTree::ItemFormatter>();
bp::implicitly_convertible<StringifyFormatter, ProvideSpecTree::ItemFormatter>();
bp::implicitly_convertible<StringifyFormatter, DependencySpecTree::ItemFormatter>();
- bp::implicitly_convertible<StringifyFormatter, RestrictSpecTree::ItemFormatter>();
+ bp::implicitly_convertible<StringifyFormatter, PlainTextSpecTree::ItemFormatter>();
bp::implicitly_convertible<StringifyFormatter, SimpleURISpecTree::ItemFormatter>();
bp::implicitly_convertible<StringifyFormatter, FetchableURISpecTree::ItemFormatter>();
bp::class_<StringifyFormatter,
@@ -765,7 +765,7 @@ void expose_formatter()
bp::implicitly_convertible<PythonFormatterWrapper, LicenseSpecTree::ItemFormatter>();
bp::implicitly_convertible<PythonFormatterWrapper, ProvideSpecTree::ItemFormatter>();
bp::implicitly_convertible<PythonFormatterWrapper, DependencySpecTree::ItemFormatter>();
- bp::implicitly_convertible<PythonFormatterWrapper, RestrictSpecTree::ItemFormatter>();
+ bp::implicitly_convertible<PythonFormatterWrapper, PlainTextSpecTree::ItemFormatter>();
bp::implicitly_convertible<PythonFormatterWrapper, SimpleURISpecTree::ItemFormatter>();
bp::implicitly_convertible<PythonFormatterWrapper, FetchableURISpecTree::ItemFormatter>();
bp::class_<PythonFormatterWrapper,
diff --git a/python/metadata_key.cc b/python/metadata_key.cc
index 861d3b9..849365f 100644
--- a/python/metadata_key.cc
+++ b/python/metadata_key.cc
@@ -129,9 +129,9 @@ class MetadataKeySptrToPythonVisitor :
obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<DependencySpecTree> >(_m_ptr));
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
- obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<RestrictSpecTree> >(_m_ptr));
+ obj = bp::object(std::tr1::static_pointer_cast<const MetadataSpecTreeKey<PlainTextSpecTree> >(_m_ptr));
}
void visit(const MetadataSpecTreeKey<FetchableURISpecTree> & k)
@@ -1058,7 +1058,7 @@ void expose_metadata_key()
class_spec_tree_key<LicenseSpecTree>("LicenseSpecTree");
class_spec_tree_key<ProvideSpecTree>("ProvideSpecTree");
class_spec_tree_key<DependencySpecTree>("DependencySpecTree");
- class_spec_tree_key<RestrictSpecTree>("RestrictSpecTree");
+ class_spec_tree_key<PlainTextSpecTree>("PlainTextSpecTree");
class_spec_tree_key<SimpleURISpecTree>("SimpleURISpecTree");
class_spec_tree_key<FetchableURISpecTree>("FetchableURISpecTree");
}
diff --git a/python/nice_names.nn b/python/nice_names.nn
index 0018857..6d6a1ac 100644
--- a/python/nice_names.nn
+++ b/python/nice_names.nn
@@ -41,7 +41,7 @@ make_nn_NiceNames() {
name "SimpleURISpecTree"
name "FlattenableSpecTree"
name "ProvideSpecTree"
- name "RestrictSpecTree"
+ name "PlainTextSpecTree"
name "DependencySpecTree"
name "SetSpecTree"
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index 1262a89..4991bdf 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -1289,7 +1289,7 @@ template VALUE paludis::ruby::dep_tree_to_value<SetSpecTree> (const std::tr1::sh
template VALUE paludis::ruby::dep_tree_to_value<DependencySpecTree> (const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> &);
template VALUE paludis::ruby::dep_tree_to_value<FetchableURISpecTree> (const std::tr1::shared_ptr<const FetchableURISpecTree::ConstItem> &);
template VALUE paludis::ruby::dep_tree_to_value<SimpleURISpecTree> (const std::tr1::shared_ptr<const SimpleURISpecTree::ConstItem> &);
-template VALUE paludis::ruby::dep_tree_to_value<RestrictSpecTree> (const std::tr1::shared_ptr<const RestrictSpecTree::ConstItem> &);
+template VALUE paludis::ruby::dep_tree_to_value<PlainTextSpecTree> (const std::tr1::shared_ptr<const PlainTextSpecTree::ConstItem> &);
template VALUE paludis::ruby::dep_tree_to_value<ProvideSpecTree> (const std::tr1::shared_ptr<const ProvideSpecTree::ConstItem> &);
template VALUE paludis::ruby::dep_tree_to_value<LicenseSpecTree> (const std::tr1::shared_ptr<const LicenseSpecTree::ConstItem> &);
diff --git a/ruby/metadata_key.cc b/ruby/metadata_key.cc
index 84a0de8..d70336e 100644
--- a/ruby/metadata_key.cc
+++ b/ruby/metadata_key.cc
@@ -54,7 +54,7 @@ namespace
static VALUE c_metadata_fetchable_uri_spec_tree_key;
static VALUE c_metadata_simple_uri_spec_tree_key;
static VALUE c_metadata_dependency_spec_tree_key;
- static VALUE c_metadata_restrict_spec_tree_key;
+ static VALUE c_metadata_plain_text_spec_tree_key;
static VALUE c_repository_mask_info;
static VALUE c_metadata_section_key;
@@ -212,9 +212,9 @@ namespace
new std::tr1::shared_ptr<const MetadataKey>(mm));
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> &)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> &)
{
- value = Data_Wrap_Struct(c_metadata_restrict_spec_tree_key, 0, &Common<std::tr1::shared_ptr<const MetadataKey> >::free,
+ value = Data_Wrap_Struct(c_metadata_plain_text_spec_tree_key, 0, &Common<std::tr1::shared_ptr<const MetadataKey> >::free,
new std::tr1::shared_ptr<const MetadataKey>(mm));
}
@@ -709,12 +709,12 @@ namespace
rb_define_method(c_metadata_provide_spec_tree_key, "value", RUBY_FUNC_CAST((&SpecTreeValue<ProvideSpecTree>::fetch)), 0);
/*
- * Document-class: Paludis::MetadataRestrictSpecTreeKey
+ * Document-class: Paludis::MetadataPlainTextSpecTreeKey
*
* Metadata class for restrict specs.
*/
- c_metadata_restrict_spec_tree_key = rb_define_class_under(paludis_module(), "MetadataRestrictSpecTreeKey", c_metadata_key);
- rb_define_method(c_metadata_restrict_spec_tree_key, "value", RUBY_FUNC_CAST((&SpecTreeValue<RestrictSpecTree>::fetch)), 0);
+ c_metadata_plain_text_spec_tree_key = rb_define_class_under(paludis_module(), "MetadataPlainTextSpecTreeKey", c_metadata_key);
+ rb_define_method(c_metadata_plain_text_spec_tree_key, "value", RUBY_FUNC_CAST((&SpecTreeValue<PlainTextSpecTree>::fetch)), 0);
/*
* Document-class: Paludis::MetadataDependencySpecTreeKey
diff --git a/ruby/nice_names.nn b/ruby/nice_names.nn
index 0c2d54c..d66bc51 100644
--- a/ruby/nice_names.nn
+++ b/ruby/nice_names.nn
@@ -38,7 +38,7 @@ make_nn_NiceNames() {
name "SimpleURISpecTree"
name "FlattenableSpecTree"
name "ProvideSpecTree"
- name "RestrictSpecTree"
+ name "PlainTextSpecTree"
name "DependencySpecTree"
name "SetSpecTree"
}
diff --git a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
index 42b18e0..2696ac5 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
@@ -153,7 +153,7 @@ namespace gtkpaludis
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
diff --git a/src/clients/inquisitio/key_extractor.cc b/src/clients/inquisitio/key_extractor.cc
index d94a825..d2fd488 100644
--- a/src/clients/inquisitio/key_extractor.cc
+++ b/src/clients/inquisitio/key_extractor.cc
@@ -302,7 +302,7 @@ namespace
std::tr1::bind(&Matcher::operator(), std::tr1::cref(_m), std::tr1::bind(&stringify<PackageID>, _1)));
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & s)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & s)
{
if (_flatten)
{
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index db269de..d4fae3a 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -94,9 +94,9 @@ namespace
const std::tr1::shared_ptr<const RepositoryMaskInfo> & PALUDIS_ATTRIBUTE((unused)) i(k.value());
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
- const std::tr1::shared_ptr<RestrictSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
+ const std::tr1::shared_ptr<PlainTextSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
void visit(const MetadataSpecTreeKey<ProvideSpecTree> & k)
diff --git a/src/clients/paludis/applets.cc b/src/clients/paludis/applets.cc
index 0220c58..9f55a15 100644
--- a/src/clients/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -90,7 +90,7 @@ namespace
return_code |= 1;
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
diff --git a/src/clients/paludis/info.cc b/src/clients/paludis/info.cc
index 343c35d..a2402c5 100644
--- a/src/clients/paludis/info.cc
+++ b/src/clients/paludis/info.cc
@@ -130,7 +130,7 @@ namespace
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << stringify(buf) << endl;
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index cd42b07..eb5065b 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -128,7 +128,7 @@ namespace
stream << k.raw_name() << ": " << k.pretty_print_flat(formatter) << "\n";
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
stream << k.raw_name() << ": " << k.pretty_print_flat(formatter) << "\n";
}
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index 810d6f8..06ed785 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -474,7 +474,7 @@ namespace
}
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
if (k.type() == type)
{
diff --git a/src/output/mask_displayer.cc b/src/output/mask_displayer.cc
index 4f3a0c5..ff4755d 100644
--- a/src/output/mask_displayer.cc
+++ b/src/output/mask_displayer.cc
@@ -190,7 +190,7 @@ namespace
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
+ void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);