updating <date> tags and the po files for the manpages

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

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 9fe0e8a877b5175a2a2584f2cb1e26c50d6fe4d5..3d5d7a4b78a9aa522af324e04537f52289995213 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -72,13 +72,14 @@
 #include <vector>
 #include <string>
 
 #include <vector>
 #include <string>
 

-using std::vector;
-using std::string;
-
-

 #include <sys/time.h>
 #include <unistd.h>
 
 #include <sys/time.h>
 #include <unistd.h>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::vector;
+using std::string;
+#endif
+

 class pkgAcquireStatus;
 
 /** \brief The core download scheduler.                                        {{{
 class pkgAcquireStatus;
 
 /** \brief The core download scheduler.                                        {{{


@@ -91,6 +92,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;


@@ -101,8 +108,8 @@ class pkgAcquire
    friend class Item;
    friend class Queue;
 
    friend class Item;
    friend class Queue;
 

-   typedef vector<Item *>::iterator ItemIterator;
-   typedef vector<Item *>::const_iterator ItemCIterator;
+   typedef std::vector<Item *>::iterator ItemIterator;
+   typedef std::vector<Item *>::const_iterator ItemCIterator;

 
    protected:
    
 
    protected:
    


@@ -111,7 +118,7 @@ class pkgAcquire
     *  This is built monotonically as items are created and only
     *  emptied when the download shuts down.
     */
     *  This is built monotonically as items are created and only
     *  emptied when the download shuts down.
     */

-   vector<Item *> Items;
+   std::vector<Item *> Items;

    
    /** \brief The head of the list of active queues.
     *
    
    /** \brief The head of the list of active queues.
     *


@@ -142,12 +149,7 @@ class pkgAcquire
    /** \brief The progress indicator for this download. */
    pkgAcquireStatus *Log;
 
    /** \brief The progress indicator for this download. */
    pkgAcquireStatus *Log;
 

-   /** \brief The total size of the files which are to be fetched.
-    *
-    *  This is not necessarily the total number of bytes to download
-    *  when, e.g., download resumption and list updates via patches
-    *  are taken into account.
-    */
+   /** \brief The number of files which are to be fetched. */

    unsigned long ToFetch;
 
    // Configurable parameters for the scheduler
    unsigned long ToFetch;
 
    // Configurable parameters for the scheduler


@@ -201,7 +203,7 @@ class pkgAcquire
     *  \return the string-name of the queue in which a fetch request
     *  for the given URI should be placed.
     */
     *  \return the string-name of the queue in which a fetch request
     *  for the given URI should be placed.
     */

-   string QueueName(string URI,MethodConfig const *&Config);
+   std::string QueueName(std::string URI,MethodConfig const *&Config);

 
    /** \brief Build up the set of file descriptors upon which select() should
     *  block.
 
    /** \brief Build up the set of file descriptors upon which select() should
     *  block.


@@ -247,7 +249,7 @@ class pkgAcquire
     *
     *  \return the method whose name is Access, or \b NULL if no such method exists.
     */
     *
     *  \return the method whose name is Access, or \b NULL if no such method exists.
     */

-   MethodConfig *GetConfig(string Access);
+   MethodConfig *GetConfig(std::string Access);

 
    /** \brief Provides information on how a download terminated. */
    enum RunResult {
 
    /** \brief Provides information on how a download terminated. */
    enum RunResult {


@@ -318,7 +320,7 @@ class pkgAcquire
     *
     *  \return \b true if the directory exists and is readable.
     */
     *
     *  \return \b true if the directory exists and is readable.
     */

-   bool Clean(string Dir);
+   bool Clean(std::string Dir);

 
    /** \return the total size in bytes of all the items included in
     *  this download.
 
    /** \return the total size in bytes of all the items included in
     *  this download.


@@ -346,7 +348,7 @@ class pkgAcquire
     *  only one Acquire class is in action at the time or an empty string
     *  if no lock file should be used.
     */
     *  only one Acquire class is in action at the time or an empty string
     *  if no lock file should be used.
     */

-   bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
+   bool Setup(pkgAcquireStatus *Progress = NULL, std::string const &Lock = "");

 
    void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
 
 
    void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
 


@@ -361,9 +363,6 @@ class pkgAcquire
     */
    virtual ~pkgAcquire();
 
     */
    virtual ~pkgAcquire();
 

-   private:
-   /** \brief FD of the Lock file we acquire in Setup (if any) */
-   int LockFD;

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


@@ -374,11 +373,11 @@ class pkgAcquire
 struct pkgAcquire::ItemDesc : public WeakPointable
 {
    /** \brief The URI from which to download this item. */
 struct pkgAcquire::ItemDesc : public WeakPointable
 {
    /** \brief The URI from which to download this item. */

-   string URI;
+   std::string URI;

    /** brief A description of this item. */
    /** brief A description of this item. */

-   string Description;
+   std::string Description;

    /** brief A shorter description of this item. */
    /** brief A shorter description of this item. */

-   string ShortDesc;
+   std::string ShortDesc;

    /** brief The underlying item which is to be downloaded. */
    Item *Owner;
 };
    /** brief The underlying item which is to be downloaded. */
    Item *Owner;
 };


@@ -393,6 +392,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;
    


@@ -419,7 +421,7 @@ class pkgAcquire::Queue
    };
    
    /** \brief The name of this queue. */
    };
    
    /** \brief The name of this queue. */

-   string Name;
+   std::string Name;

 
    /** \brief The head of the list of items contained in this queue.
     *
 
    /** \brief The head of the list of items contained in this queue.
     *


@@ -474,13 +476,13 @@ class pkgAcquire::Queue
     *  \return the first item in the queue whose URI is #URI and that
     *  is being downloaded by #Owner.
     */
     *  \return the first item in the queue whose URI is #URI and that
     *  is being downloaded by #Owner.
     */

-   QItem *FindItem(string URI,pkgAcquire::Worker *Owner);
+   QItem *FindItem(std::string URI,pkgAcquire::Worker *Owner);

 
    /** Presumably this should start downloading an item?
     *
     *  \todo Unimplemented.  Implement it or remove?
     */
 
    /** Presumably this should start downloading an item?
     *
     *  \todo Unimplemented.  Implement it or remove?
     */

-   bool ItemStart(QItem *Itm,unsigned long Size);
+   bool ItemStart(QItem *Itm,unsigned long long Size);

 
    /** \brief Remove the given item from this queue and set its state
     *  to pkgAcquire::Item::StatDone.
 
    /** \brief Remove the given item from this queue and set its state
     *  to pkgAcquire::Item::StatDone.


@@ -537,17 +539,20 @@ class pkgAcquire::Queue
     *  \param Name The name of the new queue.
     *  \param Owner The download process that owns the new queue.
     */
     *  \param Name The name of the new queue.
     *  \param Owner The download process that owns the new queue.
     */

-   Queue(string Name,pkgAcquire *Owner);
+   Queue(std::string Name,pkgAcquire *Owner);

 
    /** 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. */


@@ -583,11 +588,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?


@@ -595,10 +604,10 @@ struct pkgAcquire::MethodConfig
    MethodConfig *Next;
    
    /** \brief The name of this acquire method (e.g., http). */
    MethodConfig *Next;
    
    /** \brief The name of this acquire method (e.g., http). */

-   string Access;
+   std::string Access;

 
    /** \brief The implementation version of this acquire method. */
 
    /** \brief The implementation version of this acquire method. */

-   string Version;
+   std::string Version;

 
    /** \brief If \b true, only one download queue should be created for this
     *  method.
 
    /** \brief If \b true, only one download queue should be created for this
     *  method.


@@ -636,16 +645,20 @@ struct pkgAcquire::MethodConfig
     *  appropriate.
     */
    MethodConfig();
     *  appropriate.
     */
    MethodConfig();

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

 };
                                                                        /*}}}*/
 /** \brief A monitor object for downloads controlled by the pkgAcquire class.  {{{
  *
  *  \todo Why protected members?
 };
                                                                        /*}}}*/
 /** \brief A monitor object for downloads controlled by the pkgAcquire class.  {{{
  *
  *  \todo Why protected members?

- *
- *  \todo Should the double members be uint64_t?

  */
 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. */


@@ -657,34 +670,34 @@ class pkgAcquireStatus
    /** \brief The number of bytes fetched as of the previous call to
     *  pkgAcquireStatus::Pulse, including local items.
     */
    /** \brief The number of bytes fetched as of the previous call to
     *  pkgAcquireStatus::Pulse, including local items.
     */

-   double LastBytes;
+   unsigned long long LastBytes;

 
    /** \brief The current rate of download as of the most recent call
     *  to pkgAcquireStatus::Pulse, in bytes per second.
     */
 
    /** \brief The current rate of download as of the most recent call
     *  to pkgAcquireStatus::Pulse, in bytes per second.
     */

-   double CurrentCPS;
+   unsigned long long CurrentCPS;

 
    /** \brief The number of bytes fetched as of the most recent call
     *  to pkgAcquireStatus::Pulse, including local items.
     */
 
    /** \brief The number of bytes fetched as of the most recent call
     *  to pkgAcquireStatus::Pulse, including local items.
     */

-   double CurrentBytes;
+   unsigned long long CurrentBytes;

 
    /** \brief The total number of bytes that need to be fetched.
     *
     *  \warning This member is inaccurate, as new items might be
     *  enqueued while the download is in progress!
     */
 
    /** \brief The total number of bytes that need to be fetched.
     *
     *  \warning This member is inaccurate, as new items might be
     *  enqueued while the download is in progress!
     */

-   double TotalBytes;
+   unsigned long long TotalBytes;

 
    /** \brief The total number of bytes accounted for by items that
     *  were successfully fetched.
     */
 
    /** \brief The total number of bytes accounted for by items that
     *  were successfully fetched.
     */

-   double FetchedBytes;
+   unsigned long long FetchedBytes;

 
    /** \brief The amount of time that has elapsed since the download
     *   started.
     */
 
    /** \brief The amount of time that has elapsed since the download
     *   started.
     */

-   unsigned long ElapsedTime;
+   unsigned long long ElapsedTime;

 
    /** \brief The total number of items that need to be fetched.
     *
 
    /** \brief The total number of items that need to be fetched.
     *


@@ -717,7 +730,7 @@ class pkgAcquireStatus
     *
     *  \param ResumePoint How much of the file was already fetched.
     */
     *
     *  \param ResumePoint How much of the file was already fetched.
     */

-   virtual void Fetched(unsigned long Size,unsigned long ResumePoint);
+   virtual void Fetched(unsigned long long Size,unsigned long long ResumePoint);

    
    /** \brief Invoked when the user should be prompted to change the
     *         inserted removable media.
    
    /** \brief Invoked when the user should be prompted to change the
     *         inserted removable media.


@@ -736,7 +749,7 @@ class pkgAcquireStatus
     *  \todo This is a horrible blocking monster; it should be CPSed
     *  with prejudice.
     */
     *  \todo This is a horrible blocking monster; it should be CPSed
     *  with prejudice.
     */

-   virtual bool MediaChange(string Media,string Drive) = 0;
+   virtual bool MediaChange(std::string Media,std::string Drive) = 0;

    
    /** \brief Invoked when an item is confirmed to be up-to-date.
 
    
    /** \brief Invoked when an item is confirmed to be up-to-date.