From: Julian Andres Klode <jak@debian.org>
Date: Tue, 11 Aug 2015 10:02:39 +0000 (+0200)
Subject: Make QItem a subclass of DescItem
X-Git-Tag: 1.1.exp9~68
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a0a4d1433a42d581697adacb1c3c095df4b23a56?ds=inline

Make QItem a subclass of DescItem

CurrentItem previously was a DescItem, so let's make QItem a
DescItem to not break things.
---

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<Item*> Owners;
-      // both, backward compatibility and easy access as syncing is interal
-      Item * Owner;
 
       typedef std::vector<Item*>::const_iterator owner_iterator;