From 2cd6be476d1e5a5592ddac8a912ae73bc882d55e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 29 Jan 2023 13:27:24 +0100 Subject: Drop redundant 'virtual' on function marked 'override' Reported-By: clang-tidy [cppcoreguidelines-explicit-virtual-functions] Gbp-Dch: Ignore --- apt-pkg/cachefilter.h | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'apt-pkg/cachefilter.h') diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index ccff6f9a3..8ea8cf3da 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -30,35 +30,35 @@ public: class APT_PUBLIC PackageMatcher : public Matcher { public: - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE = 0; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE { return (*this)(Ver.ParentPkg()); } - virtual bool operator() (pkgCache::GrpIterator const &/*Grp*/) APT_OVERRIDE { return false; } - virtual ~PackageMatcher(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE = 0; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE { return (*this)(Ver.ParentPkg()); } + bool operator() (pkgCache::GrpIterator const &/*Grp*/) APT_OVERRIDE { return false; } + ~PackageMatcher() APT_OVERRIDE; }; // Generica like True, False, NOT, AND, OR /*{{{*/ class APT_PUBLIC TrueMatcher : public Matcher { public: - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; }; class APT_PUBLIC FalseMatcher : public Matcher { public: - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; }; class APT_PUBLIC NOTMatcher : public Matcher { Matcher * const matcher; public: explicit NOTMatcher(Matcher * const matcher); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; - virtual ~NOTMatcher(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + ~NOTMatcher() APT_OVERRIDE; }; class APT_PUBLIC ANDMatcher : public Matcher { @@ -72,10 +72,10 @@ public: ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4); ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5); ANDMatcher& AND(Matcher * const matcher); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; - virtual ~ANDMatcher(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + ~ANDMatcher() APT_OVERRIDE; }; class APT_PUBLIC ORMatcher : public Matcher { std::vector matchers; @@ -88,28 +88,28 @@ public: ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4); ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5); ORMatcher& OR(Matcher * const matcher); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; - virtual ~ORMatcher(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + ~ORMatcher() APT_OVERRIDE; }; /*}}}*/ class APT_PUBLIC PackageNameMatchesRegEx : public PackageMatcher { /*{{{*/ regex_t* pattern; public: explicit PackageNameMatchesRegEx(std::string const &Pattern); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual ~PackageNameMatchesRegEx(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + ~PackageNameMatchesRegEx() APT_OVERRIDE; }; /*}}}*/ class APT_PUBLIC PackageNameMatchesFnmatch : public PackageMatcher { /*{{{*/ const std::string Pattern; public: explicit PackageNameMatchesFnmatch(std::string const &Pattern); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual ~PackageNameMatchesFnmatch() {}; + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + ~PackageNameMatchesFnmatch() APT_OVERRIDE = default; }; /*}}}*/ class APT_PUBLIC PackageArchitectureMatchesSpecification : public PackageMatcher { /*{{{*/ @@ -134,16 +134,16 @@ public: */ PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true); bool operator() (char const * const &arch); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual ~PackageArchitectureMatchesSpecification(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + ~PackageArchitectureMatchesSpecification() APT_OVERRIDE; }; /*}}}*/ class APT_PUBLIC PackageIsNewInstall : public PackageMatcher { /*{{{*/ pkgCacheFile * const Cache; public: explicit PackageIsNewInstall(pkgCacheFile * const Cache); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual ~PackageIsNewInstall(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + ~PackageIsNewInstall() APT_OVERRIDE; }; /*}}}*/ -- cgit v1.2.3-70-g09d2 From 3c9ff866affaae10303de04f647220a16bf7e27a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 29 Jan 2023 13:44:37 +0100 Subject: Unhide virtual overloads in some cachefilters The matchers are usually called via its base class, but if we would call them via the derivate class we would not be able to call the not explicitly "imported" overloads, which would be strange. Reported-By: gcc-13 -Woverloaded-virtual Gbp-Dch: Ignore --- apt-pkg/cachefilter.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apt-pkg/cachefilter.h') diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 8ea8cf3da..1b5f9aa71 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -134,6 +134,7 @@ public: */ PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true); bool operator() (char const * const &arch); + using PackageMatcher::operator(); bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; ~PackageArchitectureMatchesSpecification() APT_OVERRIDE; }; @@ -142,6 +143,7 @@ class APT_PUBLIC PackageIsNewInstall : public PackageMatcher { /*{{{*/ pkgCacheFile * const Cache; public: explicit PackageIsNewInstall(pkgCacheFile * const Cache); + using PackageMatcher::operator(); bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; ~PackageIsNewInstall() APT_OVERRIDE; }; -- cgit v1.2.3-70-g09d2