Просмотр исходного кода

Make QItem a subclass of DescItem

CurrentItem previously was a DescItem, so let's make QItem a
DescItem to not break things.
Julian Andres Klode лет назад: 11
Родитель
Сommit
a0a4d1433a
1 измененных файлов с 1 добавлено и 9 удалено
  1. 1 9
      apt-pkg/acquire.h

+ 1 - 9
apt-pkg/acquire.h

@@ -419,23 +419,15 @@ class pkgAcquire::Queue
    protected:
    protected:
 
 
    /** \brief A single item placed in this queue. */
    /** \brief A single item placed in this queue. */
-   struct QItem : public WeakPointable
+   struct QItem : public ItemDesc
    {
    {
       /** \brief The next item in the queue. */
       /** \brief The next item in the queue. */
       QItem *Next;
       QItem *Next;
       /** \brief The worker associated with this item, if any. */
       /** \brief The worker associated with this item, if any. */
       pkgAcquire::Worker *Worker;
       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 */
       /** \brief The underlying items interested in the download */
       std::vector<Item*> Owners;
       std::vector<Item*> Owners;
-      // both, backward compatibility and easy access as syncing is interal
-      Item * Owner;
 
 
       typedef std::vector<Item*>::const_iterator owner_iterator;
       typedef std::vector<Item*>::const_iterator owner_iterator;