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, 5 insertions, 5 deletions

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 5781ebcf0..dfdd550b7 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -89,12 +89,12 @@ class MirrorMethod : public aptMethod /*{{{*/
    };
    std::unordered_map<std::string, MirrorListInfo> mirrorfilestate;
 
-   virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
+   bool URIAcquire(std::string const &Message, FetchItem *Itm) override;
 
-   void RedirectItem(MirrorListInfo const &info, FetchItem *const Itm, std::string const &Message);
-   bool MirrorListFileReceived(MirrorListInfo &info, FetchItem *const Itm);
-   std::string GetMirrorFileURI(std::string const &Message, FetchItem *const Itm);
-   void DealWithPendingItems(std::vector<std::string> const &baseuris, MirrorListInfo const &info, FetchItem *const Itm, std::function<void()> handler);
+   void RedirectItem(MirrorListInfo const &info, FetchItem *Itm, std::string const &Message);
+   bool MirrorListFileReceived(MirrorListInfo &info, FetchItem *Itm);
+   std::string GetMirrorFileURI(std::string const &Message, FetchItem *Itm);
+   void DealWithPendingItems(std::vector<std::string> const &baseuris, MirrorListInfo const &info, FetchItem *Itm, std::function<void()> handler);
 
    public:
    explicit MirrorMethod(std::string &&pProg) : aptMethod(std::move(pProg), "2.0", SingleInstance | Pipeline | SendConfig | AuxRequests | SendURIEncoded), genrng(clock())