From 5dd00edbcf702cac1ea22392796c65881a8ef6f9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 27 Nov 2015 15:40:47 +0100 Subject: add messages to our deprecation warnings in libapt Git-Dch: Ignore --- apt-pkg/indexfile.cc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'apt-pkg/indexfile.cc') diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 34ebcb2b8..487a5b920 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -89,19 +89,12 @@ std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &/*Record*/, } /*}}}*/ // IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/ -// --------------------------------------------------------------------- -/* */ bool pkgIndexFile::TranslationsAvailable() { return (APT::Configuration::getLanguages().empty() != true); } /*}}}*/ // IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/ -// --------------------------------------------------------------------- -/* No intern need for this method anymore as the check for correctness - is already done in getLanguages(). Note also that this check is - rather bad (doesn't take three character like ast into account). - TODO: Remove method with next API break */ -APT_DEPRECATED bool pkgIndexFile::CheckLanguageCode(const char * const Lang) +bool pkgIndexFile::CheckLanguageCode(const char * const Lang) { if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_')) return true; @@ -113,11 +106,7 @@ APT_DEPRECATED bool pkgIndexFile::CheckLanguageCode(const char * const Lang) } /*}}}*/ // IndexFile::LanguageCode - Return the Language Code /*{{{*/ -// --------------------------------------------------------------------- -/* As we have now possibly more than one LanguageCode this method is - supersided by a) private classmembers or b) getLanguages(). - TODO: Remove method with next API break */ -APT_DEPRECATED std::string pkgIndexFile::LanguageCode() { +std::string pkgIndexFile::LanguageCode() { if (TranslationsAvailable() == false) return ""; return APT::Configuration::getLanguages()[0]; -- cgit v1.2.3