aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-03 01:26:32 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-03 01:26:32 +0000
commit385aa9b30e4a312013b616cb4d5bdb76477b5168 (patch)
treee4211e3f3a3a512f4200eccfb1729dc167bbc88a
parentaaaaed580a954078e9b6f8b6aaf6b5337f8979ee (diff)
downloadpaludis-385aa9b30e4a312013b616cb4d5bdb76477b5168.tar.gz
paludis-385aa9b30e4a312013b616cb4d5bdb76477b5168.tar.xz
Be consistent in use of plurals for labels
-rw-r--r--doc/examples/example_dep_label.cc4
-rw-r--r--paludis/dep_list/condition_tracker.cc4
-rw-r--r--paludis/dep_list/condition_tracker.hh2
-rw-r--r--paludis/dep_list/dep_list.cc4
-rw-r--r--paludis/dep_list/query_visitor.cc2
-rw-r--r--paludis/dep_list/query_visitor.hh2
-rw-r--r--paludis/dep_list/range_rewriter.cc2
-rw-r--r--paludis/dep_list/range_rewriter.hh2
-rw-r--r--paludis/dep_list/show_suggest_visitor.cc2
-rw-r--r--paludis/dep_list/show_suggest_visitor.hh2
-rw-r--r--paludis/dep_list/uninstall_list.cc2
-rw-r--r--paludis/dep_spec-fwd.hh51
-rw-r--r--paludis/dep_spec.cc4
-rw-r--r--paludis/dep_spec.hh5
-rw-r--r--paludis/dep_tag.cc4
-rw-r--r--paludis/dep_tree.hh14
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.cc2
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.hh2
-rw-r--r--paludis/repositories/e/aa_visitor.cc2
-rw-r--r--paludis/repositories/e/aa_visitor.hh2
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.cc2
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.hh2
-rw-r--r--paludis/repositories/e/dep_parser.cc16
-rw-r--r--paludis/repositories/e/dep_parser.hh4
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.cc4
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.hh4
-rw-r--r--paludis/repositories/e/ebuild_entries.cc8
-rw-r--r--paludis/repositories/e/fetch_visitor.cc4
-rw-r--r--paludis/repositories/e/fetch_visitor.hh2
-rw-r--r--paludis/repositories/e/qa/extractors.cc8
-rw-r--r--paludis/repositories/e/qa/spec_keys.cc4
-rw-r--r--paludis/repositories/e/qa/visibility.cc2
-rw-r--r--paludis/stringify_formatter-impl.hh16
-rw-r--r--paludis/stringify_formatter.cc4
-rw-r--r--paludis/stringify_formatter.hh8
-rw-r--r--paludis/tasks/install_task.cc2
-rw-r--r--python/dep_spec.cc36
-rw-r--r--python/dep_spec.hh8
-rw-r--r--src/clients/adjutrix/find_reverse_deps.cc2
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/markup_formatter.cc4
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/markup_formatter.hh8
-rw-r--r--src/output/colour_formatter.cc4
-rw-r--r--src/output/colour_formatter.hh8
-rw-r--r--src/output/console_query_task.cc4
44 files changed, 151 insertions, 127 deletions
diff --git a/doc/examples/example_dep_label.cc b/doc/examples/example_dep_label.cc
index ce701ba..98db511 100644
--- a/doc/examples/example_dep_label.cc
+++ b/doc/examples/example_dep_label.cc
@@ -129,11 +129,11 @@ namespace
_results.insert(std::make_pair(s.filename(), _restricted.back()));
}
- void visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> & l)
+ void visit_leaf(const URILabelsDepSpec & l)
{
/* Find out whether the label represents a fetch restriction.
* Change the top item of the stack as appropriate. Although
- * a LabelsDepSpec can contain multiple labels, only the last
+ * a URILabelsDepSpec can contain multiple labels, only the last
* one is relevant. */
IsLabelRestrictedVisitor v(_restricted.back());
std::for_each(indirect_iterator(l.begin()), indirect_iterator(l.end()), accept_visitor(v));
diff --git a/paludis/dep_list/condition_tracker.cc b/paludis/dep_list/condition_tracker.cc
index 2a95f18..d19d05e 100644
--- a/paludis/dep_list/condition_tracker.cc
+++ b/paludis/dep_list/condition_tracker.cc
@@ -133,8 +133,8 @@ ConditionTracker::visit_leaf(const BlockDepSpec &)
}
void
-ConditionTracker::visit_leaf(const DependencyLabelDepSpec &)
+ConditionTracker::visit_leaf(const DependencyLabelsDepSpec &)
{
- throw InternalError(PALUDIS_HERE, "ConditionTracker saw a DependencyLabelDepSpec");
+ throw InternalError(PALUDIS_HERE, "ConditionTracker saw a DependencyLabelsDepSpec");
}
diff --git a/paludis/dep_list/condition_tracker.hh b/paludis/dep_list/condition_tracker.hh
index aaf2263..fc07f4f 100644
--- a/paludis/dep_list/condition_tracker.hh
+++ b/paludis/dep_list/condition_tracker.hh
@@ -63,7 +63,7 @@ namespace paludis
void visit_leaf(const PackageDepSpec &) PALUDIS_ATTRIBUTE((noreturn));
void visit_leaf(const BlockDepSpec &) PALUDIS_ATTRIBUTE((noreturn));
- void visit_leaf(const LabelsDepSpec<DependencyLabelVisitorTypes> &) PALUDIS_ATTRIBUTE((noreturn));
+ void visit_leaf(const DependencyLabelsDepSpec &) PALUDIS_ATTRIBUTE((noreturn));
};
}
diff --git a/paludis/dep_list/dep_list.cc b/paludis/dep_list/dep_list.cc
index c753b64..c71825a 100644
--- a/paludis/dep_list/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -311,7 +311,7 @@ struct DepList::AddVisitor :
void visit_leaf(const BlockDepSpec &);
- void visit_leaf(const DependencyLabelDepSpec &);
+ void visit_leaf(const DependencyLabelsDepSpec &);
};
void
@@ -879,7 +879,7 @@ DepList::AddVisitor::visit_leaf(const BlockDepSpec & a)
}
void
-DepList::AddVisitor::visit_leaf(const DependencyLabelDepSpec &)
+DepList::AddVisitor::visit_leaf(const DependencyLabelsDepSpec &)
{
// XXX implement
}
diff --git a/paludis/dep_list/query_visitor.cc b/paludis/dep_list/query_visitor.cc
index b9d0875..f9cd65d 100644
--- a/paludis/dep_list/query_visitor.cc
+++ b/paludis/dep_list/query_visitor.cc
@@ -167,7 +167,7 @@ QueryVisitor::visit_sequence(const AllDepSpec &,
}
void
-QueryVisitor::visit_leaf(const DependencyLabelDepSpec &)
+QueryVisitor::visit_leaf(const DependencyLabelsDepSpec &)
{
// XXX implement
}
diff --git a/paludis/dep_list/query_visitor.hh b/paludis/dep_list/query_visitor.hh
index fe4332b..5fc0d00 100644
--- a/paludis/dep_list/query_visitor.hh
+++ b/paludis/dep_list/query_visitor.hh
@@ -66,7 +66,7 @@ namespace paludis
void visit_leaf(const BlockDepSpec &);
- void visit_leaf(const DependencyLabelDepSpec &);
+ void visit_leaf(const DependencyLabelsDepSpec &);
///\}
diff --git a/paludis/dep_list/range_rewriter.cc b/paludis/dep_list/range_rewriter.cc
index a951257..758597a 100644
--- a/paludis/dep_list/range_rewriter.cc
+++ b/paludis/dep_list/range_rewriter.cc
@@ -105,7 +105,7 @@ RangeRewriter::visit_leaf(const BlockDepSpec &)
}
void
-RangeRewriter::visit_leaf(const DependencyLabelDepSpec &)
+RangeRewriter::visit_leaf(const DependencyLabelsDepSpec &)
{
_invalid = true;
}
diff --git a/paludis/dep_list/range_rewriter.hh b/paludis/dep_list/range_rewriter.hh
index 7d793f9..6b6981d 100644
--- a/paludis/dep_list/range_rewriter.hh
+++ b/paludis/dep_list/range_rewriter.hh
@@ -79,7 +79,7 @@ namespace paludis
void visit_leaf(const BlockDepSpec &);
- void visit_leaf(const LabelsDepSpec<DependencyLabelVisitorTypes> &);
+ void visit_leaf(const DependencyLabelsDepSpec &);
///\}
};
diff --git a/paludis/dep_list/show_suggest_visitor.cc b/paludis/dep_list/show_suggest_visitor.cc
index 31c6e22..9e76884 100644
--- a/paludis/dep_list/show_suggest_visitor.cc
+++ b/paludis/dep_list/show_suggest_visitor.cc
@@ -132,7 +132,7 @@ ShowSuggestVisitor::visit_leaf(const PackageDepSpec & a)
}
void
-ShowSuggestVisitor::visit_leaf(const DependencyLabelDepSpec &)
+ShowSuggestVisitor::visit_leaf(const DependencyLabelsDepSpec &)
{
// XXX implement
}
diff --git a/paludis/dep_list/show_suggest_visitor.hh b/paludis/dep_list/show_suggest_visitor.hh
index a1cfb67..e80985c 100644
--- a/paludis/dep_list/show_suggest_visitor.hh
+++ b/paludis/dep_list/show_suggest_visitor.hh
@@ -55,7 +55,7 @@ namespace paludis
void visit_leaf(const PackageDepSpec &);
- void visit_leaf(const DependencyLabelDepSpec &);
+ void visit_leaf(const DependencyLabelsDepSpec &);
void visit_sequence(const UseDepSpec &,
DependencySpecTree::ConstSequenceIterator,
diff --git a/paludis/dep_list/uninstall_list.cc b/paludis/dep_list/uninstall_list.cc
index 3e5ceec..13faa14 100644
--- a/paludis/dep_list/uninstall_list.cc
+++ b/paludis/dep_list/uninstall_list.cc
@@ -305,7 +305,7 @@ namespace
{
}
- void visit_leaf(const DependencyLabelDepSpec &)
+ void visit_leaf(const DependencyLabelsDepSpec &)
{
}
};
diff --git a/paludis/dep_spec-fwd.hh b/paludis/dep_spec-fwd.hh
index 7eec2d2..ba9dd9c 100644
--- a/paludis/dep_spec-fwd.hh
+++ b/paludis/dep_spec-fwd.hh
@@ -47,15 +47,29 @@ namespace paludis
class BlockDepSpec;
class StringDepSpec;
template <typename T_> class LabelsDepSpec;
- typedef LabelsDepSpec<URILabelVisitorTypes> URILabelDepSpec;
- typedef LabelsDepSpec<DependencyLabelVisitorTypes> DependencyLabelDepSpec;
+
+ /**
+ * A URILabelsDepSpec represents labels in a FetchableURISpecTree.
+ *
+ * \ingroup g_dep_spec
+ * \since 0.26
+ */
+ typedef LabelsDepSpec<URILabelVisitorTypes> URILabelsDepSpec;
+
+ /**
+ * A DependencyLabelsDepSpec represents labels in a DependencySpecTree.
+ *
+ * \ingroup g_dep_spec
+ * \since 0.26
+ */
+ typedef LabelsDepSpec<DependencyLabelVisitorTypes> DependencyLabelsDepSpec;
#include <paludis/dep_spec-se.hh>
/**
* A PlainTextDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
*/
std::ostream & operator<< (std::ostream &, const PlainTextDepSpec &) PALUDIS_VISIBLE;
@@ -64,56 +78,63 @@ namespace paludis
/**
* A PackageDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
*/
std::ostream & operator<< (std::ostream &, const PackageDepSpec &) PALUDIS_VISIBLE;
/**
- * A LabelsDepSpec<URILabelVisitorTypes> can be written to an ostream.
+ * A URILabelsDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
+ * \since 0.26
*/
- std::ostream & operator<< (std::ostream &, const LabelsDepSpec<URILabelVisitorTypes> &) PALUDIS_VISIBLE;
+ std::ostream & operator<< (std::ostream &, const URILabelsDepSpec &) PALUDIS_VISIBLE;
/**
- * A LabelsDepSpec<DependencyLabelVisitorTypes> can be written to an ostream.
+ * A DependencyLabelsDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
+ * \since 0.26
*/
- std::ostream & operator<< (std::ostream &, const LabelsDepSpec<DependencyLabelVisitorTypes> &) PALUDIS_VISIBLE;
+ std::ostream & operator<< (std::ostream &, const DependencyLabelsDepSpec &) PALUDIS_VISIBLE;
/**
* A BlockDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
+ * \since 0.26
*/
std::ostream & operator<< (std::ostream &, const BlockDepSpec &) PALUDIS_VISIBLE;
/**
* A SimpleURIDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
+ * \since 0.26
*/
std::ostream & operator<< (std::ostream &, const SimpleURIDepSpec &) PALUDIS_VISIBLE;
/**
* A FetchableURIDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
+ * \since 0.26
*/
std::ostream & operator<< (std::ostream &, const FetchableURIDepSpec &) PALUDIS_VISIBLE;
/**
* A LicenseDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
+ * \since 0.26
*/
std::ostream & operator<< (std::ostream &, const LicenseDepSpec &) PALUDIS_VISIBLE;
/**
* A UseDepSpec can be written to an ostream.
*
- * \ingroup grpdepspecs
+ * \ingroup g_dep_spec
+ * \since 0.26
*/
std::ostream & operator<< (std::ostream &, const UseDepSpec &) PALUDIS_VISIBLE;
}
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index 92762e7..40d7847 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -746,14 +746,14 @@ paludis::operator<< (std::ostream & s, const PackageDepSpec & a)
}
std::ostream &
-paludis::operator<< (std::ostream & s, const LabelsDepSpec<URILabelVisitorTypes> & l)
+paludis::operator<< (std::ostream & s, const URILabelsDepSpec & l)
{
s << join(indirect_iterator(l.begin()), indirect_iterator(l.end()), "+") << ":";
return s;
}
std::ostream &
-paludis::operator<< (std::ostream & s, const LabelsDepSpec<DependencyLabelVisitorTypes> & l)
+paludis::operator<< (std::ostream & s, const DependencyLabelsDepSpec & l)
{
s << join(indirect_iterator(l.begin()), indirect_iterator(l.end()), ",") << ":";
return s;
diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh
index 54a0d29..ef58b71 100644
--- a/paludis/dep_spec.hh
+++ b/paludis/dep_spec.hh
@@ -502,7 +502,10 @@ namespace paludis
* A LabelsDepSpec represents a labels entry using a particular visitor
* types class.
*
- * \ingroup grpdepspecs
+ * \see DependencyLabelsDepSpec
+ * \see URILabelsDepSpec
+ * \since 0.26
+ * \ingroup g_dep_spec
* \nosubgrouping
*/
template <typename SpecTree_>
diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc
index 0f2bdb0..bdd28fc 100644
--- a/paludis/dep_tag.cc
+++ b/paludis/dep_tag.cc
@@ -232,12 +232,12 @@ namespace
}
void
- visit_leaf(const URILabelDepSpec &)
+ visit_leaf(const URILabelsDepSpec &)
{
}
void
- visit_leaf(const DependencyLabelDepSpec & l)
+ visit_leaf(const DependencyLabelsDepSpec & l)
{
std::copy(indirect_iterator(l.begin()), indirect_iterator(l.end()),
std::ostream_iterator<DependencyLabelVisitorTypes::BasicNode>(s, ","));
diff --git a/paludis/dep_tree.hh b/paludis/dep_tree.hh
index 3442bc3..8aac3c3 100644
--- a/paludis/dep_tree.hh
+++ b/paludis/dep_tree.hh
@@ -41,8 +41,8 @@ namespace paludis
TreeLeaf<GenericSpecTree, LicenseDepSpec>,
TreeLeaf<GenericSpecTree, PackageDepSpec>,
TreeLeaf<GenericSpecTree, BlockDepSpec>,
- TreeLeaf<GenericSpecTree, LabelsDepSpec<URILabelVisitorTypes> >,
- TreeLeaf<GenericSpecTree, LabelsDepSpec<DependencyLabelVisitorTypes> >,
+ TreeLeaf<GenericSpecTree, URILabelsDepSpec>,
+ TreeLeaf<GenericSpecTree, DependencyLabelsDepSpec>,
ConstTreeSequence<GenericSpecTree, AllDepSpec>,
ConstTreeSequence<GenericSpecTree, AnyDepSpec>,
ConstTreeSequence<GenericSpecTree, UseDepSpec>
@@ -56,8 +56,8 @@ namespace paludis
LicenseDepSpec,
PackageDepSpec,
BlockDepSpec,
- LabelsDepSpec<URILabelVisitorTypes>,
- LabelsDepSpec<DependencyLabelVisitorTypes>
+ URILabelsDepSpec,
+ DependencyLabelsDepSpec
> Formatter;
};
@@ -100,7 +100,7 @@ namespace paludis
typedef Formatter<
UseDepSpec,
FetchableURIDepSpec,
- LabelsDepSpec<URILabelVisitorTypes>
+ URILabelsDepSpec
> Formatter;
};
@@ -205,7 +205,7 @@ namespace paludis
DepSpec,
TreeLeaf<DependencySpecTree, PackageDepSpec>,
TreeLeaf<DependencySpecTree, BlockDepSpec>,
- TreeLeaf<DependencySpecTree, LabelsDepSpec<DependencyLabelVisitorTypes> >,
+ TreeLeaf<DependencySpecTree, DependencyLabelsDepSpec>,
ConstTreeSequence<DependencySpecTree, AllDepSpec>,
ConstTreeSequence<DependencySpecTree, AnyDepSpec>,
ConstTreeSequence<DependencySpecTree, UseDepSpec>
@@ -215,7 +215,7 @@ namespace paludis
UseDepSpec,
PackageDepSpec,
BlockDepSpec,
- LabelsDepSpec<DependencyLabelVisitorTypes>
+ DependencyLabelsDepSpec
> Formatter;
};
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.cc b/paludis/repositories/cran/dep_spec_pretty_printer.cc
index 3b27245..6b67513 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.cc
@@ -101,7 +101,7 @@ DepSpecPrettyPrinter::visit_leaf(const BlockDepSpec &)
}
void
-DepSpecPrettyPrinter::visit_leaf(const DependencyLabelDepSpec &)
+DepSpecPrettyPrinter::visit_leaf(const DependencyLabelsDepSpec &)
{
}
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.hh b/paludis/repositories/cran/dep_spec_pretty_printer.hh
index 594cbd9..5db77fc 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.hh
@@ -78,7 +78,7 @@ namespace paludis
void visit_leaf(const BlockDepSpec &);
- void visit_leaf(const DependencyLabelDepSpec &);
+ void visit_leaf(const DependencyLabelsDepSpec &);
};
std::ostream & operator<< (std::ostream & s, const DepSpecPrettyPrinter & p) PALUDIS_VISIBLE;
diff --git a/paludis/repositories/e/aa_visitor.cc b/paludis/repositories/e/aa_visitor.cc
index 49d7240..85f665e 100644
--- a/paludis/repositories/e/aa_visitor.cc
+++ b/paludis/repositories/e/aa_visitor.cc
@@ -57,7 +57,7 @@ AAVisitor::visit_leaf(const FetchableURIDepSpec & p)
}
void
-AAVisitor::visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> &)
+AAVisitor::visit_leaf(const URILabelsDepSpec &)
{
}
diff --git a/paludis/repositories/e/aa_visitor.hh b/paludis/repositories/e/aa_visitor.hh
index 74c298b..c69eb7e 100644
--- a/paludis/repositories/e/aa_visitor.hh
+++ b/paludis/repositories/e/aa_visitor.hh
@@ -61,7 +61,7 @@ namespace paludis
void visit_leaf(const FetchableURIDepSpec &);
- void visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> &);
+ void visit_leaf(const URILabelsDepSpec &);
///}
diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc
index f85db47..69df3b4 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.cc
+++ b/paludis/repositories/e/check_fetched_files_visitor.cc
@@ -166,7 +166,7 @@ namespace
}
void
-CheckFetchedFilesVisitor::visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> & l)
+CheckFetchedFilesVisitor::visit_leaf(const URILabelsDepSpec & l)
{
InNoFetchVisitor v;
std::for_each(indirect_iterator(l.begin()), indirect_iterator(l.end()), accept_visitor(v));
diff --git a/paludis/repositories/e/check_fetched_files_visitor.hh b/paludis/repositories/e/check_fetched_files_visitor.hh
index 885e9b2..9b6b327 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.hh
+++ b/paludis/repositories/e/check_fetched_files_visitor.hh
@@ -63,7 +63,7 @@ namespace paludis
FetchableURISpecTree::ConstSequenceIterator,
FetchableURISpecTree::ConstSequenceIterator);
- void visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> &);
+ void visit_leaf(const URILabelsDepSpec &);
void visit_leaf(const FetchableURIDepSpec &);
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 24be8df..0ed3f06 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -291,8 +291,8 @@ namespace
const EAPI & e)
{
if (e.supported && e.supported->uri_labels)
- p(tr1::shared_ptr<TreeLeaf<H_, LabelsDepSpec<URILabelVisitorTypes> > >(
- new TreeLeaf<H_, LabelsDepSpec<URILabelVisitorTypes> >(parse_uri_label(s, e))));
+ p(tr1::shared_ptr<TreeLeaf<H_, URILabelsDepSpec> >(
+ new TreeLeaf<H_, URILabelsDepSpec>(parse_uri_label(s, e))));
else
throw DepStringParseError(s, "URI labels not allowed in this EAPI");
}
@@ -305,8 +305,8 @@ namespace
const EAPI & e)
{
if (e.supported && e.supported->dependency_labels)
- p(tr1::shared_ptr<TreeLeaf<H_, DependencyLabelDepSpec> >(
- new TreeLeaf<H_, DependencyLabelDepSpec>(parse_dependency_label(s, e))));
+ p(tr1::shared_ptr<TreeLeaf<H_, DependencyLabelsDepSpec> >(
+ new TreeLeaf<H_, DependencyLabelsDepSpec>(parse_dependency_label(s, e))));
else
throw DepStringParseError(s, "Dependency labels not allowed in this EAPI");
}
@@ -748,7 +748,7 @@ paludis::erepository::parse_license(const std::string & s, const EAPI & e)
true, ParseLicenseDepSpec(), e);
}
-tr1::shared_ptr<LabelsDepSpec<URILabelVisitorTypes> >
+tr1::shared_ptr<URILabelsDepSpec>
paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
{
Context context("When parsing label string '" + s + "' using EAPI '" + e.name + "':");
@@ -760,7 +760,7 @@ paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
if (c.empty())
throw DepStringParseError(s, "Unknown label");
- tr1::shared_ptr<LabelsDepSpec<URILabelVisitorTypes> > l(new LabelsDepSpec<URILabelVisitorTypes>);
+ tr1::shared_ptr<URILabelsDepSpec> l(new LabelsDepSpec<URILabelVisitorTypes>);
if (c == "URIMirrorsThenListedLabel")
l->add_label(make_shared_ptr(new URIMirrorsThenListedLabel(s.substr(0, s.length() - 1))));
@@ -780,7 +780,7 @@ paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
return l;
}
-tr1::shared_ptr<DependencyLabelDepSpec>
+tr1::shared_ptr<DependencyLabelsDepSpec>
paludis::erepository::parse_dependency_label(const std::string & s, const EAPI & e)
{
Context context("When parsing label string '" + s + "' using EAPI '" + e.name + "':");
@@ -792,7 +792,7 @@ paludis::erepository::parse_dependency_label(const std::string & s, const EAPI &
std::string label(s.substr(0, s.length() - 1));
Tokeniser<delim_kind::AnyOfTag, delim_mode::DelimiterTag>(",+").tokenise(label, std::inserter(labels, labels.end()));
- tr1::shared_ptr<DependencyLabelDepSpec> l(new DependencyLabelDepSpec);
+ tr1::shared_ptr<DependencyLabelsDepSpec> l(new DependencyLabelsDepSpec);
for (std::set<std::string>::iterator it = labels.begin(), it_e = labels.end(); it != it_e; ++it)
{
diff --git a/paludis/repositories/e/dep_parser.hh b/paludis/repositories/e/dep_parser.hh
index e75b533..110e7c4 100644
--- a/paludis/repositories/e/dep_parser.hh
+++ b/paludis/repositories/e/dep_parser.hh
@@ -80,7 +80,7 @@ namespace paludis
/**
* Parse a dep spec label.
*/
- tr1::shared_ptr<DependencyLabelDepSpec> parse_dependency_label(const std::string & s,
+ tr1::shared_ptr<DependencyLabelsDepSpec> parse_dependency_label(const std::string & s,
const EAPI &) PALUDIS_VISIBLE;
/**
@@ -116,7 +116,7 @@ namespace paludis
/**
* Parse a URI label.
*/
- tr1::shared_ptr<LabelsDepSpec<URILabelVisitorTypes> > parse_uri_label(const std::string & s,
+ tr1::shared_ptr<URILabelsDepSpec> parse_uri_label(const std::string & s,
const EAPI &) PALUDIS_VISIBLE;
}
}
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.cc b/paludis/repositories/e/dep_spec_pretty_printer.cc
index c82eb10..3d62593 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer.cc
@@ -329,7 +329,7 @@ DepSpecPrettyPrinter::visit_leaf(const BlockDepSpec & b)
}
void
-DepSpecPrettyPrinter::visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> & l)
+DepSpecPrettyPrinter::visit_leaf(const URILabelsDepSpec & l)
{
if (_imp->extra_label_indent)
{
@@ -357,7 +357,7 @@ DepSpecPrettyPrinter::visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> & l)
}
void
-DepSpecPrettyPrinter::visit_leaf(const DependencyLabelDepSpec & l)
+DepSpecPrettyPrinter::visit_leaf(const DependencyLabelsDepSpec & l)
{
if (_imp->extra_label_indent)
{
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.hh b/paludis/repositories/e/dep_spec_pretty_printer.hh
index 212c967..f2641d6 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/e/dep_spec_pretty_printer.hh
@@ -108,9 +108,9 @@ namespace paludis
void visit_leaf(const LicenseDepSpec &);
- void visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> &);
+ void visit_leaf(const URILabelsDepSpec &);
- void visit_leaf(const DependencyLabelDepSpec &);
+ void visit_leaf(const DependencyLabelsDepSpec &);
///}
};
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 9896ef2..cf2d02f 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -121,8 +121,8 @@ namespace
public ConstVisitor<FetchableURISpecTree>
{
private:
- std::list<std::pair<const FetchableURIDepSpec *, const LabelsDepSpec<URILabelVisitorTypes> *> > _specs;
- std::list<const LabelsDepSpec<URILabelVisitorTypes> *> _labels;
+ std::list<std::pair<const FetchableURIDepSpec *, const URILabelsDepSpec *> > _specs;
+ std::list<const URILabelsDepSpec *> _labels;
const Environment * const env;
const tr1::shared_ptr<const PackageID> id;
@@ -140,7 +140,7 @@ namespace
_specs.push_back(std::make_pair(&a, *_labels.begin()));
}
- void visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> & l)
+ void visit_leaf(const URILabelsDepSpec & l)
{
*_labels.begin() = &l;
}
@@ -167,7 +167,7 @@ namespace
}
typedef std::list<std::pair<const FetchableURIDepSpec *,
- const LabelsDepSpec<URILabelVisitorTypes> *> >::const_iterator ConstIterator;
+ const URILabelsDepSpec *> >::const_iterator ConstIterator;
ConstIterator begin()
{
diff --git a/paludis/repositories/e/fetch_visitor.cc b/paludis/repositories/e/fetch_visitor.cc
index bb437b2..7972b56 100644
--- a/paludis/repositories/e/fetch_visitor.cc
+++ b/paludis/repositories/e/fetch_visitor.cc
@@ -126,9 +126,9 @@ FetchVisitor::visit_sequence(const AllDepSpec &,
}
void
-FetchVisitor::visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> & l)
+FetchVisitor::visit_leaf(const URILabelsDepSpec & l)
{
- for (URILabelDepSpec::ConstIterator i(l.begin()), i_end(l.end()) ;
+ for (URILabelsDepSpec::ConstIterator i(l.begin()), i_end(l.end()) ;
i != i_end ; ++i)
*_imp->labels.begin() = i->get();
}
diff --git a/paludis/repositories/e/fetch_visitor.hh b/paludis/repositories/e/fetch_visitor.hh
index 02636b7..ed63439 100644
--- a/paludis/repositories/e/fetch_visitor.hh
+++ b/paludis/repositories/e/fetch_visitor.hh
@@ -61,7 +61,7 @@ namespace paludis
FetchableURISpecTree::ConstSequenceIterator,
FetchableURISpecTree::ConstSequenceIterator);
- void visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> &);
+ void visit_leaf(const URILabelsDepSpec &);
void visit_leaf(const FetchableURIDepSpec &);
};
diff --git a/paludis/repositories/e/qa/extractors.cc b/paludis/repositories/e/qa/extractors.cc
index a2a30eb..a4675cf 100644
--- a/paludis/repositories/e/qa/extractors.cc
+++ b/paludis/repositories/e/qa/extractors.cc
@@ -96,11 +96,11 @@ namespace
{
}
- void visit_leaf(const URILabelDepSpec &)
+ void visit_leaf(const URILabelsDepSpec &)
{
}
- void visit_leaf(const DependencyLabelDepSpec &)
+ void visit_leaf(const DependencyLabelsDepSpec &)
{
}
@@ -195,11 +195,11 @@ namespace
add_requirements();
}
- void visit_leaf(const URILabelDepSpec &)
+ void visit_leaf(const URILabelsDepSpec &)
{
}
- void visit_leaf(const DependencyLabelDepSpec &)
+ void visit_leaf(const DependencyLabelsDepSpec &)
{
}
diff --git a/paludis/repositories/e/qa/spec_keys.cc b/paludis/repositories/e/qa/spec_keys.cc
index 449db15..01f3fe9 100644
--- a/paludis/repositories/e/qa/spec_keys.cc
+++ b/paludis/repositories/e/qa/spec_keys.cc
@@ -146,11 +146,11 @@ namespace
{
}
- void visit_leaf(const URILabelDepSpec &)
+ void visit_leaf(const URILabelsDepSpec &)
{
}
- void visit_leaf(const DependencyLabelDepSpec &)
+ void visit_leaf(const DependencyLabelsDepSpec &)
{
}
diff --git a/paludis/repositories/e/qa/visibility.cc b/paludis/repositories/e/qa/visibility.cc
index ebe7e1d..db17339 100644
--- a/paludis/repositories/e/qa/visibility.cc
+++ b/paludis/repositories/e/qa/visibility.cc
@@ -92,7 +92,7 @@ namespace
viable = true;
}
- void visit_leaf(const DependencyLabelDepSpec &)
+ void visit_leaf(const DependencyLabelsDepSpec &)
{
}
diff --git a/paludis/stringify_formatter-impl.hh b/paludis/stringify_formatter-impl.hh
index 1e453dd..c42e947 100644
--- a/paludis/stringify_formatter-impl.hh
+++ b/paludis/stringify_formatter-impl.hh
@@ -37,8 +37,8 @@ namespace paludis
const CanFormat<FetchableURIDepSpec> * const f_f_uri;
const CanFormat<SimpleURIDepSpec> * const f_s_uri;
const CanFormat<LicenseDepSpec> * const f_license;
- const CanFormat<LabelsDepSpec<DependencyLabelVisitorTypes> > * const f_dep_label;
- const CanFormat<LabelsDepSpec<URILabelVisitorTypes> > * const f_uri_label;
+ const CanFormat<DependencyLabelsDepSpec> * const f_dep_label;
+ const CanFormat<URILabelsDepSpec> * const f_uri_label;
const CanFormat<PlainTextDepSpec> * const f_plain;
const CanFormat<UseDepSpec> * const f_use_dep;
const CanSpace * const f_space;
@@ -52,8 +52,8 @@ namespace paludis
const CanFormat<FetchableURIDepSpec> * const f_f_uri_v,
const CanFormat<SimpleURIDepSpec> * const f_s_uri_v,
const CanFormat<LicenseDepSpec> * const f_license_v,
- const CanFormat<LabelsDepSpec<DependencyLabelVisitorTypes> > * const f_dep_label_v,
- const CanFormat<LabelsDepSpec<URILabelVisitorTypes> > * const f_uri_label_v,
+ const CanFormat<DependencyLabelsDepSpec> * const f_dep_label_v,
+ const CanFormat<URILabelsDepSpec> * const f_uri_label_v,
const CanFormat<PlainTextDepSpec> * const f_plain_v,
const CanFormat<UseDepSpec> * const f_use_dep_v,
const CanSpace * const f_space_v
@@ -129,11 +129,11 @@ namespace paludis
tr1::is_convertible<T_ *, CanFormat<LicenseDepSpec> *>::value,
LicenseDepSpec>::get(&t),
StringifyFormatterGetForwarder<
- tr1::is_convertible<T_ *, CanFormat<LabelsDepSpec<DependencyLabelVisitorTypes> > *>::value,
- LabelsDepSpec<DependencyLabelVisitorTypes> >::get(&t),
+ tr1::is_convertible<T_ *, CanFormat<DependencyLabelsDepSpec> *>::value,
+ DependencyLabelsDepSpec>::get(&t),
StringifyFormatterGetForwarder<
- tr1::is_convertible<T_ *, CanFormat<LabelsDepSpec<URILabelVisitorTypes> > *>::value,
- LabelsDepSpec<URILabelVisitorTypes> >::get(&t),
+ tr1::is_convertible<T_ *, CanFormat<URILabelsDepSpec> *>::value,
+ URILabelsDepSpec>::get(&t),
StringifyFormatterGetForwarder<
tr1::is_convertible<T_ *, CanFormat<PlainTextDepSpec> *>::value,
PlainTextDepSpec>::get(&t),
diff --git a/paludis/stringify_formatter.cc b/paludis/stringify_formatter.cc
index 8e03a46..2fd6585 100644
--- a/paludis/stringify_formatter.cc
+++ b/paludis/stringify_formatter.cc
@@ -228,7 +228,7 @@ StringifyFormatter::format(const LicenseDepSpec & s, const format::Unaccepted &
}
std::string
-StringifyFormatter::format(const LabelsDepSpec<DependencyLabelVisitorTypes> & s, const format::Plain & k) const
+StringifyFormatter::format(const DependencyLabelsDepSpec & s, const format::Plain & k) const
{
if (_imp->f_dep_label)
return _imp->f_dep_label->format(s, k);
@@ -236,7 +236,7 @@ StringifyFormatter::format(const LabelsDepSpec<DependencyLabelVisitorTypes> & s,
}
std::string
-StringifyFormatter::format(const LabelsDepSpec<URILabelVisitorTypes> & s, const format::Plain & k) const
+StringifyFormatter::format(const URILabelsDepSpec & s, const format::Plain & k) const
{
if (_imp->f_uri_label)
return _imp->f_uri_label->format(s, k);
diff --git a/paludis/stringify_formatter.hh b/paludis/stringify_formatter.hh
index 11b0df4..3b5fae7 100644
--- a/paludis/stringify_formatter.hh
+++ b/paludis/stringify_formatter.hh
@@ -37,8 +37,8 @@ namespace paludis
public CanFormat<BlockDepSpec>,
public CanFormat<FetchableURIDepSpec>,
public CanFormat<SimpleURIDepSpec>,
- public CanFormat<LabelsDepSpec<DependencyLabelVisitorTypes> >,
- public CanFormat<LabelsDepSpec<URILabelVisitorTypes> >,
+ public CanFormat<DependencyLabelsDepSpec>,
+ public CanFormat<URILabelsDepSpec>,
public CanFormat<PlainTextDepSpec>,
public CanFormat<LicenseDepSpec>,
public CanFormat<UseDepSpec>,
@@ -82,9 +82,9 @@ namespace paludis
virtual std::string format(const SimpleURIDepSpec &, const format::Plain &) const;
- virtual std::string format(const LabelsDepSpec<DependencyLabelVisitorTypes> &, const format::Plain &) const;
+ virtual std::string format(const DependencyLabelsDepSpec &, const format::Plain &) const;
- virtual std::string format(const LabelsDepSpec<URILabelVisitorTypes> &, const format::Plain &) const;
+ virtual std::string format(const URILabelsDepSpec &, const format::Plain &) const;
virtual std::string format(const PlainTextDepSpec &, const format::Plain &) const;
diff --git a/paludis/tasks/install_task.cc b/paludis/tasks/install_task.cc
index a361f70..a8f4526 100644
--- a/paludis/tasks/install_task.cc
+++ b/paludis/tasks/install_task.cc
@@ -998,7 +998,7 @@ namespace
{
}
- void visit_leaf(const DependencyLabelDepSpec &)
+ void visit_leaf(const DependencyLabelsDepSpec &)
{
}
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index 0c0f0c3..433caf9 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -474,7 +474,7 @@ PythonURILabelsDepSpec::PythonURILabelsDepSpec(const std::string &)
{
}
-PythonURILabelsDepSpec::PythonURILabelsDepSpec(const LabelsDepSpec<URILabelVisitorTypes> &)
+PythonURILabelsDepSpec::PythonURILabelsDepSpec(const URILabelsDepSpec &)
{
}
@@ -482,7 +482,7 @@ PythonDependencyLabelsDepSpec::PythonDependencyLabelsDepSpec(const std::string &
{
}
-PythonDependencyLabelsDepSpec::PythonDependencyLabelsDepSpec(const LabelsDepSpec<DependencyLabelVisitorTypes> &)
+PythonDependencyLabelsDepSpec::PythonDependencyLabelsDepSpec(const DependencyLabelsDepSpec &)
{
}
@@ -565,13 +565,13 @@ SpecTreeToPython::visit_leaf(const BlockDepSpec & d)
}
void
-SpecTreeToPython::visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> & d)
+SpecTreeToPython::visit_leaf(const URILabelsDepSpec & d)
{
_current_parent->add_child(tr1::shared_ptr<PythonURILabelsDepSpec>(new PythonURILabelsDepSpec(d)));
}
void
-SpecTreeToPython::visit_leaf(const LabelsDepSpec<DependencyLabelVisitorTypes> & d)
+SpecTreeToPython::visit_leaf(const DependencyLabelsDepSpec & d)
{
_current_parent->add_child(tr1::shared_ptr<PythonDependencyLabelsDepSpec>(new PythonDependencyLabelsDepSpec(d)));
}
@@ -622,7 +622,7 @@ struct AllowedTypes<FetchableURISpecTree>
AllowedTypes(const AllDepSpec &) {};
AllowedTypes(const UseDepSpec &) {};
AllowedTypes(const FetchableURISpecTree &) {};
- AllowedTypes(const LabelsDepSpec<URILabelVisitorTypes> &) {};
+ AllowedTypes(const URILabelsDepSpec &) {};
};
template<>
@@ -657,7 +657,7 @@ struct AllowedTypes<DependencySpecTree>
AllowedTypes(const UseDepSpec &) {};
AllowedTypes(const PackageDepSpec &) {};
AllowedTypes(const BlockDepSpec &) {};
- AllowedTypes(const LabelsDepSpec<DependencyLabelVisitorTypes> &) {};
+ AllowedTypes(const DependencyLabelsDepSpec &) {};
};
template<>
@@ -742,18 +742,18 @@ struct NiceClassNames<FetchableURIDepSpec>
const char * NiceClassNames<FetchableURIDepSpec>::name = "FetchableURIDepSpec";
template<>
-struct NiceClassNames<LabelsDepSpec<URILabelVisitorTypes> >
+struct NiceClassNames<URILabelsDepSpec>
{
static const char * name;
};
-const char * NiceClassNames<LabelsDepSpec<URILabelVisitorTypes> >::name = "URILabelsDepSpec";
+const char * NiceClassNames<URILabelsDepSpec>::name = "URILabelsDepSpec";
template<>
-struct NiceClassNames<LabelsDepSpec<DependencyLabelVisitorTypes> >
+struct NiceClassNames<DependencyLabelsDepSpec>
{
static const char * name;
};
-const char * NiceClassNames<LabelsDepSpec<DependencyLabelVisitorTypes> >::name = "DependencyLabelsDepSpec";
+const char * NiceClassNames<DependencyLabelsDepSpec>::name = "DependencyLabelsDepSpec";
template<>
struct NiceClassNames<BlockDepSpec>
@@ -940,14 +940,14 @@ template <typename H_>
void
SpecTreeFromPython<H_>::visit(const PythonURILabelsDepSpec & d)
{
- dispatch<H_, LabelsDepSpec<URILabelVisitorTypes> >(this, d);
+ dispatch<H_, URILabelsDepSpec>(this, d);
}
template <typename H_>
void
SpecTreeFromPython<H_>::visit(const PythonDependencyLabelsDepSpec & d)
{
- dispatch<H_, LabelsDepSpec<DependencyLabelVisitorTypes> >(this, d);
+ dispatch<H_, DependencyLabelsDepSpec>(this, d);
}
template <typename H_>
@@ -1055,18 +1055,18 @@ template <typename H_>
void
SpecTreeFromPython<H_>::real_visit(const PythonURILabelsDepSpec &)
{
- _add(tr1::shared_ptr<TreeLeaf<H_, LabelsDepSpec<URILabelVisitorTypes> > >(
- new TreeLeaf<H_, LabelsDepSpec<URILabelVisitorTypes> >(tr1::shared_ptr<LabelsDepSpec<URILabelVisitorTypes> >(
- new LabelsDepSpec<URILabelVisitorTypes>))));
+ _add(tr1::shared_ptr<TreeLeaf<H_, URILabelsDepSpec> >(
+ new TreeLeaf<H_, URILabelsDepSpec>(tr1::shared_ptr<LabelsDepSpec<URILabelVisitorTypes> >(
+ new URILabelsDepSpec))));
}
template <typename H_>
void
SpecTreeFromPython<H_>::real_visit(const PythonDependencyLabelsDepSpec &)
{
- _add(tr1::shared_ptr<TreeLeaf<H_, LabelsDepSpec<DependencyLabelVisitorTypes> > >(
- new TreeLeaf<H_, LabelsDepSpec<DependencyLabelVisitorTypes> >(tr1::shared_ptr<LabelsDepSpec<DependencyLabelVisitorTypes> >(
- new LabelsDepSpec<DependencyLabelVisitorTypes>))));
+ _add(tr1::shared_ptr<TreeLeaf<H_, DependencyLabelsDepSpec> >(
+ new TreeLeaf<H_, DependencyLabelsDepSpec>(tr1::shared_ptr<DependencyLabelsDepSpec>(
+ new DependencyLabelsDepSpec))));
}
template <typename H_>
diff --git a/python/dep_spec.hh b/python/dep_spec.hh
index e1ec963..d529b46 100644
--- a/python/dep_spec.hh
+++ b/python/dep_spec.hh
@@ -242,7 +242,7 @@ namespace paludis
{
public:
PythonURILabelsDepSpec(const std::string &);
- PythonURILabelsDepSpec(const LabelsDepSpec<URILabelVisitorTypes> &);
+ PythonURILabelsDepSpec(const URILabelsDepSpec &);
};
class PALUDIS_VISIBLE PythonDependencyLabelsDepSpec :
@@ -251,7 +251,7 @@ namespace paludis
{
public:
PythonDependencyLabelsDepSpec(const std::string &);
- PythonDependencyLabelsDepSpec(const LabelsDepSpec<DependencyLabelVisitorTypes> &);
+ PythonDependencyLabelsDepSpec(const DependencyLabelsDepSpec &);
};
/**
@@ -295,9 +295,9 @@ namespace paludis
void visit_leaf(const LicenseDepSpec &);
- void visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> &);
+ void visit_leaf(const URILabelsDepSpec &);
- void visit_leaf(const LabelsDepSpec<DependencyLabelVisitorTypes> &);
+ void visit_leaf(const DependencyLabelsDepSpec &);
};
/**
diff --git a/src/clients/adjutrix/find_reverse_deps.cc b/src/clients/adjutrix/find_reverse_deps.cc
index 3760f58..ffb7ed1 100644
--- a/src/clients/adjutrix/find_reverse_deps.cc
+++ b/src/clients/adjutrix/find_reverse_deps.cc
@@ -104,7 +104,7 @@ namespace
{
}
- void visit_leaf(const DependencyLabelDepSpec &)
+ void visit_leaf(const DependencyLabelsDepSpec &)
{
}
};
diff --git a/src/clients/gtkpaludis/libgtkpaludis/markup_formatter.cc b/src/clients/gtkpaludis/libgtkpaludis/markup_formatter.cc
index fdb1344..456e1cb 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/markup_formatter.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/markup_formatter.cc
@@ -179,13 +179,13 @@ MarkupFormatter::format(const std::string & f, const format::Plain &) const
}
std::string
-MarkupFormatter::format(const LabelsDepSpec<URILabelVisitorTypes> & f, const format::Plain &) const
+MarkupFormatter::format(const URILabelsDepSpec & f, const format::Plain &) const
{
return markup_escape(stringify(f));
}
std::string
-MarkupFormatter::format(const LabelsDepSpec<DependencyLabelVisitorTypes> & f, const format::Plain &) const
+MarkupFormatter::format(const DependencyLabelsDepSpec & f, const format::Plain &) const
{
return markup_escape(stringify(f));
}
diff --git a/src/clients/gtkpaludis/libgtkpaludis/markup_formatter.hh b/src/clients/gtkpaludis/libgtkpaludis/markup_formatter.hh
index c1cffb4..ba438db 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/markup_formatter.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/markup_formatter.hh
@@ -16,8 +16,8 @@ namespace gtkpaludis
public paludis::CanFormat<paludis::UseDepSpec>,
public paludis::CanFormat<paludis::PackageDepSpec>,
public paludis::CanFormat<paludis::BlockDepSpec>,
- public paludis::CanFormat<paludis::LabelsDepSpec<paludis::DependencyLabelVisitorTypes> >,
- public paludis::CanFormat<paludis::LabelsDepSpec<paludis::URILabelVisitorTypes> >,
+ public paludis::CanFormat<paludis::DependencyLabelsDepSpec>,
+ public paludis::CanFormat<paludis::URILabelsDepSpec>,
public paludis::CanFormat<paludis::PlainTextDepSpec>,
public paludis::CanFormat<paludis::SimpleURIDepSpec>,
public paludis::CanFormat<paludis::FetchableURIDepSpec>,
@@ -63,9 +63,9 @@ namespace gtkpaludis
std::string format(const std::string &, const paludis::format::Plain &) const;
- std::string format(const paludis::LabelsDepSpec<paludis::URILabelVisitorTypes> &, const paludis::format::Plain &) const;
+ std::string format(const paludis::URILabelsDepSpec &, const paludis::format::Plain &) const;
- std::string format(const paludis::LabelsDepSpec<paludis::DependencyLabelVisitorTypes> &, const paludis::format::Plain &) const;
+ std::string format(const paludis::DependencyLabelsDepSpec &, const paludis::format::Plain &) const;
std::string format(const paludis::SimpleURIDepSpec &, const paludis::format::Plain &) const;
diff --git a/src/output/colour_formatter.cc b/src/output/colour_formatter.cc
index 41f9552..0af5c3c 100644
--- a/src/output/colour_formatter.cc
+++ b/src/output/colour_formatter.cc
@@ -337,13 +337,13 @@ ColourFormatter::format(const std::string & f, const format::Plain &) const
}
std::string
-ColourFormatter::format(const LabelsDepSpec<URILabelVisitorTypes> & f, const format::Plain &) const
+ColourFormatter::format(const URILabelsDepSpec & f, const format::Plain &) const
{
return stringify(f);
}
std::string
-ColourFormatter::format(const LabelsDepSpec<DependencyLabelVisitorTypes> & f, const format::Plain &) const
+ColourFormatter::format(const DependencyLabelsDepSpec & f, const format::Plain &) const
{
return stringify(f);
}
diff --git a/src/output/colour_formatter.hh b/src/output/colour_formatter.hh
index f1a9d59..9ff1b8f 100644
--- a/src/output/colour_formatter.hh
+++ b/src/output/colour_formatter.hh
@@ -32,8 +32,8 @@ class ColourFormatter :
public paludis::CanFormat<paludis::UseDepSpec>,
public paludis::CanFormat<paludis::PackageDepSpec>,
public paludis::CanFormat<paludis::BlockDepSpec>,
- public paludis::CanFormat<paludis::LabelsDepSpec<paludis::DependencyLabelVisitorTypes> >,
- public paludis::CanFormat<paludis::LabelsDepSpec<paludis::URILabelVisitorTypes> >,
+ public paludis::CanFormat<paludis::DependencyLabelsDepSpec>,
+ public paludis::CanFormat<paludis::URILabelsDepSpec>,
public paludis::CanFormat<paludis::PlainTextDepSpec>,
public paludis::CanFormat<paludis::SimpleURIDepSpec>,
public paludis::CanFormat<paludis::FetchableURIDepSpec>,
@@ -88,9 +88,9 @@ class ColourFormatter :
std::string format(const std::string &, const paludis::format::Plain &) const;
- std::string format(const paludis::LabelsDepSpec<paludis::URILabelVisitorTypes> &, const paludis::format::Plain &) const;
+ std::string format(const paludis::URILabelsDepSpec &, const paludis::format::Plain &) const;
- std::string format(const paludis::LabelsDepSpec<paludis::DependencyLabelVisitorTypes> &, const paludis::format::Plain &) const;
+ std::string format(const paludis::DependencyLabelsDepSpec &, const paludis::format::Plain &) const;
std::string format(const paludis::FetchableURIDepSpec &, const paludis::format::Plain &) const;
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index e8fdba8..8131a07 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -609,11 +609,11 @@ namespace
empty = false;
}
- void visit_leaf(const LabelsDepSpec<URILabelVisitorTypes> &)
+ void visit_leaf(const URILabelsDepSpec &)
{
}
- void visit_leaf(const DependencyLabelDepSpec &)
+ void visit_leaf(const DependencyLabelsDepSpec &)
{
}
};