merge lp:~mvo/apt/sha512-template to get fixes for the

[apt.git] / apt-pkg / acquire.h

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 82be8b84333a1eda013255263038c42d7d5ac69e..7db7a99586ddb714756afd3ec83298a598bc5a41 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -91,6 +91,12 @@ class pkgAcquireStatus;
  */
 class pkgAcquire
 {   
  */
 class pkgAcquire
 {   

+   private:
+   /** \brief FD of the Lock file we acquire in Setup (if any) */
+   int LockFD;
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    public:
    
    class Item;
    public:
    
    class Item;


@@ -359,17 +365,6 @@ class pkgAcquire
     */
    virtual ~pkgAcquire();
 
     */
    virtual ~pkgAcquire();
 

-   private:
-   /** \brief FD of the Lock file we acquire in Setup (if any) */
-   int LockFD;
-
-   /** \brief Ensure the existence of the given Path
-    *
-    *  \param Parent directory of the Path directory - a trailing
-    *  /apt/ will be removed before CreateDirectory call.
-    *  \param Path which should exist after (successful) call
-    */
-   bool CheckDirectory(string const &Parent, string const &Path) const;

 };
 
 /** \brief Represents a single download source from which an item
 };
 
 /** \brief Represents a single download source from which an item


@@ -399,6 +394,9 @@ class pkgAcquire::Queue
    friend class pkgAcquire::UriIterator;
    friend class pkgAcquire::Worker;
 
    friend class pkgAcquire::UriIterator;
    friend class pkgAcquire::Worker;
 

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    /** \brief The next queue in the pkgAcquire object's list of queues. */
    Queue *Next;
    
    /** \brief The next queue in the pkgAcquire object's list of queues. */
    Queue *Next;
    


@@ -548,12 +546,15 @@ class pkgAcquire::Queue
    /** Shut down all the worker processes associated with this queue
     *  and empty the queue.
     */
    /** Shut down all the worker processes associated with this queue
     *  and empty the queue.
     */

-   ~Queue();
+   virtual ~Queue();

 };
                                                                        /*}}}*/
 /** \brief Iterates over all the URIs being fetched by a pkgAcquire object.    {{{*/
 class pkgAcquire::UriIterator
 {
 };
                                                                        /*}}}*/
 /** \brief Iterates over all the URIs being fetched by a pkgAcquire object.    {{{*/
 class pkgAcquire::UriIterator
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    /** The next queue to iterate over. */
    pkgAcquire::Queue *CurQ;
    /** The item that we currently point at. */
    /** The next queue to iterate over. */
    pkgAcquire::Queue *CurQ;
    /** The item that we currently point at. */


@@ -589,11 +590,15 @@ class pkgAcquire::UriIterator
         CurQ = CurQ->Next;
       }
    }   
         CurQ = CurQ->Next;
       }
    }   

+   virtual ~UriIterator() {};

 };
                                                                        /*}}}*/
 /** \brief Information about the properties of a single acquire method.        {{{*/
 struct pkgAcquire::MethodConfig
 {
 };
                                                                        /*}}}*/
 /** \brief Information about the properties of a single acquire method.        {{{*/
 struct pkgAcquire::MethodConfig
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+   

    /** \brief The next link on the acquire method list.
     *
     *  \todo Why not an STL container?
    /** \brief The next link on the acquire method list.
     *
     *  \todo Why not an STL container?


@@ -642,6 +647,9 @@ struct pkgAcquire::MethodConfig
     *  appropriate.
     */
    MethodConfig();
     *  appropriate.
     */
    MethodConfig();

+
+   /* \brief Destructor, empty currently */
+   virtual ~MethodConfig() {};

 };
                                                                        /*}}}*/
 /** \brief A monitor object for downloads controlled by the pkgAcquire class.  {{{
 };
                                                                        /*}}}*/
 /** \brief A monitor object for downloads controlled by the pkgAcquire class.  {{{


@@ -652,6 +660,9 @@ struct pkgAcquire::MethodConfig
  */
 class pkgAcquireStatus
 {
  */
 class pkgAcquireStatus
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    protected:
    
    /** \brief The last time at which this monitor object was updated. */
    protected:
    
    /** \brief The last time at which this monitor object was updated. */