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.

5 files changed, 14 insertions, 14 deletions

diff --git a/test/interactive-helper/teestream.h b/test/interactive-helper/teestream.h
index 058717ac3..511c6da60 100644
--- a/test/interactive-helper/teestream.h
+++ b/test/interactive-helper/teestream.h
@@ -19,13 +19,13 @@ public:
 	 std::basic_streambuf<CharT, Traits> * const sb2)
       : s1(sb1), s2(sb2) {}
 protected:
-   virtual std::streamsize xsputn(const CharT* s, std::streamsize c) APT_OVERRIDE
+   virtual std::streamsize xsputn(const CharT* s, std::streamsize c) override
    {
       return s2->sputn(s, s1->sputn(s, c));
    }
    // overflow is the fallback of sputc which is non-virtual
    typedef typename Traits::int_type int_type;
-   virtual int_type overflow(int_type ch = Traits::eof()) APT_OVERRIDE
+   int_type overflow(int_type ch = Traits::eof()) override
    {
       auto const eof = Traits::eof();
       if (Traits::eq_int_type(ch, Traits::eof()) == true)
@@ -35,12 +35,12 @@ protected:
       auto const r2 = s2->sputc(Traits::to_char_type(ch));
       return Traits::eq_int_type(r1, eof) ? r1: r2;
    }
-   virtual void imbue(const std::locale& loc) APT_OVERRIDE
+   void imbue(const std::locale& loc) override
    {
       s1->pubimbue(loc);
       s2->pubimbue(loc);
    }
-   virtual int sync() APT_OVERRIDE
+   int sync() override
    {
       auto const r1 = s1->pubsync();
       auto const r2 = s2->pubsync();
diff --git a/test/interactive-helper/testdeb.cc b/test/interactive-helper/testdeb.cc
index 0bb24a52a..20376181b 100644
--- a/test/interactive-helper/testdeb.cc
+++ b/test/interactive-helper/testdeb.cc
@@ -13,7 +13,7 @@
 class NullStream : public pkgDirStream
 {
    public:
-   virtual bool DoItem(Item &/*Itm*/, int &/*Fd*/) APT_OVERRIDE {return true;};
+   bool DoItem(Item &/*Itm*/, int &/*Fd*/) override {return true;};
 };
 
 static bool Test(const char *File)
diff --git a/test/libapt/acqprogress_test.cc b/test/libapt/acqprogress_test.cc
index 17a04161e..16b17c3a4 100644
--- a/test/libapt/acqprogress_test.cc
+++ b/test/libapt/acqprogress_test.cc
@@ -13,8 +13,8 @@ class TestItem: public pkgAcquire::Item
 public:
    explicit TestItem(pkgAcquire * const Acq) : pkgAcquire::Item(Acq) {}
 
-   virtual std::string DescURI() const APT_OVERRIDE { return ""; }
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE { return HashStringList(); }
+   [[nodiscard]] std::string DescURI() const override { return ""; }
+   [[nodiscard]] HashStringList GetExpectedHashes() const override { return {}; }
 
 };
 
diff --git a/test/libapt/extracttar_test.cc b/test/libapt/extracttar_test.cc
index b01846c10..bf3a3e3bd 100644
--- a/test/libapt/extracttar_test.cc
+++ b/test/libapt/extracttar_test.cc
@@ -14,9 +14,9 @@ class Stream : public pkgDirStream
    public:
     int count;
     Stream () { count = 0; }
-    bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE { (void)Itm; (void)Fd; count++; return true; }
-    bool Fail(Item &Itm,int Fd) APT_OVERRIDE { (void)Itm; (void)Fd; return true; }
-    bool FinishedFile(Item &Itm,int Fd) APT_OVERRIDE { (void)Itm; (void)Fd; return true; }
+    bool DoItem(Item &Itm,int &Fd) override { (void)Itm; (void)Fd; count++; return true; }
+    bool Fail(Item &Itm,int Fd) override { (void)Itm; (void)Fd; return true; }
+    bool FinishedFile(Item &Itm,int Fd) override { (void)Itm; (void)Fd; return true; }
     ~Stream() {}
 };
 
diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc
index a1fed06fa..f112ae937 100644
--- a/test/libapt/indexcopytosourcelist_test.cc
+++ b/test/libapt/indexcopytosourcelist_test.cc
@@ -15,10 +15,10 @@ class NoCopy : private IndexCopy {
 	 IndexCopy::ConvertToSourceList(CD, Path);
 	 return Path;
       }
-      bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) APT_OVERRIDE { return false; }
-      bool RewriteEntry(FileFd & /*Target*/, std::string const &/*File*/) APT_OVERRIDE { return false; }
-      const char *GetFileName() APT_OVERRIDE { return NULL; }
-      const char *Type() APT_OVERRIDE { return NULL; }
+      bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) override { return false; }
+      bool RewriteEntry(FileFd & /*Target*/, std::string const &/*File*/) override { return false; }
+      const char *GetFileName() override { return nullptr; }
+      const char *Type() override { return nullptr; }
 
 };