Merge branch 'feature/abspath' into feature/apt-install-deb

[apt.git] / apt-pkg / contrib / progress.h

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 5344323f6379e3953d3eebf682c03c34bad960fe..f7fbc9ccf8470ee37b6e33410f80b115d0b6702c 100644 (file)
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -7,7 +7,7 @@
    
    This class allows lengthy operations to communicate their progress 
    to the GUI. The progress model is simple and is not designed to handle
    
    This class allows lengthy operations to communicate their progress 
    to the GUI. The progress model is simple and is not designed to handle

-   the complex case of the multi-activity aquire class.
+   the complex case of the multi-activity acquire class.

    
    The model is based on the concept of an overall operation consisting
    of a series of small sub operations. Each sub operation has it's own
    
    The model is based on the concept of an overall operation consisting
    of a series of small sub operations. Each sub operation has it's own


@@ -25,7 +25,9 @@
 #include <string>
 #include <sys/time.h>
 
 #include <string>
 #include <sys/time.h>
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::string;

+#endif

 
 class Configuration;
 class OpProgress
 
 class Configuration;
 class OpProgress


@@ -38,13 +40,13 @@ class OpProgress
    
    // Change reduction code
    struct timeval LastTime;
    
    // Change reduction code
    struct timeval LastTime;

-   string LastOp;
-   string LastSubOp;
+   std::string LastOp;
+   std::string LastSubOp;

    
    protected:
    
    
    protected:
    

-   string Op;
-   string SubOp;
+   std::string Op;
+   std::string SubOp;

    float Percent;
    
    bool MajorChange;
    float Percent;
    
    bool MajorChange;


@@ -55,9 +57,9 @@ class OpProgress
    public:
    
    void Progress(unsigned long long Current);
    public:
    
    void Progress(unsigned long long Current);

-   void SubProgress(unsigned long long SubTotal, const string &Op = "", float const Percent = -1);
+   void SubProgress(unsigned long long SubTotal, const std::string &Op = "", float const Percent = -1);

    void OverallProgress(unsigned long long Current,unsigned long long Total,
    void OverallProgress(unsigned long long Current,unsigned long long Total,

-                       unsigned long long Size,const string &Op);
+                       unsigned long long Size,const std::string &Op);

    virtual void Done() {};
    
    OpProgress();
    virtual void Done() {};
    
    OpProgress();


@@ -67,8 +69,8 @@ class OpProgress
 class OpTextProgress : public OpProgress
 {
    protected:
 class OpTextProgress : public OpProgress
 {
    protected:

-   
-   string OldOp;
+
+   std::string OldOp;

    bool NoUpdate;
    bool NoDisplay;
    unsigned long LastLen;
    bool NoUpdate;
    bool NoDisplay;
    unsigned long LastLen;