* merged from dpkg-log

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

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index d0b1f5f942732e4fa407903d3ae6e3beac7a6a82..7dd004f7e6fa2a3e305fae960968ea4877573600 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>


@@ -59,9 +56,9 @@ class OpProgress
    
    void Progress(unsigned long Current);
    void SubProgress(unsigned long SubTotal);
    
    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,
    void OverallProgress(unsigned long Current,unsigned long Total,

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

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