From a0a4d1433a42d581697adacb1c3c095df4b23a56 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 11 Aug 2015 12:02:39 +0200 Subject: Make QItem a subclass of DescItem CurrentItem previously was a DescItem, so let's make QItem a DescItem to not break things. --- apt-pkg/acquire.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index aa581dfb8..0d2b21233 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -419,23 +419,15 @@ class pkgAcquire::Queue protected: /** \brief A single item placed in this queue. */ - struct QItem : public WeakPointable + struct QItem : public ItemDesc { /** \brief The next item in the queue. */ QItem *Next; /** \brief The worker associated with this item, if any. */ pkgAcquire::Worker *Worker; - /** \brief The URI from which to download this item. */ - std::string URI; - /** \brief A description of this item. */ - std::string Description; - /** \brief A shorter description of this item. */ - std::string ShortDesc; /** \brief The underlying items interested in the download */ std::vector Owners; - // both, backward compatibility and easy access as syncing is interal - Item * Owner; typedef std::vector::const_iterator owner_iterator; -- cgit v1.2.3