From f73593a4034d9eec0ec4466b8e173d4a4daece1f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Dec 2024 19:41:53 +0000 Subject: 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. --- apt-private/acqprogress.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'apt-private/acqprogress.h') 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 &&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 &&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); }; -- cgit v1.2.3-70-g09d2