Drop the Arch information from the Version structure as we can get

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

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 39e770fa3a4e64091d106287981e1e2f1699cdb9..7dd004f7e6fa2a3e305fae960968ea4877573600 100644 (file)
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: progress.h,v 1.1 1998/07/21 05:33:21 jgg Exp $
+// $Id: progress.h,v 1.6 2001/05/07 05:06:52 jgg Exp $

 /* ######################################################################
    
    OpProgress - Operation Progress
 /* ######################################################################
    
    OpProgress - Operation Progress


@@ -18,17 +18,16 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #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>
 

+using std::string;
+
+class Configuration;

 class OpProgress
 {
    unsigned long Current;
 class OpProgress
 {
    unsigned long Current;


@@ -40,6 +39,7 @@ class OpProgress
    // Change reduction code
    struct timeval LastTime;
    string LastOp;
    // Change reduction code
    struct timeval LastTime;
    string LastOp;

+   string LastSubOp;

    
    protected:
    
    
    protected:
    


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

-   void SubProgress(unsigned long SubTotal,string Op);
+   void SubProgress(unsigned long SubTotal);
+   void SubProgress(unsigned long SubTotal,const string &Op);

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

-                       unsigned long Size,string Op);
-
+                       unsigned long Size,const string &Op);
+   virtual void Done() {};
+   

    OpProgress();
    virtual ~OpProgress() {};
 };
    OpProgress();
    virtual ~OpProgress() {};
 };


@@ -69,15 +71,18 @@ class OpTextProgress : public OpProgress
    
    string OldOp;
    bool NoUpdate;
    
    string OldOp;
    bool NoUpdate;

+   bool NoDisplay;

    unsigned long LastLen;
    virtual void Update();
    void Write(const char *S);
    
    public:
 
    unsigned long LastLen;
    virtual void Update();
    void Write(const char *S);
    
    public:
 

-   void Done();
+   virtual void Done();

    
    

-   OpTextProgress(bool NoUpdate = false) : NoUpdate(NoUpdate), LastLen(0) {};
+   OpTextProgress(bool NoUpdate = false) : NoUpdate(NoUpdate), 
+                NoDisplay(false), LastLen(0) {};
+   OpTextProgress(Configuration &Config);

    virtual ~OpTextProgress() {Done();};
 };
 
    virtual ~OpTextProgress() {Done();};
 };