From f73593a4034d9eec0ec4466b8e173d4a4daece1f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 26 Dec 2024 19:41:53 +0000
Subject: Drop usage of macro APT_OVERRIDE for simple override

We were rather inconsistent in using it and as our public headers
contain deduction guides (a c++17 feature) it seems silly to try to hide
a c++11 feature in a macro, so lets stop this charade and drop the
macro and while we are changing all these lines lets apply [[nodiscard]]
(another c++17 feature) and other suggestions from clang-tidy and
formatting for a little more consistency.
---
 apt-pkg/edsp/edsplistparser.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'apt-pkg/edsp/edsplistparser.h')

diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index 3f0f3e64c..a7ad9830c 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -21,13 +21,13 @@
 class APT_HIDDEN edspLikeListParser : public debListParser
 {
    public:
-   virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
-   virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;
-   virtual std::string_view Description_md5() APT_OVERRIDE;
-   virtual uint32_t VersionHash() APT_OVERRIDE;
+   bool NewVersion(pkgCache::VerIterator &Ver) override;
+   std::vector<std::string> AvailableDescriptionLanguages() override;
+   std::string_view Description_md5() override;
+   uint32_t VersionHash() override;
 
    explicit edspLikeListParser(FileFd *File);
-   virtual ~edspLikeListParser();
+   ~edspLikeListParser() override;
 };
 
 class APT_HIDDEN edspListParser : public edspLikeListParser
@@ -36,20 +36,20 @@ class APT_HIDDEN edspListParser : public edspLikeListParser
    FileFd preferences;
 
 protected:
-   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
+   bool ParseStatus(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver) override;
 
 public:
    explicit edspListParser(FileFd *File);
-   virtual ~edspListParser();
+   ~edspListParser() override;
 };
 
 class APT_HIDDEN eippListParser : public edspLikeListParser
 {
 protected:
-   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
+   bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) override;
 
 public:
    explicit eippListParser(FileFd *File);
-   virtual ~eippListParser();
+   ~eippListParser() override;
 };
 #endif
-- 
cgit v1.2.3-70-g09d2