summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-26 13:51:15 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:20 +0100
commit0dfacb3d014db4c9f337ce2be1a6997dbdc5bde1 (patch)
treeb0b49d1dfa50ec5bdf92e793fbba33e6d97201e6 /apt-pkg
parent038afa0845d89512f811f38cc2a6b7314a0d3a41 (diff)
acquire-item: Remove deprecated members and functions
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc21
-rw-r--r--apt-pkg/acquire-item.h32
2 files changed, 3 insertions, 50 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index bb3bc1b56..cbfc91007 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -770,15 +770,13 @@ class APT_HIDDEN CleanupItem : public pkgAcqTransactionItem /*{{{*/
/*}}}*/
// Acquire::Item::Item - Constructor /*{{{*/
-APT_IGNORE_DEPRECATED_PUSH
pkgAcquire::Item::Item(pkgAcquire * const owner) :
- FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false), Local(false),
+ FileSize(0), PartialSize(0), ID(0), Complete(false), Local(false),
QueueCounter(0), ExpectedAdditionalItems(0), Owner(owner), d(new Private())
{
Owner->Add(this);
Status = StatIdle;
}
-APT_IGNORE_DEPRECATED_POP
/*}}}*/
// Acquire::Item::~Item - Destructor /*{{{*/
pkgAcquire::Item::~Item()
@@ -1120,15 +1118,6 @@ bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const
void pkgAcquire::Item::SetActiveSubprocess(const std::string &subprocess)/*{{{*/
{
ActiveSubprocess = subprocess;
- APT_IGNORE_DEPRECATED_PUSH
- Mode = ActiveSubprocess.c_str();
- APT_IGNORE_DEPRECATED_POP
-}
- /*}}}*/
-// Acquire::Item::ReportMirrorFailure /*{{{*/
-void pkgAcquire::Item::ReportMirrorFailure(std::string const &FailCode)
-{
- ReportMirrorFailureToCentral(*this, FailCode, FailCode);
}
/*}}}*/
std::string pkgAcquire::Item::HashSum() const /*{{{*/
@@ -3346,11 +3335,10 @@ pkgAcqIndex::~pkgAcqIndex() {}
// ---------------------------------------------------------------------
/* This just sets up the initial fetch environment and queues the first
possibilitiy */
-APT_IGNORE_DEPRECATED_PUSH
pkgAcqArchive::pkgAcqArchive(pkgAcquire *const Owner, pkgSourceList *const Sources,
pkgRecords *const Recs, pkgCache::VerIterator const &Version,
string &StoreFilename) : Item(Owner), d(NULL), LocalSource(false), Version(Version), Sources(Sources), Recs(Recs),
- StoreFilename(StoreFilename), Vf(),
+ StoreFilename(StoreFilename),
Trusted(false)
{
if (Version.Arch() == 0)
@@ -3539,7 +3527,6 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *const Owner, pkgSourceList *const Sourc
Local = false;
QueueURI(Desc);
}
-APT_IGNORE_DEPRECATED_POP
/*}}}*/
bool pkgAcqArchive::QueueNext() /*{{{*/
{
@@ -3865,11 +3852,10 @@ pkgAcqChangelog::~pkgAcqChangelog() /*{{{*/
/*}}}*/
// AcqFile::pkgAcqFile - Constructor /*{{{*/
-APT_IGNORE_DEPRECATED_PUSH
pkgAcqFile::pkgAcqFile(pkgAcquire *const Owner, string const &URI, HashStringList const &Hashes,
unsigned long long const Size, string const &Dsc, string const &ShortDesc,
const string &DestDir, const string &DestFilename,
- bool const IsIndexFile) : Item(Owner), d(NULL), Retries(0), IsIndexFile(IsIndexFile), ExpectedHashes(Hashes)
+ bool const IsIndexFile) : Item(Owner), d(NULL), IsIndexFile(IsIndexFile), ExpectedHashes(Hashes)
{
if(!DestFilename.empty())
DestFile = DestFilename;
@@ -3900,7 +3886,6 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *const Owner, string const &URI, HashStringLis
QueueURI(Desc);
}
-APT_IGNORE_DEPRECATED_POP
/*}}}*/
// AcqFile::Done - Item downloaded OK /*{{{*/
void pkgAcqFile::Done(string const &Message,HashStringList const &CalcHashes,
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 70651d9e3..a45e9f7a4 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -102,11 +102,6 @@ class pkgAcquire::Item : public WeakPointable /*{{{*/
/** \brief How much of the object was already fetched. */
unsigned long long PartialSize;
- /** \brief If not \b NULL, contains the name of a subprocess that
- * is operating on this object (for instance, "gzip" or "gpgv").
- */
- APT_DEPRECATED_MSG("Use the std::string member ActiveSubprocess instead") const char *Mode;
-
/** \brief contains the name of the subprocess that is operating on this object
* (for instance, "gzip", "rred" or "gpgv"). This is obsoleting #Mode from above
* as it can manage the lifetime of included string properly. */
@@ -284,15 +279,6 @@ class pkgAcquire::Item : public WeakPointable /*{{{*/
/** \return \b true if this object is being fetched from a trusted source. */
virtual bool IsTrusted() const;
- /** \brief Report mirror problem
- *
- * This allows reporting mirror failures back to a centralized
- * server. The apt-report-mirror-failure script is called for this
- *
- * \param FailCode A short failure string that is send
- */
- APT_DEPRECATED_MSG("Item::Failed does this for you") void ReportMirrorFailure(std::string const &FailCode);
-
/** \brief Set the name of the current active subprocess
*
* See also #ActiveSubprocess
@@ -983,18 +969,6 @@ class pkgAcqArchive : public pkgAcquire::Item
*/
std::string &StoreFilename;
- /** \brief The next file for this version to try to download. */
- APT_DEPRECATED_MSG("Unused member")
- pkgCache::VerFileIterator Vf;
-
- /** \brief How many (more) times to try to find a new source from
- * which to download this package version if it fails.
- *
- * Set from Acquire::Retries.
- */
- APT_DEPRECATED_MSG("Unused member. See pkgAcqItem::Retries.")
- unsigned int Retries;
-
/** \brief \b true if this version file is being downloaded from a
* trusted source.
*/
@@ -1167,12 +1141,6 @@ class pkgAcqFile : public pkgAcquire::Item
{
void * const d;
- /** \brief How many times to retry the download, set from
- * Acquire::Retries.
- */
- APT_DEPRECATED_MSG("Unused member. See pkgAcqItem::Retries.")
- unsigned int Retries;
-
/** \brief Should this file be considered a index file */
bool IsIndexFile;