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

diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index bbd926e61..e0451ec51 100644
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -24,10 +24,10 @@ class DebFile : public pkgDirStream
 	
 public:
 	explicit DebFile(const char *FileName);
-	~DebFile();
-	bool DoItem(Item &I, int &fd) APT_OVERRIDE;
-	bool Process(pkgDirStream::Item &I, const unsigned char *data, 
-		unsigned long long size, unsigned long long pos) APT_OVERRIDE;
+	~DebFile() override;
+	bool DoItem(Item &I, int &fd) override;
+	bool Process(pkgDirStream::Item &I, const unsigned char *data,
+		unsigned long long size, unsigned long long pos) override;
 
 	bool Go();
 	bool ParseInfo();