From eba9fcb1d71dd48458d09c1328ba11ea06fbb40b Mon Sep 17 00:00:00 2001 From: Ciaran McCreesh Date: Tue, 28 Dec 2010 22:51:52 +0000 Subject: Concrete -> Specific --- paludis/dep_label-fwd.hh | 36 ++++++++++++++++++------------------ paludis/dep_label.cc | 46 +++++++++++++++++++++++----------------------- paludis/dep_label.hh | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/paludis/dep_label-fwd.hh b/paludis/dep_label-fwd.hh index cc97757a1..bf1551e6c 100644 --- a/paludis/dep_label-fwd.hh +++ b/paludis/dep_label-fwd.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2007, 2008, 2009, 2010 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 @@ -35,25 +35,25 @@ namespace paludis { struct URILabel; - template struct ConcreteURILabel; + template struct SpecificURILabel; struct URIMirrorsThenListedLabelTag; - typedef ConcreteURILabel URIMirrorsThenListedLabel; + typedef SpecificURILabel URIMirrorsThenListedLabel; struct URIMirrorsOnlyLabelTag; - typedef ConcreteURILabel URIMirrorsOnlyLabel; + typedef SpecificURILabel URIMirrorsOnlyLabel; struct URIListedOnlyLabelTag; - typedef ConcreteURILabel URIListedOnlyLabel; + typedef SpecificURILabel URIListedOnlyLabel; struct URIListedThenMirrorsLabelTag; - typedef ConcreteURILabel URIListedThenMirrorsLabel; + typedef SpecificURILabel URIListedThenMirrorsLabel; struct URILocalMirrorsOnlyLabelTag; - typedef ConcreteURILabel URILocalMirrorsOnlyLabel; + typedef SpecificURILabel URILocalMirrorsOnlyLabel; struct URIManualOnlyLabelTag; - typedef ConcreteURILabel URIManualOnlyLabel; + typedef SpecificURILabel URIManualOnlyLabel; /** * A URILabel can be written to a stream. @@ -66,7 +66,7 @@ namespace paludis struct DependenciesLabel; template - struct ConcreteDependenciesLabel; + struct SpecificDependenciesLabel; /** * Tag for DependenciesBuildLabel. @@ -82,7 +82,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesBuildLabel; + typedef SpecificDependenciesLabel DependenciesBuildLabel; /** * Tag for DependenciesRunLabel. @@ -98,7 +98,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesRunLabel; + typedef SpecificDependenciesLabel DependenciesRunLabel; /** * Tag for DependenciesPostLabel. @@ -114,7 +114,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesPostLabel; + typedef SpecificDependenciesLabel DependenciesPostLabel; /** * Tag for DependenciesCompileAgainstLabel. @@ -130,7 +130,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesCompileAgainstLabel; + typedef SpecificDependenciesLabel DependenciesCompileAgainstLabel; /** * Tag for DependenciesFetchLabel. @@ -146,7 +146,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesFetchLabel; + typedef SpecificDependenciesLabel DependenciesFetchLabel; /** * Tag for DependenciesInstallLabel. @@ -162,7 +162,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesInstallLabel; + typedef SpecificDependenciesLabel DependenciesInstallLabel; /** * Tag for DependenciesSuggestionLabel. @@ -178,7 +178,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesSuggestionLabel; + typedef SpecificDependenciesLabel DependenciesSuggestionLabel; /** * Tag for DependenciesRecommendationLabel. @@ -194,7 +194,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesRecommendationLabel; + typedef SpecificDependenciesLabel DependenciesRecommendationLabel; /** * Tag for DependenciesTestLabel. @@ -210,7 +210,7 @@ namespace paludis * \since 0.42 * \ingroup g_dep_spec */ - typedef ConcreteDependenciesLabel DependenciesTestLabel; + typedef SpecificDependenciesLabel DependenciesTestLabel; /** * A collection of DependencyLabel instances. diff --git a/paludis/dep_label.cc b/paludis/dep_label.cc index 2a3460fb7..3b01a49fa 100644 --- a/paludis/dep_label.cc +++ b/paludis/dep_label.cc @@ -50,19 +50,19 @@ URILabel::~URILabel() } template -ConcreteURILabel::ConcreteURILabel(const std::string & t) : +SpecificURILabel::SpecificURILabel(const std::string & t) : _text(t) { } template -ConcreteURILabel::~ConcreteURILabel() +SpecificURILabel::~SpecificURILabel() { } template const std::string -ConcreteURILabel::text() const +SpecificURILabel::text() const { return _text; } @@ -72,7 +72,7 @@ DependenciesLabel::~DependenciesLabel() } template -ConcreteDependenciesLabel::ConcreteDependenciesLabel(const std::string & t, +SpecificDependenciesLabel::SpecificDependenciesLabel(const std::string & t, const std::function & e) : _text(t), _enabled(e) @@ -80,40 +80,40 @@ ConcreteDependenciesLabel::ConcreteDependenciesLabel(const std::string & t, } template -ConcreteDependenciesLabel::~ConcreteDependenciesLabel() +SpecificDependenciesLabel::~SpecificDependenciesLabel() { } template const std::string -ConcreteDependenciesLabel::text() const +SpecificDependenciesLabel::text() const { return _text; } template bool -ConcreteDependenciesLabel::enabled() const +SpecificDependenciesLabel::enabled() const { return _enabled(); } -template class ConcreteURILabel; -template class ConcreteURILabel; -template class ConcreteURILabel; -template class ConcreteURILabel; -template class ConcreteURILabel; -template class ConcreteURILabel; - -template class ConcreteDependenciesLabel; -template class ConcreteDependenciesLabel; -template class ConcreteDependenciesLabel; -template class ConcreteDependenciesLabel; -template class ConcreteDependenciesLabel; -template class ConcreteDependenciesLabel; -template class ConcreteDependenciesLabel; -template class ConcreteDependenciesLabel; -template class ConcreteDependenciesLabel; +template class SpecificURILabel; +template class SpecificURILabel; +template class SpecificURILabel; +template class SpecificURILabel; +template class SpecificURILabel; +template class SpecificURILabel; + +template class SpecificDependenciesLabel; +template class SpecificDependenciesLabel; +template class SpecificDependenciesLabel; +template class SpecificDependenciesLabel; +template class SpecificDependenciesLabel; +template class SpecificDependenciesLabel; +template class SpecificDependenciesLabel; +template class SpecificDependenciesLabel; +template class SpecificDependenciesLabel; template class Sequence >; template class WrappedForwardIterator >::ConstIteratorTag, diff --git a/paludis/dep_label.hh b/paludis/dep_label.hh index 013783033..0e30acc8e 100644 --- a/paludis/dep_label.hh +++ b/paludis/dep_label.hh @@ -80,9 +80,9 @@ namespace paludis * \nosubgrouping */ template - class PALUDIS_VISIBLE ConcreteURILabel : + class PALUDIS_VISIBLE SpecificURILabel : public URILabel, - public ImplementAcceptMethods > + public ImplementAcceptMethods > { private: const std::string _text; @@ -91,8 +91,8 @@ namespace paludis ///\name Basic operations ///\{ - ConcreteURILabel(const std::string &); - ~ConcreteURILabel(); + SpecificURILabel(const std::string &); + ~SpecificURILabel(); ///\} @@ -140,9 +140,9 @@ namespace paludis * \ingroup g_dep_spec */ template - class PALUDIS_VISIBLE ConcreteDependenciesLabel : + class PALUDIS_VISIBLE SpecificDependenciesLabel : public DependenciesLabel, - public ImplementAcceptMethods > + public ImplementAcceptMethods > { private: const std::string _text; @@ -152,8 +152,8 @@ namespace paludis ///\name Basic operations ///\{ - ConcreteDependenciesLabel(const std::string &, const std::function &); - ~ConcreteDependenciesLabel(); + SpecificDependenciesLabel(const std::string &, const std::function &); + ~SpecificDependenciesLabel(); ///\} @@ -164,22 +164,22 @@ namespace paludis typedef T_ Tag; }; - extern template class ConcreteURILabel; - extern template class ConcreteURILabel; - extern template class ConcreteURILabel; - extern template class ConcreteURILabel; - extern template class ConcreteURILabel; - extern template class ConcreteURILabel; - - extern template class ConcreteDependenciesLabel; - extern template class ConcreteDependenciesLabel; - extern template class ConcreteDependenciesLabel; - extern template class ConcreteDependenciesLabel; - extern template class ConcreteDependenciesLabel; - extern template class ConcreteDependenciesLabel; - extern template class ConcreteDependenciesLabel; - extern template class ConcreteDependenciesLabel; - extern template class ConcreteDependenciesLabel; + extern template class SpecificURILabel; + extern template class SpecificURILabel; + extern template class SpecificURILabel; + extern template class SpecificURILabel; + extern template class SpecificURILabel; + extern template class SpecificURILabel; + + extern template class SpecificDependenciesLabel; + extern template class SpecificDependenciesLabel; + extern template class SpecificDependenciesLabel; + extern template class SpecificDependenciesLabel; + extern template class SpecificDependenciesLabel; + extern template class SpecificDependenciesLabel; + extern template class SpecificDependenciesLabel; + extern template class SpecificDependenciesLabel; + extern template class SpecificDependenciesLabel; extern template class WrappedForwardIterator >::ConstIteratorTag, const std::shared_ptr >; -- cgit v1.2.3