Merge branch 'fix/cleanup' into 'main'

Drop unused and obsolete macros as well as documentation

See merge request apt-team/apt!428

4 files changed, 13 insertions, 13 deletions

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 94202d9e1..13d875366 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -44,12 +44,12 @@ protected:
    OpTextProgress Progress;
    void Prompt(const char *Text);
    string PromptLine(const char *Text);
-   bool AskCdromName(string &name) APT_OVERRIDE;
+   bool AskCdromName(string &name) override;
 
 public:
-   virtual void Update(string text, int current) APT_OVERRIDE;
-   virtual bool ChangeCdrom() APT_OVERRIDE;
-   virtual OpProgress* GetOpProgress() APT_OVERRIDE;
+   void Update(string text, int current) override;
+   bool ChangeCdrom() override;
+   OpProgress* GetOpProgress() override;
 };
 
 void pkgCdromTextStatus::Prompt(const char *Text)
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();
diff --git a/cmdline/apt-internal-planner.cc b/cmdline/apt-internal-planner.cc
index c77997a7a..b850ed628 100644
--- a/cmdline/apt-internal-planner.cc
+++ b/cmdline/apt-internal-planner.cc
@@ -51,7 +51,7 @@ static bool ShowHelp(CommandLine &)					/*{{{*/
 	return true;
 }
 									/*}}}*/
-APT_NORETURN static void DIE(std::string const &message) {		/*{{{*/
+[[noreturn]] static void DIE(std::string const &message) {		/*{{{*/
 	std::cerr << "ERROR: " << message << std::endl;
 	_error->DumpErrors(std::cerr);
 	exit(EXIT_FAILURE);
@@ -68,17 +68,17 @@ class PMOutput: public pkgPackageManager				/*{{{*/
    bool const Debug;
 
 protected:
-   virtual bool Install(PkgIterator Pkg,std::string) APT_OVERRIDE
+   bool Install(PkgIterator Pkg,std::string /*filename*/) override
    {
       //std::cerr << "INSTALL: " << APT::PrettyPkg(&Cache, Pkg) << std::endl;
       return EDSP::WriteSolutionStanza(output, "Unpack", Cache[Pkg].InstVerIter(Cache));
    }
-   virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE
+   bool Configure(PkgIterator Pkg) override
    {
       //std::cerr << "CONFIGURE: " << APT::PrettyPkg(&Cache, Pkg) << " " << std::endl;
       return EDSP::WriteSolutionStanza(output, "Configure", Cache[Pkg].InstVerIter(Cache));
    }
-   virtual bool Remove(PkgIterator Pkg,bool) APT_OVERRIDE
+   bool Remove(PkgIterator Pkg, bool /*Purge*/) override
    {
       //std::cerr << "REMOVE: " << APT::PrettyPkg(&Cache, Pkg) << " " << std::endl;
       return EDSP::WriteSolutionStanza(output, "Remove", Pkg.CurrentVer());
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index d596dcb5e..ceedd96c7 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -51,7 +51,7 @@ static bool ShowHelp(CommandLine &)					/*{{{*/
 	return true;
 }
 									/*}}}*/
-APT_NORETURN static void DIE(std::string const &message) {		/*{{{*/
+[[noreturn]] static void DIE(std::string const &message) {		/*{{{*/
 	std::cerr << "ERROR: " << message << std::endl;
 	_error->DumpErrors(std::cerr);
 	exit(EXIT_FAILURE);