diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 12:07:36 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:20 +0100 |
| commit | f4cae55a9ffaa80e339ab8a94e8737ba22f702e3 (patch) | |
| tree | 77a2ae1d169c68066a5cf2801a85c5fff61c4118 | |
| parent | eba6aa6b49bf23d1ece40389b3d2959f5d125f50 (diff) | |
indexfile: Remove deprecated translation functions
| -rw-r--r-- | apt-pkg/indexfile.cc | 26 | ||||
| -rw-r--r-- | apt-pkg/indexfile.h | 9 | ||||
| -rw-r--r-- | debian/libapt-pkg6.0.symbols | 3 |
3 files changed, 0 insertions, 38 deletions
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 85d0e87cd..a7290c653 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -86,32 +86,6 @@ std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &/*Record*/, return std::string(); } /*}}}*/ -// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/ -bool pkgIndexFile::TranslationsAvailable() { - return (APT::Configuration::getLanguages().empty() != true); -} - /*}}}*/ -// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/ -bool pkgIndexFile::CheckLanguageCode(const char * const Lang) -{ - if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_')) - return true; - - if (strcmp(Lang,"C") != 0) - _error->Warning("Wrong language code %s", Lang); - - return false; -} - /*}}}*/ -// IndexFile::LanguageCode - Return the Language Code /*{{{*/ -std::string pkgIndexFile::LanguageCode() { -APT_IGNORE_DEPRECATED_PUSH - if (TranslationsAvailable() == false) - return ""; - return APT::Configuration::getLanguages()[0]; -APT_IGNORE_DEPRECATED_POP -} - /*}}}*/ // IndexTarget - Constructor /*{{{*/ IndexTarget::IndexTarget(std::string const &MetaKey, std::string const &ShortDesc, diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 31b95172e..d69d84d39 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -150,15 +150,6 @@ class pkgIndexFile virtual bool Merge(pkgCacheGenerator &/*Gen*/, OpProgress* const /*Prog*/) { return true; }; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; - APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static bool TranslationsAvailable(); - /* 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).*/ - APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static bool CheckLanguageCode(const char * const Lang); - /* As we have now possibly more than one LanguageCode this method is - superseded by a) private classmembers or b) getLanguages() */ - APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static std::string LanguageCode(); - bool IsTrusted() const { return Trusted; }; explicit pkgIndexFile(bool const Trusted); diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols index dcb29981b..ad35943a5 100644 --- a/debian/libapt-pkg6.0.symbols +++ b/debian/libapt-pkg6.0.symbols @@ -228,9 +228,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER# (c++)"pkgCacheFile::Close()@APTPKG_6.0" 0.8.0 (c++)"pkgCacheFile::pkgCacheFile()@APTPKG_6.0" 0.8.0 (c++)"pkgCacheFile::~pkgCacheFile()@APTPKG_6.0" 0.8.0 - (c++)"pkgIndexFile::LanguageCode[abi:cxx11]()@APTPKG_6.0" 0.8.0 - (c++)"pkgIndexFile::CheckLanguageCode(char const*)@APTPKG_6.0" 0.8.0 - (c++)"pkgIndexFile::TranslationsAvailable()@APTPKG_6.0" 0.8.0 (c++)"pkgIndexFile::Type::GlobalList@APTPKG_6.0" 0.8.0 (c++)"pkgIndexFile::Type::GlobalListLen@APTPKG_6.0" 0.8.0 (c++)"pkgIndexFile::Type::GetType(char const*)@APTPKG_6.0" 0.8.0 |