merge with my debian-sid branch

[apt.git] / cmdline / acqprogress.h

diff --git a/cmdline/acqprogress.h b/cmdline/acqprogress.h
index 8cee3cd29c9ede97ffc0b7d1220fbd6c9704c3ac..8f0903923a2440cfbecf1917045efd9672618a9b 100644 (file)
--- a/cmdline/acqprogress.h
+++ b/cmdline/acqprogress.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acqprogress.h,v 1.3 1998/12/04 21:16:53 jgg Exp $
+// $Id: acqprogress.h,v 1.5 2003/02/02 22:24:11 jgg Exp $
 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
@@ -12,16 +12,18 @@
 
 #include <apt-pkg/acquire.h>
 
+#include <string>
+
 class AcqTextStatus : public pkgAcquireStatus
 {
    unsigned int &ScreenWidth;
-   char BlankLine[300];
+   char BlankLine[1024];
    unsigned long ID;
    unsigned long Quiet;
    
    public:
    
-   virtual bool MediaChange(string Media,string Drive);
+   virtual bool MediaChange(std::string Media,std::string Drive);
    virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
    virtual void Fetch(pkgAcquire::ItemDesc &Itm);
    virtual void Done(pkgAcquire::ItemDesc &Itm);
@@ -29,7 +31,7 @@ class AcqTextStatus : public pkgAcquireStatus
    virtual void Start();
    virtual void Stop();
    
-   void Pulse(pkgAcquire *Owner);
+   bool Pulse(pkgAcquire *Owner);
 
    AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
 };