summaryrefslogtreecommitdiff
path: root/apt-pkg/cacheset.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-06-14 14:28:35 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2019-06-14 14:28:35 +0200
commita15f2d0deeb90ce79903823e9317d4fa3e47acff (patch)
tree75799afb72d0207eae1c57555a60529e3bb94e60 /apt-pkg/cacheset.cc
parentd13040190a8542eb8dd5611de1d22d111cfc6b1c (diff)
Remove deprecated cacheset methods
This mostly turns them private and then overrides the public version with the switch, as recommended.
Diffstat (limited to 'apt-pkg/cacheset.cc')
-rw-r--r--apt-pkg/cacheset.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 0c0f213b7..789727266 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -681,14 +681,12 @@ void CacheSetHelper::canNotFindPackage(enum PkgSelector const select,
PackageContainerInterface * const pci, pkgCacheFile &Cache,
std::string const &pattern) {
switch (select) {
-APT_IGNORE_DEPRECATED_PUSH
case REGEX: canNotFindRegEx(pci, Cache, pattern); break;
case TASK: canNotFindTask(pci, Cache, pattern); break;
case FNMATCH: canNotFindFnmatch(pci, Cache, pattern); break;
case PACKAGENAME: canNotFindPackage(pci, Cache, pattern); break;
case STRING: canNotFindPackage(pci, Cache, pattern); break;
case UNKNOWN: break;
-APT_IGNORE_DEPRECATED_POP
}
}
// canNotFindTask - handle the case no package is found for a task /*{{{*/
@@ -726,14 +724,12 @@ pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache,
void CacheSetHelper::canNotFindVersion(enum VerSelector const select, VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg)
{
switch (select) {
-APT_IGNORE_DEPRECATED_PUSH
case ALL: canNotFindAllVer(vci, Cache, Pkg); break;
case INSTCAND: canNotFindInstCandVer(vci, Cache, Pkg); break;
case CANDINST: canNotFindCandInstVer(vci, Cache, Pkg); break;
case NEWEST: canNotFindNewestVer(Cache, Pkg); break;
case CANDIDATE: canNotFindCandidateVer(Cache, Pkg); break;
case INSTALLED: canNotFindInstalledVer(Cache, Pkg); break;
-APT_IGNORE_DEPRECATED_POP
case CANDANDINST: canNotGetCandInstVer(Cache, Pkg); break;
case RELEASE:
case VERSIONNUMBER:
@@ -764,11 +760,9 @@ void CacheSetHelper::canNotFindCandInstVer(VersionContainerInterface * const /*v
// canNotGetVersion - for package by selector /*{{{*/
pkgCache::VerIterator CacheSetHelper::canNotGetVersion(enum VerSelector const select, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
switch (select) {
-APT_IGNORE_DEPRECATED_PUSH
case NEWEST: return canNotFindNewestVer(Cache, Pkg);
case CANDIDATE: return canNotFindCandidateVer(Cache, Pkg);
case INSTALLED: return canNotFindInstalledVer(Cache, Pkg);
-APT_IGNORE_DEPRECATED_POP
case CANDINST: return canNotGetCandInstVer(Cache, Pkg);
case INSTCAND: return canNotGetInstCandVer(Cache, Pkg);
case ALL:
@@ -825,11 +819,9 @@ pkgCache::VerIterator CacheSetHelper::canNotGetCandInstVer(pkgCacheFile &Cache,
void CacheSetHelper::showPackageSelection(pkgCache::PkgIterator const &pkg, enum PkgSelector const select,
std::string const &pattern) {
switch (select) {
-APT_IGNORE_DEPRECATED_PUSH
case REGEX: showRegExSelection(pkg, pattern); break;
case TASK: showTaskSelection(pkg, pattern); break;
case FNMATCH: showFnmatchSelection(pkg, pattern); break;
-APT_IGNORE_DEPRECATED_POP
case PACKAGENAME: /* no surprises here */ break;
case STRING: /* handled by the special cases */ break;
case UNKNOWN: break;
@@ -855,14 +847,12 @@ void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &/*pkg*/,
void CacheSetHelper::showVersionSelection(pkgCache::PkgIterator const &Pkg,
pkgCache::VerIterator const &Ver, enum VerSelector const select, std::string const &pattern) {
switch (select) {
-APT_IGNORE_DEPRECATED_PUSH
case RELEASE:
showSelectedVersion(Pkg, Ver, pattern, true);
break;
case VERSIONNUMBER:
showSelectedVersion(Pkg, Ver, pattern, false);
break;
-APT_IGNORE_DEPRECATED_POP
case NEWEST:
case CANDIDATE:
case INSTALLED: