diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2024-12-26 19:41:53 +0000 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2025-01-05 22:16:08 +0000 |
| commit | f73593a4034d9eec0ec4466b8e173d4a4daece1f (patch) | |
| tree | 9cab47b9426e3e9fff80682b86f8449e3d9c9b53 /cmdline | |
| parent | 427f95cedadb5323d35e5174d4592cbdd9c602f4 (diff) | |
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.
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-cdrom.cc | 8 | ||||
| -rw-r--r-- | cmdline/apt-extracttemplates.h | 8 | ||||
| -rw-r--r-- | cmdline/apt-internal-planner.cc | 6 |
3 files changed, 11 insertions, 11 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..abd2a7be9 100644 --- a/cmdline/apt-internal-planner.cc +++ b/cmdline/apt-internal-planner.cc @@ -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()); |