Support large files in the complete toolset. Indexes of this

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

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 20caf4cdf6321c951ee57fb20c9f281c4f4e9acb..5344323f6379e3953d3eebf682c03c34bad960fe 100644 (file)
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -21,9 +21,6 @@
 #ifndef PKGLIB_PROGRESS_H
 #define PKGLIB_PROGRESS_H
 
 #ifndef PKGLIB_PROGRESS_H
 #define PKGLIB_PROGRESS_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/progress.h"
-#endif 

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


@@ -33,10 +30,10 @@ using std::string;
 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
    float LastPercent;
    
    // Change reduction code


@@ -57,11 +54,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 string &Op = "", float const Percent = -1);
+   void OverallProgress(unsigned long long Current,unsigned long long Total,
+                       unsigned long long Size,const string &Op);

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