fix testcase expecting incorrect remove log from dpkg

[apt.git] / apt-private / acqprogress.h

diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index e12dafe5025214334784ec62f53c1c1c1987b47c..6b6d555b17064ed13d39fcbbcb34f285a3c49ed6 100644 (file)
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -10,29 +10,35 @@
 #define ACQPROGRESS_H
 
 #include <apt-pkg/acquire.h>
 #define ACQPROGRESS_H
 
 #include <apt-pkg/acquire.h>

+#include <apt-pkg/macros.h>

 
 #include <string>
 
 #include <string>

+#include <iostream>

 
 

-class AcqTextStatus : public pkgAcquireStatus
+class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus

 {
 {

+   std::ostream &out;

    unsigned int &ScreenWidth;
    unsigned int &ScreenWidth;

-   char BlankLine[1024];
+   size_t LastLineLength;

    unsigned long ID;
    unsigned long Quiet;
    unsigned long ID;
    unsigned long Quiet;

-   
+
+   APT_HIDDEN void clearLastLine();
+   APT_HIDDEN void AssignItemID(pkgAcquire::ItemDesc &Itm);
+

    public:
    public:

-   
-   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);
-   virtual void Fail(pkgAcquire::ItemDesc &Itm);
-   virtual void Start();
-   virtual void Stop();
-   
-   bool Pulse(pkgAcquire *Owner);
-
-   AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet);
+
+   virtual bool MediaChange(std::string Media,std::string Drive) APT_OVERRIDE;
+   virtual void IMSHit(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
+   virtual void Fetch(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
+   virtual void Done(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
+   virtual void Fail(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
+   virtual void Start() APT_OVERRIDE;
+   virtual void Stop() APT_OVERRIDE;
+
+   bool Pulse(pkgAcquire *Owner) APT_OVERRIDE;
+
+   AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet);

 };
 
 #endif
 };
 
 #endif