summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/debfile.h11
-rw-r--r--apt-pkg/deb/debindexfile.cc10
-rw-r--r--apt-pkg/deb/debindexfile.h114
-rw-r--r--apt-pkg/deb/deblistparser.h46
-rw-r--r--apt-pkg/deb/debmetaindex.cc4
-rw-r--r--apt-pkg/deb/debmetaindex.h30
-rw-r--r--apt-pkg/deb/debrecords.h40
-rw-r--r--apt-pkg/deb/debsrcrecords.h27
-rw-r--r--apt-pkg/deb/debsystem.h20
-rw-r--r--apt-pkg/deb/debversion.h12
-rw-r--r--apt-pkg/deb/dpkgpm.h14
11 files changed, 162 insertions, 166 deletions
diff --git a/apt-pkg/deb/debfile.h b/apt-pkg/deb/debfile.h
index 48a75ae55..887ee7142 100644
--- a/apt-pkg/deb/debfile.h
+++ b/apt-pkg/deb/debfile.h
@@ -56,8 +56,7 @@ class APT_PUBLIC debDebFile
class APT_PUBLIC debDebFile::ControlExtract : public pkgDirStream
{
public:
-
- virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
+ bool DoItem(Item &Itm, int &Fd) override;
};
class APT_PUBLIC debDebFile::MemControlExtract : public pkgDirStream
@@ -72,9 +71,9 @@ class APT_PUBLIC debDebFile::MemControlExtract : public pkgDirStream
std::string Member;
// Members from DirStream
- virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
- virtual bool Process(Item &Itm,const unsigned char *Data,
- unsigned long long Size,unsigned long long Pos) APT_OVERRIDE;
+ bool DoItem(Item &Itm, int &Fd) override;
+ bool Process(Item &Itm, const unsigned char *Data,
+ unsigned long long Size, unsigned long long Pos) override;
// Helpers
bool Read(debDebFile &Deb);
@@ -82,7 +81,7 @@ class APT_PUBLIC debDebFile::MemControlExtract : public pkgDirStream
MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
explicit MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
- ~MemControlExtract() {delete [] Control;};
+ ~MemControlExtract() override { delete[] Control; };
};
/*}}}*/
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index c4115e53e..306018858 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -325,7 +325,7 @@ class APT_HIDDEN debIFTypeSrc : public pkgIndexFile::Type
class APT_HIDDEN debIFTypePkg : public pkgIndexFile::Type
{
public:
- virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE
+ [[nodiscard]] pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const override
{
return new debRecordParser(File.FileName(),*File.Cache());
};
@@ -339,7 +339,7 @@ class APT_HIDDEN debIFTypeTrans : public debIFTypePkg
class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
{
public:
- virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE
+ [[nodiscard]] pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const override
{
return new debRecordParser(File.FileName(),*File.Cache());
};
@@ -348,7 +348,7 @@ class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
class APT_HIDDEN debIFTypeDebPkgFile : public pkgIndexFile::Type
{
public:
- virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE
+ [[nodiscard]] pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const override
{
return new debDebFileRecordParser(File.FileName());
};
@@ -357,7 +357,7 @@ class APT_HIDDEN debIFTypeDebPkgFile : public pkgIndexFile::Type
class APT_HIDDEN debIFTypeDscFile : public pkgIndexFile::Type
{
public:
- virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &DscFile) const APT_OVERRIDE
+ [[nodiscard]] pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &DscFile) const override
{
return new debDscRecordParser(DscFile, NULL);
};
@@ -366,7 +366,7 @@ class APT_HIDDEN debIFTypeDscFile : public pkgIndexFile::Type
class APT_HIDDEN debIFTypeDebianSourceDir : public pkgIndexFile::Type
{
public:
- virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &SourceDir) const APT_OVERRIDE
+ [[nodiscard]] pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &SourceDir) const override
{
return new debDscRecordParser(SourceDir + std::string("/debian/control"), NULL);
};
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 57b37385e..e9b22ff29 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -29,87 +29,85 @@ class debStatusIndex : public pkgDebianIndexRealFile
{
void * const d;
protected:
- virtual std::string GetArchitecture() const APT_OVERRIDE;
- virtual std::string GetComponent() const APT_OVERRIDE;
- virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+ [[nodiscard]] std::string GetArchitecture() const override;
+ [[nodiscard]] std::string GetComponent() const override;
+ [[nodiscard]] uint8_t GetIndexFlags() const override;
public:
- virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+ [[nodiscard]] const Type *GetType() const override APT_PURE;
// Interface for the Cache Generator
- virtual bool HasPackages() const APT_OVERRIDE {return true;};
+ [[nodiscard]] bool HasPackages() const override { return true; };
// Abort if the file does not exist.
- virtual bool Exists() const APT_OVERRIDE {return true;};
+ [[nodiscard]] bool Exists() const override { return true; };
- virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
+ pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
explicit debStatusIndex(std::string const &File);
- virtual ~debStatusIndex();
+ ~debStatusIndex() override;
};
class debPackagesIndex : public pkgDebianIndexTargetFile
{
void * const d;
protected:
- virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+ [[nodiscard]] uint8_t GetIndexFlags() const override;
public:
- virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+ [[nodiscard]] const Type *GetType() const override APT_PURE;
// Stuff for accessing files on remote items
- virtual std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const APT_OVERRIDE;
+ [[nodiscard]] std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const override;
// Interface for the Cache Generator
- virtual bool HasPackages() const APT_OVERRIDE {return true;};
+ [[nodiscard]] bool HasPackages() const override {return true;};
debPackagesIndex(IndexTarget const &Target, bool const Trusted);
- virtual ~debPackagesIndex();
+ ~debPackagesIndex() override;
};
class debTranslationsIndex : public pkgDebianIndexTargetFile
{
void * const d;
protected:
- virtual std::string GetArchitecture() const APT_OVERRIDE;
- virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
- virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE;
- APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
+ [[nodiscard]] std::string GetArchitecture() const override;
+ [[nodiscard]] uint8_t GetIndexFlags() const override;
+ bool OpenListFile(FileFd &Pkg, std::string const &FileName) override;
+ APT_HIDDEN pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
public:
-
- virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+ [[nodiscard]] const Type *GetType() const override APT_PURE;
// Interface for the Cache Generator
- virtual bool HasPackages() const APT_OVERRIDE;
+ [[nodiscard]] bool HasPackages() const override;
explicit debTranslationsIndex(IndexTarget const &Target);
- virtual ~debTranslationsIndex();
+ ~debTranslationsIndex() override;
};
class debSourcesIndex : public pkgDebianIndexTargetFile
{
void * const d;
- virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
- virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE;
- APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
-
- public:
+ [[nodiscard]] uint8_t GetIndexFlags() const override;
+ bool OpenListFile(FileFd &Pkg, std::string const &FileName) override;
+ APT_HIDDEN pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
- virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+public:
+ [[nodiscard]] const Type *GetType() const override APT_PURE;
// Stuff for accessing files on remote items
- virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
- pkgSrcRecords::File const &File) const APT_OVERRIDE;
+ [[nodiscard]] std::string SourceInfo(pkgSrcRecords::Parser const &Record,
+ pkgSrcRecords::File const &File) const override;
// Interface for the record parsers
- virtual pkgSrcRecords::Parser *CreateSrcParser() const APT_OVERRIDE;
+ [[nodiscard]] pkgSrcRecords::Parser *CreateSrcParser() const override;
// Interface for the Cache Generator
- virtual bool HasPackages() const APT_OVERRIDE {return false;};
+ [[nodiscard]] bool HasPackages() const override { return false; };
debSourcesIndex(IndexTarget const &Target, bool const Trusted);
- virtual ~debSourcesIndex();
+ ~debSourcesIndex() override;
};
class debDebPkgFileIndex : public pkgDebianIndexRealFile
@@ -118,14 +116,14 @@ class debDebPkgFileIndex : public pkgDebianIndexRealFile
std::string DebFile;
protected:
- virtual std::string GetComponent() const APT_OVERRIDE;
- virtual std::string GetArchitecture() const APT_OVERRIDE;
- virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
- virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE;
- APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
+ [[nodiscard]] std::string GetComponent() const override;
+ [[nodiscard]] std::string GetArchitecture() const override;
+ [[nodiscard]] uint8_t GetIndexFlags() const override;
+ bool OpenListFile(FileFd &Pkg, std::string const &FileName) override;
+ APT_HIDDEN pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
public:
- virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+ [[nodiscard]] const Type *GetType() const override APT_PURE;
/** get the control (file) content of the deb file
*
@@ -136,15 +134,15 @@ public:
static bool GetContent(std::ostream &content, std::string const &debfile);
// Interface for the Cache Generator
- virtual bool HasPackages() const APT_OVERRIDE {return true;}
- virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const APT_OVERRIDE;
+ [[nodiscard]] bool HasPackages() const override { return true; }
+ pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const override;
// Interface for acquire
explicit debDebPkgFileIndex(std::string const &DebFile);
- virtual ~debDebPkgFileIndex();
+ ~debDebPkgFileIndex() override;
- std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const override;
+ [[nodiscard]] std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const override;
};
class APT_PUBLIC debDscFileIndex : public pkgDebianIndexRealFile
@@ -152,14 +150,14 @@ class APT_PUBLIC debDscFileIndex : public pkgDebianIndexRealFile
void * const d;
protected:
- virtual std::string GetComponent() const APT_OVERRIDE;
- virtual std::string GetArchitecture() const APT_OVERRIDE;
- virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+ [[nodiscard]] std::string GetComponent() const override;
+ [[nodiscard]] std::string GetArchitecture() const override;
+ [[nodiscard]] uint8_t GetIndexFlags() const override;
public:
- virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
- virtual pkgSrcRecords::Parser *CreateSrcParser() const APT_OVERRIDE;
- virtual bool HasPackages() const APT_OVERRIDE {return false;};
+ [[nodiscard]] const Type *GetType() const override APT_PURE;
+ [[nodiscard]] pkgSrcRecords::Parser *CreateSrcParser() const override;
+ [[nodiscard]] bool HasPackages() const override { return false; };
explicit debDscFileIndex(std::string const &DscFile);
virtual ~debDscFileIndex();
@@ -168,29 +166,29 @@ public:
class debDebianSourceDirIndex : public debDscFileIndex
{
protected:
- virtual std::string GetComponent() const APT_OVERRIDE;
+ [[nodiscard]] std::string GetComponent() const override;
public:
- virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+[[nodiscard]] const Type *GetType() const override APT_PURE;
};
class APT_PUBLIC debStringPackageIndex : public pkgDebianIndexRealFile
{
void * const d;
protected:
- virtual std::string GetArchitecture() const APT_OVERRIDE;
- virtual std::string GetComponent() const APT_OVERRIDE;
- virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+ [[nodiscard]] std::string GetArchitecture() const override;
+ [[nodiscard]] std::string GetComponent() const override;
+ [[nodiscard]] uint8_t GetIndexFlags() const override;
-public:
- virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+ public:
+ [[nodiscard]] const Type *GetType() const override APT_PURE;
// Interface for the Cache Generator
- virtual bool HasPackages() const APT_OVERRIDE {return true;};
+ [[nodiscard]] bool HasPackages() const override { return true; };
// Abort if the file does not exist.
- virtual bool Exists() const APT_OVERRIDE {return true;};
+ [[nodiscard]] bool Exists() const override { return true; };
explicit debStringPackageIndex(std::string const &content);
- virtual ~debStringPackageIndex();
+ ~debStringPackageIndex() override;
};
#endif
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 637063f94..200e04036 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -59,21 +59,21 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
APT_PUBLIC static unsigned char GetPrio(std::string Str);
// These all operate against the current section
- virtual std::string Package() APT_OVERRIDE;
- virtual bool ArchitectureAll() APT_OVERRIDE;
- virtual std::string_view Architecture() APT_OVERRIDE;
- virtual std::string_view Version() APT_OVERRIDE;
- virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
- virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;
- virtual std::string_view Description_md5() APT_OVERRIDE;
- virtual uint32_t VersionHash() APT_OVERRIDE;
- virtual bool SameVersion(uint32_t Hash, pkgCache::VerIterator const &Ver) APT_OVERRIDE;
- virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
- pkgCache::VerIterator &Ver) APT_OVERRIDE;
- virtual map_filesize_t Offset() APT_OVERRIDE {return iOffset;};
- virtual map_filesize_t Size() APT_OVERRIDE {return Section.size();};
-
- virtual bool Step() APT_OVERRIDE;
+ std::string Package() override;
+ bool ArchitectureAll() override;
+ std::string_view Architecture() override;
+ std::string_view Version() override;
+ bool NewVersion(pkgCache::VerIterator &Ver) override;
+ std::vector<std::string> AvailableDescriptionLanguages() override;
+ std::string_view Description_md5() override;
+ uint32_t VersionHash() override;
+ bool SameVersion(uint32_t Hash, pkgCache::VerIterator const &Ver) override;
+ bool UsePackage(pkgCache::PkgIterator &Pkg,
+ pkgCache::VerIterator &Ver) override;
+ map_filesize_t Offset() override { return iOffset; };
+ map_filesize_t Size() override { return Section.size(); };
+
+ bool Step() override;
APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop,
std::string &Package, std::string &Ver, unsigned int &Op,
@@ -99,7 +99,7 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op);
explicit debListParser(FileFd *File);
- virtual ~debListParser();
+ ~debListParser() override;
#ifdef APT_COMPILING_APT
std::string_view SHA256() const
@@ -116,25 +116,25 @@ class APT_HIDDEN debDebFileParser : public debListParser
public:
debDebFileParser(FileFd *File, std::string const &DebFile);
- virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
- pkgCache::VerIterator &Ver) APT_OVERRIDE;
+ bool UsePackage(pkgCache::PkgIterator &Pkg,
+ pkgCache::VerIterator &Ver) override;
};
class APT_HIDDEN debTranslationsParser : public debListParser
{
public:
// a translation can never be a real package
- virtual std::string_view Architecture() APT_OVERRIDE { return ""; }
- virtual std::string_view Version() APT_OVERRIDE { return ""; }
+ std::string_view Architecture() override { return {}; }
+ std::string_view Version() override { return {}; }
- explicit debTranslationsParser(FileFd *File)
- : debListParser(File) {};
+ explicit debTranslationsParser(FileFd *File)
+ : debListParser(File) {};
};
class APT_HIDDEN debStatusListParser : public debListParser
{
public:
- virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
+ bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) override;
explicit debStatusListParser(FileFd *File)
: debListParser(File) {};
};
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index b9369a898..191be05d6 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -1475,7 +1475,7 @@ class APT_HIDDEN debSLTypeDeb : public debSLTypeDebian /*{{{*/
bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
std::string const &Dist, std::string const &Section,
- std::map<std::string, std::string> const &Options) const APT_OVERRIDE
+ std::map<std::string, std::string> const &Options) const override
{
return CreateItemInternal(List, URI, Dist, Section, false, Options);
}
@@ -1491,7 +1491,7 @@ class APT_HIDDEN debSLTypeDebSrc : public debSLTypeDebian /*{{{*/
bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
std::string const &Dist, std::string const &Section,
- std::map<std::string, std::string> const &Options) const APT_OVERRIDE
+ std::map<std::string, std::string> const &Options) const override
{
return CreateItemInternal(List, URI, Dist, Section, true, Options);
}
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index a1a9c41b5..7a6f1fbb4 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -30,20 +30,20 @@ class APT_HIDDEN debReleaseIndex : public metaIndex
debReleaseIndex(std::string const &URI, std::string const &Dist, std::map<std::string,std::string> const &Options);
debReleaseIndex(std::string const &URI, std::string const &Dist, bool const Trusted, std::map<std::string,std::string> const &Options);
- virtual ~debReleaseIndex();
+ ~debReleaseIndex() override;
- virtual std::string ArchiveURI(std::string const &File) const APT_OVERRIDE;
- virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) APT_OVERRIDE;
- virtual std::vector<IndexTarget> GetIndexTargets() const APT_OVERRIDE;
+ [[nodiscard]] std::string ArchiveURI(std::string const &File) const override;
+ bool GetIndexes(pkgAcquire *Owner, bool const &GetAll = false) override;
+ [[nodiscard]] std::vector<IndexTarget> GetIndexTargets() const override;
- virtual std::string Describe() const APT_OVERRIDE;
- virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache, bool const ModifyCheck) const APT_OVERRIDE;
- virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const APT_OVERRIDE;
+ [[nodiscard]] std::string Describe() const override;
+ pkgCache::RlsFileIterator FindInCache(pkgCache &Cache, bool ModifyCheck) const override;
+ bool Merge(pkgCacheGenerator &Gen, OpProgress *Prog) const override;
- virtual bool Load(std::string const &Filename, std::string * const ErrorText) APT_OVERRIDE;
- virtual metaIndex * UnloadedClone() const APT_OVERRIDE;
+ bool Load(std::string const &Filename, std::string *ErrorText) override;
+ [[nodiscard]] metaIndex *UnloadedClone() const override;
- virtual std::vector <pkgIndexFile *> *GetIndexFiles() APT_OVERRIDE;
+ std::vector<pkgIndexFile *> *GetIndexFiles() override;
bool SetTrusted(TriState const Trusted);
bool SetCheckValidUntil(TriState const Trusted);
@@ -56,12 +56,12 @@ class APT_HIDDEN debReleaseIndex : public metaIndex
bool SetSignedBy(std::string const &SignedBy);
std::map<std::string, std::string> GetReleaseOptions();
- virtual bool IsTrusted() const APT_OVERRIDE;
- bool IsArchitectureSupported(std::string const &arch) const override;
- bool IsArchitectureAllSupportedFor(IndexTarget const &target) const override;
- bool HasSupportForComponent(std::string const &component) const override;
+ [[nodiscard]] bool IsTrusted() const override;
+ [[nodiscard]] bool IsArchitectureSupported(std::string const &arch) const override;
+ [[nodiscard]] bool IsArchitectureAllSupportedFor(IndexTarget const &target) const override;
+ [[nodiscard]] bool HasSupportForComponent(std::string const &component) const override;
- APT_PURE time_t GetNotBefore() const override;
+ [[nodiscard]] time_t GetNotBefore() const override APT_PURE;
void AddComponent(std::string const &sourcesEntry,
bool const isSrc, std::string const &Name,
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 10ef91768..050f0399f 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -29,26 +29,26 @@ class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
public:
// These refer to the archive file for the Version
- virtual std::string FileName() APT_OVERRIDE;
- virtual std::string SourcePkg() APT_OVERRIDE;
- virtual std::string SourceVer() APT_OVERRIDE;
+ std::string FileName() override;
+ std::string SourcePkg() override;
+ std::string SourceVer() override;
- virtual HashStringList Hashes() const APT_OVERRIDE;
+ [[nodiscard]] HashStringList Hashes() const override;
// These are some general stats about the package
- virtual std::string Maintainer() APT_OVERRIDE;
- virtual std::string ShortDesc(std::string const &lang) APT_OVERRIDE;
- virtual std::string LongDesc(std::string const &lang) APT_OVERRIDE;
- virtual std::string Name() APT_OVERRIDE;
- virtual std::string Homepage() APT_OVERRIDE;
+ std::string Maintainer() override;
+ std::string ShortDesc(std::string const &lang) override;
+ std::string LongDesc(std::string const &lang) override;
+ std::string Name() override;
+ std::string Homepage() override;
// An arbitrary custom field
- virtual std::string RecordField(const char *fieldName) APT_OVERRIDE;
+ std::string RecordField(const char *fieldName) override;
- virtual void GetRec(const char *&Start,const char *&Stop) APT_OVERRIDE;
+ void GetRec(const char *&Start, const char *&Stop) override;
debRecordParserBase();
- virtual ~debRecordParserBase();
+ ~debRecordParserBase() override;
};
class APT_HIDDEN debRecordParser : public debRecordParserBase
@@ -58,12 +58,12 @@ class APT_HIDDEN debRecordParser : public debRecordParserBase
FileFd File;
pkgTagFile Tags;
- virtual bool Jump(pkgCache::VerFileIterator const &Ver) APT_OVERRIDE;
- virtual bool Jump(pkgCache::DescFileIterator const &Desc) APT_OVERRIDE;
+ bool Jump(pkgCache::VerFileIterator const &Ver) override;
+ bool Jump(pkgCache::DescFileIterator const &Desc) override;
public:
debRecordParser(std::string FileName,pkgCache &Cache);
- virtual ~debRecordParser();
+ ~debRecordParser() override;
};
// custom record parser that reads deb files directly
@@ -76,14 +76,14 @@ class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase
APT_HIDDEN bool LoadContent();
protected:
// single file files, so no jumping whatsoever
- bool Jump(pkgCache::VerFileIterator const &) APT_OVERRIDE;
- bool Jump(pkgCache::DescFileIterator const &) APT_OVERRIDE;
+ bool Jump(pkgCache::VerFileIterator const &/*Ver*/) override;
+ bool Jump(pkgCache::DescFileIterator const & /*Desc*/) override;
public:
- virtual std::string FileName() APT_OVERRIDE;
+ std::string FileName() override;
- explicit debDebFileRecordParser(std::string FileName);
- virtual ~debDebFileRecordParser();
+ explicit debDebFileRecordParser(std::string FileName);
+ ~debDebFileRecordParser() override;
};
#endif
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index dedcb6dbe..a439efa82 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -35,28 +35,27 @@ class APT_HIDDEN debSrcRecordParser : public pkgSrcRecords::Parser
char *Buffer;
public:
+ bool Restart() override { return Jump(0); }
+ bool Step() override {iOffset = Tags.Offset(); return Tags.Step(Sect);}
+ bool Jump(unsigned long const &Off) override {iOffset = Off; return Tags.Jump(Sect,Off);}
- virtual bool Restart() APT_OVERRIDE {return Jump(0);};
- virtual bool Step() APT_OVERRIDE {iOffset = Tags.Offset(); return Tags.Step(Sect);};
- virtual bool Jump(unsigned long const &Off) APT_OVERRIDE {iOffset = Off; return Tags.Jump(Sect,Off);};
-
- virtual std::string Package() const APT_OVERRIDE;
- virtual std::string Version() const APT_OVERRIDE {return std::string{Sect.Find(pkgTagSection::Key::Version)};};
- virtual std::string Maintainer() const APT_OVERRIDE {return std::string{Sect.Find(pkgTagSection::Key::Maintainer)};};
- virtual std::string Section() const APT_OVERRIDE {return std::string{Sect.Find(pkgTagSection::Key::Section)};};
- virtual const char **Binaries() APT_OVERRIDE;
- virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) APT_OVERRIDE;
- virtual unsigned long Offset() APT_OVERRIDE {return iOffset;};
- virtual std::string AsStr() APT_OVERRIDE
+ [[nodiscard]] std::string Package() const override;
+ [[nodiscard]] std::string Version() const override { return std::string{Sect.Find(pkgTagSection::Key::Version)}; }
+ [[nodiscard]] std::string Maintainer() const override { return std::string{Sect.Find(pkgTagSection::Key::Maintainer)}; }
+ [[nodiscard]] std::string Section() const override { return std::string{Sect.Find(pkgTagSection::Key::Section)}; }
+ const char **Binaries() override;
+ bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) override;
+ unsigned long Offset() override { return iOffset; }
+ std::string AsStr() override
{
const char *Start=0,*Stop=0;
Sect.GetSection(Start,Stop);
return std::string(Start,Stop);
};
- virtual bool Files(std::vector<pkgSrcRecords::File> &F) APT_OVERRIDE;
+ bool Files(std::vector<pkgSrcRecords::File> &F) override;
debSrcRecordParser(std::string const &File,pkgIndexFile const *Index);
- virtual ~debSrcRecordParser();
+ ~debSrcRecordParser() override;
};
class APT_HIDDEN debDscRecordParser : public debSrcRecordParser
diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index c426faf81..294ae1819 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -27,18 +27,18 @@ class debSystem : public pkgSystem
APT_HIDDEN bool CheckUpdates();
public:
- virtual bool Lock(OpProgress *const Progress) APT_OVERRIDE;
- virtual bool UnLock(bool NoErrors = false) APT_OVERRIDE;
- virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_OVERRIDE;
- virtual bool Initialize(Configuration &Cnf) APT_OVERRIDE;
- virtual bool ArchiveSupported(const char *Type) APT_OVERRIDE;
- virtual signed Score(Configuration const &Cnf) APT_OVERRIDE;
- virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) APT_OVERRIDE;
- virtual bool FindIndex(pkgCache::PkgFileIterator File,
- pkgIndexFile *&Found) const APT_OVERRIDE;
+ bool Lock(OpProgress *Progress) override;
+ bool UnLock(bool NoErrors = false) override;
+ pkgPackageManager *CreatePM(pkgDepCache *Cache) const override;
+ bool Initialize(Configuration &Cnf) override;
+ bool ArchiveSupported(const char *Type) override;
+ signed Score(Configuration const &Cnf) override;
+ bool AddStatusFiles(std::vector<pkgIndexFile *> &List) override;
+ bool FindIndex(pkgCache::PkgFileIterator File,
+ pkgIndexFile *&Found) const override;
debSystem();
- virtual ~debSystem();
+ ~debSystem() override;
APT_HIDDEN static std::string GetDpkgExecutable();
APT_HIDDEN static std::vector<std::string> GetDpkgBaseCommand();
diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 5c328a985..6d82e5889 100644
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -23,15 +23,15 @@ class APT_PUBLIC debVersioningSystem : public pkgVersioningSystem
const char *BEnd) APT_PURE;
// Compare versions..
- virtual int DoCmpVersion(const char *A,const char *Aend,
- const char *B,const char *Bend) APT_OVERRIDE APT_PURE;
- virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) APT_OVERRIDE APT_PURE;
- virtual APT_PURE int DoCmpReleaseVer(const char *A,const char *Aend,
- const char *B,const char *Bend) APT_OVERRIDE
+ int DoCmpVersion(const char *A, const char *Aend,
+ const char *B, const char *Bend) override APT_PURE;
+ bool CheckDep(const char *PkgVer, int Op, const char *DepVer) override APT_PURE;
+ int DoCmpReleaseVer(const char *A, const char *Aend,
+ const char *B, const char *Bend) override APT_PURE
{
return DoCmpVersion(A,Aend,B,Bend);
}
- virtual std::string UpstreamVersion(const char *A) APT_OVERRIDE;
+ std::string UpstreamVersion(const char *A) override;
debVersioningSystem();
};
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ed0b67b31..5ce9dc110 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -113,18 +113,18 @@ class APT_PUBLIC pkgDPkgPM : public pkgPackageManager
void ProcessDpkgStatusLine(char *line);
// The Actual installation implementation
- virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
- virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
- virtual bool Remove(PkgIterator Pkg,bool Purge = false) APT_OVERRIDE;
+ bool Install(PkgIterator Pkg,std::string File) override;
+ bool Configure(PkgIterator Pkg) override;
+ bool Remove(PkgIterator Pkg, bool Purge = false) override;
- virtual bool Go(APT::Progress::PackageManager *progress) APT_OVERRIDE;
+ bool Go(APT::Progress::PackageManager *progress) override;
+
+ void Reset() override;
- virtual void Reset() APT_OVERRIDE;
-
public:
explicit pkgDPkgPM(pkgDepCache *Cache);
- virtual ~pkgDPkgPM();
+ ~pkgDPkgPM() override;
APT_HIDDEN static bool ExpandPendingCalls(std::vector<Item> &List, pkgDepCache &Cache);
};
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-07-18 19:55:22 +0000