aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-19 11:45:21 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-19 11:45:21 +0000
commit0b67005f463c8754790ba7c361013b72a15cfa51 (patch)
tree8888c58612bbabc56c60de18d755943ccd9b20b2
parentb8da1a6817c9df21e4507dc47e73ca29fa078d98 (diff)
downloadpaludis-0b67005f463c8754790ba7c361013b72a15cfa51.tar.gz
paludis-0b67005f463c8754790ba7c361013b72a15cfa51.tar.xz
Remove some long-deprecated code
-rw-r--r--paludis/package_database.cc6
-rw-r--r--paludis/package_database.hh7
-rw-r--r--paludis/util/is_file_with_extension.cc18
-rw-r--r--paludis/util/is_file_with_extension.hh37
-rw-r--r--paludis/util/strip.hh68
5 files changed, 0 insertions, 136 deletions
diff --git a/paludis/package_database.cc b/paludis/package_database.cc
index a40bfb8..9f8ac74 100644
--- a/paludis/package_database.cc
+++ b/paludis/package_database.cc
@@ -79,12 +79,6 @@ NonUniqueQueryResultError::NonUniqueQueryResultError(const Query & q,
{
}
-NoSuchRepositoryError::NoSuchRepositoryError(const std::string & n) throw () :
- PackageDatabaseLookupError("Could not find repository '" + n + "'"),
- _name("UNKNOWN")
-{
-}
-
NoSuchRepositoryError::NoSuchRepositoryError(const RepositoryName & n) throw () :
PackageDatabaseLookupError("Could not find repository '" + stringify(n) + "'"),
_name(n)
diff --git a/paludis/package_database.hh b/paludis/package_database.hh
index f3f6c90..b04d4fc 100644
--- a/paludis/package_database.hh
+++ b/paludis/package_database.hh
@@ -218,13 +218,6 @@ namespace paludis
///\name Basic operations
///\{
- /**
- * Constructor.
- *
- * \deprecated Use the RepositoryName form.
- */
- NoSuchRepositoryError(const std::string &) throw () PALUDIS_ATTRIBUTE((deprecated));
-
NoSuchRepositoryError(const RepositoryName &) throw ();
~NoSuchRepositoryError() throw ();
diff --git a/paludis/util/is_file_with_extension.cc b/paludis/util/is_file_with_extension.cc
index c86561c..12dffaf 100644
--- a/paludis/util/is_file_with_extension.cc
+++ b/paludis/util/is_file_with_extension.cc
@@ -48,21 +48,3 @@ paludis::is_file_with_prefix_extension(const FSEntry & f, const std::string & pr
return f.is_regular_file() || ((! o[ifwo_no_follow_symlinks]) && f.exists() && f.realpath().is_regular_file());
}
-IsFileWithExtension::IsFileWithExtension(const std::string & ext) :
- _prefix(""),
- _ext(ext)
-{
-}
-
-IsFileWithExtension::IsFileWithExtension(const std::string & prefix, const std::string & ext) :
- _prefix(prefix),
- _ext(ext)
-{
-}
-
-bool
-IsFileWithExtension::operator() (const FSEntry & f) const
-{
- return is_file_with_prefix_extension(f, _prefix, _ext, IsFileWithOptions());
-}
-
diff --git a/paludis/util/is_file_with_extension.hh b/paludis/util/is_file_with_extension.hh
index 0d47ef3..ca5ded4 100644
--- a/paludis/util/is_file_with_extension.hh
+++ b/paludis/util/is_file_with_extension.hh
@@ -68,43 +68,6 @@ namespace paludis
* \ingroup g_fs
*/
bool is_file_with_prefix_extension(const FSEntry &, const std::string &, const std::string &, const IsFileWithOptions &) PALUDIS_VISIBLE;
-
- /**
- * The IsFileWithExtension class is a functor that determines whether an
- * FSEntry instance is a file with a given extension and (optionally) a
- * given filename prefix.
- *
- * \ingroup g_fs
- * \deprecated Use is_file_with_extension and tr1::bind.
- */
-#ifdef DOXYGEN
- class IsFileWithExtension :
-#else
- class PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((deprecated)) IsFileWithExtension :
-#endif
- public std::unary_function<bool, FSEntry>
- {
- private:
- const std::string _prefix;
- const std::string _ext;
-
- public:
- /**
- * Constructor.
- */
- IsFileWithExtension(const std::string & ext) PALUDIS_ATTRIBUTE((deprecated));
-
- /**
- * Constructor.
- */
- IsFileWithExtension(const std::string & prefix, const std::string & ext) PALUDIS_ATTRIBUTE((deprecated));
-
- /**
- * Operator.
- */
- bool operator() (const FSEntry & f) const
- PALUDIS_ATTRIBUTE((warn_unused_result));
- };
}
#endif
diff --git a/paludis/util/strip.hh b/paludis/util/strip.hh
index 5e73781..bf4f67e 100644
--- a/paludis/util/strip.hh
+++ b/paludis/util/strip.hh
@@ -71,74 +71,6 @@ namespace paludis
*/
std::string strip_trailing(const std::string & s, const std::string & remove) PALUDIS_VISIBLE
PALUDIS_ATTRIBUTE((warn_unused_result));
-
- /**
- * Adapt one of the strip_ functions for use as a std::unary_function by
- * binding a value to the second parameter (avoids the reference to const
- * issue with std::bind2nd).
- *
- * \ingroup g_strings
- * \deprecated Use the function with tr1::bind.
- * \nosubgrouping
- */
- template <std::string (* f_)(const std::string &, const std::string &)>
- class StripAdapter :
- public std::unary_function<std::string, const std::string>
- {
- private:
- const std::string _second;
-
- public:
- ///\name Basic operations
- ///\{
-
- StripAdapter(const std::string & second) PALUDIS_ATTRIBUTE((deprecated)) :
- _second(second)
- {
- }
-
- ///\}
-
- /**
- * Operation.
- */
- std::string operator() (const std::string & first) const
- {
- return (*f_)(first, _second);
- }
- };
-
- /**
- * Adapt strip_leading_string to a functor by binding its second argument.
- *
- * \ingroup g_strings
- * \deprecated Use tr1::bind
- */
- typedef StripAdapter<&strip_leading_string> StripLeadingString PALUDIS_ATTRIBUTE((deprecated));
-
- /**
- * Adapt strip_leading to a functor by binding its second argument.
- *
- * \ingroup g_strings
- * \deprecated Use tr1::bind
- */
- typedef StripAdapter<&strip_leading> StripLeading PALUDIS_ATTRIBUTE((deprecated));
-
- /**
- * Adapt strip_trailing_string to a functor by binding its second argument.
- *
- * \ingroup g_strings
- * \deprecated Use tr1::bind
- */
- typedef StripAdapter<&strip_trailing_string> StripTrailingString PALUDIS_ATTRIBUTE((deprecated));
-
- /**
- * Adapt strip_trailing to a functor by binding its second argument.
- *
- * \ingroup g_strings
- * \deprecated Use tr1::bind
- */
- typedef StripAdapter<&strip_trailing> StripTrailing PALUDIS_ATTRIBUTE((deprecated));
}
#endif