aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-28 22:51:52 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-01 03:57:52 +0000
commiteba9fcb1d71dd48458d09c1328ba11ea06fbb40b (patch)
tree43e96769b08980ec47e099c217527b616f24be53
parent92f0a95d1854442e744f707eaae9add7fd92ff67 (diff)
downloadpaludis-eba9fcb1d71dd48458d09c1328ba11ea06fbb40b.tar.gz
paludis-eba9fcb1d71dd48458d09c1328ba11ea06fbb40b.tar.xz
Concrete -> Specific
-rw-r--r--paludis/dep_label-fwd.hh36
-rw-r--r--paludis/dep_label.cc46
-rw-r--r--paludis/dep_label.hh48
3 files changed, 65 insertions, 65 deletions
diff --git a/paludis/dep_label-fwd.hh b/paludis/dep_label-fwd.hh
index cc97757..bf1551e 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 <typename T_> struct ConcreteURILabel;
+ template <typename T_> struct SpecificURILabel;
struct URIMirrorsThenListedLabelTag;
- typedef ConcreteURILabel<URIMirrorsThenListedLabelTag> URIMirrorsThenListedLabel;
+ typedef SpecificURILabel<URIMirrorsThenListedLabelTag> URIMirrorsThenListedLabel;
struct URIMirrorsOnlyLabelTag;
- typedef ConcreteURILabel<URIMirrorsOnlyLabelTag> URIMirrorsOnlyLabel;
+ typedef SpecificURILabel<URIMirrorsOnlyLabelTag> URIMirrorsOnlyLabel;
struct URIListedOnlyLabelTag;
- typedef ConcreteURILabel<URIListedOnlyLabelTag> URIListedOnlyLabel;
+ typedef SpecificURILabel<URIListedOnlyLabelTag> URIListedOnlyLabel;
struct URIListedThenMirrorsLabelTag;
- typedef ConcreteURILabel<URIListedThenMirrorsLabelTag> URIListedThenMirrorsLabel;
+ typedef SpecificURILabel<URIListedThenMirrorsLabelTag> URIListedThenMirrorsLabel;
struct URILocalMirrorsOnlyLabelTag;
- typedef ConcreteURILabel<URILocalMirrorsOnlyLabelTag> URILocalMirrorsOnlyLabel;
+ typedef SpecificURILabel<URILocalMirrorsOnlyLabelTag> URILocalMirrorsOnlyLabel;
struct URIManualOnlyLabelTag;
- typedef ConcreteURILabel<URIManualOnlyLabelTag> URIManualOnlyLabel;
+ typedef SpecificURILabel<URIManualOnlyLabelTag> URIManualOnlyLabel;
/**
* A URILabel can be written to a stream.
@@ -66,7 +66,7 @@ namespace paludis
struct DependenciesLabel;
template <typename>
- struct ConcreteDependenciesLabel;
+ struct SpecificDependenciesLabel;
/**
* Tag for DependenciesBuildLabel.
@@ -82,7 +82,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesBuildLabelTag> DependenciesBuildLabel;
+ typedef SpecificDependenciesLabel<DependenciesBuildLabelTag> DependenciesBuildLabel;
/**
* Tag for DependenciesRunLabel.
@@ -98,7 +98,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesRunLabelTag> DependenciesRunLabel;
+ typedef SpecificDependenciesLabel<DependenciesRunLabelTag> DependenciesRunLabel;
/**
* Tag for DependenciesPostLabel.
@@ -114,7 +114,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesPostLabelTag> DependenciesPostLabel;
+ typedef SpecificDependenciesLabel<DependenciesPostLabelTag> DependenciesPostLabel;
/**
* Tag for DependenciesCompileAgainstLabel.
@@ -130,7 +130,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesCompileAgainstLabelTag> DependenciesCompileAgainstLabel;
+ typedef SpecificDependenciesLabel<DependenciesCompileAgainstLabelTag> DependenciesCompileAgainstLabel;
/**
* Tag for DependenciesFetchLabel.
@@ -146,7 +146,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesFetchLabelTag> DependenciesFetchLabel;
+ typedef SpecificDependenciesLabel<DependenciesFetchLabelTag> DependenciesFetchLabel;
/**
* Tag for DependenciesInstallLabel.
@@ -162,7 +162,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesInstallLabelTag> DependenciesInstallLabel;
+ typedef SpecificDependenciesLabel<DependenciesInstallLabelTag> DependenciesInstallLabel;
/**
* Tag for DependenciesSuggestionLabel.
@@ -178,7 +178,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesSuggestionLabelTag> DependenciesSuggestionLabel;
+ typedef SpecificDependenciesLabel<DependenciesSuggestionLabelTag> DependenciesSuggestionLabel;
/**
* Tag for DependenciesRecommendationLabel.
@@ -194,7 +194,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesRecommendationLabelTag> DependenciesRecommendationLabel;
+ typedef SpecificDependenciesLabel<DependenciesRecommendationLabelTag> DependenciesRecommendationLabel;
/**
* Tag for DependenciesTestLabel.
@@ -210,7 +210,7 @@ namespace paludis
* \since 0.42
* \ingroup g_dep_spec
*/
- typedef ConcreteDependenciesLabel<DependenciesTestLabelTag> DependenciesTestLabel;
+ typedef SpecificDependenciesLabel<DependenciesTestLabelTag> DependenciesTestLabel;
/**
* A collection of DependencyLabel instances.
diff --git a/paludis/dep_label.cc b/paludis/dep_label.cc
index 2a3460f..3b01a49 100644
--- a/paludis/dep_label.cc
+++ b/paludis/dep_label.cc
@@ -50,19 +50,19 @@ URILabel::~URILabel()
}
template <typename T_>
-ConcreteURILabel<T_>::ConcreteURILabel(const std::string & t) :
+SpecificURILabel<T_>::SpecificURILabel(const std::string & t) :
_text(t)
{
}
template <typename T_>
-ConcreteURILabel<T_>::~ConcreteURILabel()
+SpecificURILabel<T_>::~SpecificURILabel()
{
}
template <typename T_>
const std::string
-ConcreteURILabel<T_>::text() const
+SpecificURILabel<T_>::text() const
{
return _text;
}
@@ -72,7 +72,7 @@ DependenciesLabel::~DependenciesLabel()
}
template <typename T_>
-ConcreteDependenciesLabel<T_>::ConcreteDependenciesLabel(const std::string & t,
+SpecificDependenciesLabel<T_>::SpecificDependenciesLabel(const std::string & t,
const std::function<bool ()> & e) :
_text(t),
_enabled(e)
@@ -80,40 +80,40 @@ ConcreteDependenciesLabel<T_>::ConcreteDependenciesLabel(const std::string & t,
}
template <typename T_>
-ConcreteDependenciesLabel<T_>::~ConcreteDependenciesLabel()
+SpecificDependenciesLabel<T_>::~SpecificDependenciesLabel()
{
}
template <typename T_>
const std::string
-ConcreteDependenciesLabel<T_>::text() const
+SpecificDependenciesLabel<T_>::text() const
{
return _text;
}
template <typename T_>
bool
-ConcreteDependenciesLabel<T_>::enabled() const
+SpecificDependenciesLabel<T_>::enabled() const
{
return _enabled();
}
-template class ConcreteURILabel<URIMirrorsThenListedLabelTag>;
-template class ConcreteURILabel<URIMirrorsOnlyLabelTag>;
-template class ConcreteURILabel<URIListedOnlyLabelTag>;
-template class ConcreteURILabel<URIListedThenMirrorsLabelTag>;
-template class ConcreteURILabel<URILocalMirrorsOnlyLabelTag>;
-template class ConcreteURILabel<URIManualOnlyLabelTag>;
-
-template class ConcreteDependenciesLabel<DependenciesBuildLabelTag>;
-template class ConcreteDependenciesLabel<DependenciesRunLabelTag>;
-template class ConcreteDependenciesLabel<DependenciesPostLabelTag>;
-template class ConcreteDependenciesLabel<DependenciesCompileAgainstLabelTag>;
-template class ConcreteDependenciesLabel<DependenciesFetchLabelTag>;
-template class ConcreteDependenciesLabel<DependenciesInstallLabelTag>;
-template class ConcreteDependenciesLabel<DependenciesSuggestionLabelTag>;
-template class ConcreteDependenciesLabel<DependenciesRecommendationLabelTag>;
-template class ConcreteDependenciesLabel<DependenciesTestLabelTag>;
+template class SpecificURILabel<URIMirrorsThenListedLabelTag>;
+template class SpecificURILabel<URIMirrorsOnlyLabelTag>;
+template class SpecificURILabel<URIListedOnlyLabelTag>;
+template class SpecificURILabel<URIListedThenMirrorsLabelTag>;
+template class SpecificURILabel<URILocalMirrorsOnlyLabelTag>;
+template class SpecificURILabel<URIManualOnlyLabelTag>;
+
+template class SpecificDependenciesLabel<DependenciesBuildLabelTag>;
+template class SpecificDependenciesLabel<DependenciesRunLabelTag>;
+template class SpecificDependenciesLabel<DependenciesPostLabelTag>;
+template class SpecificDependenciesLabel<DependenciesCompileAgainstLabelTag>;
+template class SpecificDependenciesLabel<DependenciesFetchLabelTag>;
+template class SpecificDependenciesLabel<DependenciesInstallLabelTag>;
+template class SpecificDependenciesLabel<DependenciesSuggestionLabelTag>;
+template class SpecificDependenciesLabel<DependenciesRecommendationLabelTag>;
+template class SpecificDependenciesLabel<DependenciesTestLabelTag>;
template class Sequence<std::shared_ptr<const DependenciesLabel> >;
template class WrappedForwardIterator<Sequence<std::shared_ptr<const DependenciesLabel> >::ConstIteratorTag,
diff --git a/paludis/dep_label.hh b/paludis/dep_label.hh
index 0137830..0e30acc 100644
--- a/paludis/dep_label.hh
+++ b/paludis/dep_label.hh
@@ -80,9 +80,9 @@ namespace paludis
* \nosubgrouping
*/
template <typename T_>
- class PALUDIS_VISIBLE ConcreteURILabel :
+ class PALUDIS_VISIBLE SpecificURILabel :
public URILabel,
- public ImplementAcceptMethods<URILabel, ConcreteURILabel<T_> >
+ public ImplementAcceptMethods<URILabel, SpecificURILabel<T_> >
{
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 <typename T_>
- class PALUDIS_VISIBLE ConcreteDependenciesLabel :
+ class PALUDIS_VISIBLE SpecificDependenciesLabel :
public DependenciesLabel,
- public ImplementAcceptMethods<DependenciesLabel, ConcreteDependenciesLabel<T_> >
+ public ImplementAcceptMethods<DependenciesLabel, SpecificDependenciesLabel<T_> >
{
private:
const std::string _text;
@@ -152,8 +152,8 @@ namespace paludis
///\name Basic operations
///\{
- ConcreteDependenciesLabel(const std::string &, const std::function<bool ()> &);
- ~ConcreteDependenciesLabel();
+ SpecificDependenciesLabel(const std::string &, const std::function<bool ()> &);
+ ~SpecificDependenciesLabel();
///\}
@@ -164,22 +164,22 @@ namespace paludis
typedef T_ Tag;
};
- extern template class ConcreteURILabel<URIMirrorsThenListedLabelTag>;
- extern template class ConcreteURILabel<URIMirrorsOnlyLabelTag>;
- extern template class ConcreteURILabel<URIListedOnlyLabelTag>;
- extern template class ConcreteURILabel<URIListedThenMirrorsLabelTag>;
- extern template class ConcreteURILabel<URILocalMirrorsOnlyLabelTag>;
- extern template class ConcreteURILabel<URIManualOnlyLabelTag>;
-
- extern template class ConcreteDependenciesLabel<DependenciesBuildLabelTag>;
- extern template class ConcreteDependenciesLabel<DependenciesRunLabelTag>;
- extern template class ConcreteDependenciesLabel<DependenciesPostLabelTag>;
- extern template class ConcreteDependenciesLabel<DependenciesCompileAgainstLabelTag>;
- extern template class ConcreteDependenciesLabel<DependenciesFetchLabelTag>;
- extern template class ConcreteDependenciesLabel<DependenciesInstallLabelTag>;
- extern template class ConcreteDependenciesLabel<DependenciesSuggestionLabelTag>;
- extern template class ConcreteDependenciesLabel<DependenciesRecommendationLabelTag>;
- extern template class ConcreteDependenciesLabel<DependenciesTestLabelTag>;
+ extern template class SpecificURILabel<URIMirrorsThenListedLabelTag>;
+ extern template class SpecificURILabel<URIMirrorsOnlyLabelTag>;
+ extern template class SpecificURILabel<URIListedOnlyLabelTag>;
+ extern template class SpecificURILabel<URIListedThenMirrorsLabelTag>;
+ extern template class SpecificURILabel<URILocalMirrorsOnlyLabelTag>;
+ extern template class SpecificURILabel<URIManualOnlyLabelTag>;
+
+ extern template class SpecificDependenciesLabel<DependenciesBuildLabelTag>;
+ extern template class SpecificDependenciesLabel<DependenciesRunLabelTag>;
+ extern template class SpecificDependenciesLabel<DependenciesPostLabelTag>;
+ extern template class SpecificDependenciesLabel<DependenciesCompileAgainstLabelTag>;
+ extern template class SpecificDependenciesLabel<DependenciesFetchLabelTag>;
+ extern template class SpecificDependenciesLabel<DependenciesInstallLabelTag>;
+ extern template class SpecificDependenciesLabel<DependenciesSuggestionLabelTag>;
+ extern template class SpecificDependenciesLabel<DependenciesRecommendationLabelTag>;
+ extern template class SpecificDependenciesLabel<DependenciesTestLabelTag>;
extern template class WrappedForwardIterator<Sequence<std::shared_ptr<const DependenciesLabel> >::ConstIteratorTag,
const std::shared_ptr<const DependenciesLabel> >;