diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
| commit | 21248c0f00ee71412dbadc6ebf84011cf974346d (patch) | |
| tree | 7dc1f5904399482d2128765b5b86d57a4ac5b3e1 /apt-private/acqprogress.h | |
| parent | e5f34ad3b043abf033c1626eb8449b75955d6760 (diff) | |
| parent | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (diff) | |
Merge branch 'debian/experimental' into feature/srv-records
Conflicts:
cmdline/apt-helper.cc
cmdline/makefile
Diffstat (limited to 'apt-private/acqprogress.h')
| -rw-r--r-- | apt-private/acqprogress.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h index 71a10d78a..7cf990c65 100644 --- a/apt-private/acqprogress.h +++ b/apt-private/acqprogress.h @@ -13,14 +13,18 @@ #include <apt-pkg/macros.h> #include <string> +#include <iostream> class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus { + std::ostream &out; unsigned int &ScreenWidth; - char BlankLine[1024]; + size_t LastLineLength; unsigned long ID; unsigned long Quiet; + void clearLastLine(); + public: virtual bool MediaChange(std::string Media,std::string Drive); @@ -33,7 +37,7 @@ class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus bool Pulse(pkgAcquire *Owner); - AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet); + AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet); }; #endif |