merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 7dd004f7e6fa2a3e305fae960968ea4877573600..3a6943aee5731325a70b1913b3a29aabc0fab76a 100644 (file)
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -25,26 +25,28 @@
 #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
 {

-   unsigned long Current;
-   unsigned long Total;
-   unsigned long Size;
-   unsigned long SubTotal;
+   unsigned long long Current;
+   unsigned long long Total;
+   unsigned long long Size;
+   unsigned long long SubTotal;

    float LastPercent;
    
    // Change reduction code
    struct timeval LastTime;
    float LastPercent;
    
    // 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;


@@ -54,11 +56,10 @@ class OpProgress
    
    public:
    
    
    public:
    

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

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


@@ -68,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;