* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 094c4b016d2889883f27a15edd0cf688fc14501c..20caf4cdf6321c951ee57fb20c9f281c4f4e9acb 100644 (file)
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: progress.h,v 1.4 1998/10/02 04:39:54 jgg Exp $
+// $Id: progress.h,v 1.6 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
    
    OpProgress - Operation Progress
@@ -18,7 +18,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
-// Header section: pkglib
 #ifndef PKGLIB_PROGRESS_H
 #define PKGLIB_PROGRESS_H
 
@@ -29,6 +28,8 @@
 #include <string>
 #include <sys/time.h>
 
+using std::string;
+
 class Configuration;
 class OpProgress
 {
@@ -58,9 +59,9 @@ class OpProgress
    
    void Progress(unsigned long Current);
    void SubProgress(unsigned long SubTotal);
-   void SubProgress(unsigned long SubTotal,string Op);
+   void SubProgress(unsigned long SubTotal,const string &Op);
    void OverallProgress(unsigned long Current,unsigned long Total,
-                       unsigned long Size,string Op);
+                       unsigned long Size,const string &Op);
    virtual void Done() {};
    
    OpProgress();