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.

1 files changed, 10 insertions, 11 deletions

diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index b4015861c..a26047f1c 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -30,17 +30,16 @@ class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
    APT_HIDDEN void AssignItemID(pkgAcquire::ItemDesc &Itm);
 
    public:
-
-   virtual bool ReleaseInfoChanges(metaIndex const * const LastRelease, metaIndex const * const CurrentRelease, std::vector<ReleaseInfoChange> &&Changes) APT_OVERRIDE;
-   virtual bool MediaChange(std::string Media,std::string Drive) APT_OVERRIDE;
-   virtual void IMSHit(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
-   virtual void Fetch(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
-   virtual void Done(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
-   virtual void Fail(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
-   virtual void Start() APT_OVERRIDE;
-   virtual void Stop() APT_OVERRIDE;
-
-   bool Pulse(pkgAcquire *Owner) APT_OVERRIDE;
+   bool ReleaseInfoChanges(metaIndex const *LastRelease, metaIndex const *CurrentRelease, std::vector<ReleaseInfoChange> &&Changes) override;
+   bool MediaChange(std::string Media, std::string Drive) override;
+   void IMSHit(pkgAcquire::ItemDesc &Itm) override;
+   void Fetch(pkgAcquire::ItemDesc &Itm) override;
+   void Done(pkgAcquire::ItemDesc &Itm) override;
+   void Fail(pkgAcquire::ItemDesc &Itm) override;
+   void Start() override;
+   void Stop() override;
+
+   bool Pulse(pkgAcquire *Owner) override;
 
    AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet);
 };