diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-08-14 14:58:25 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-08-14 14:58:25 +0200 |
| commit | c1ad8a0fbc0adfebdb847f28da92b3d5a1f90582 (patch) | |
| tree | 80225148a1c1d0d4283fb76e827c6ccc9ca206bf /python/progress.h | |
| parent | c736d5c9290a2ffdb8802a4ac62e521cf1218b54 (diff) | |
| parent | dfd6bacface878eecf3fec4876bdae2f0491a646 (diff) | |
| download | python-apt-c1ad8a0fbc0adfebdb847f28da92b3d5a1f90582.tar.gz | |
merged from the debian-sid tree
Diffstat (limited to 'python/progress.h')
| -rw-r--r-- | python/progress.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/progress.h b/python/progress.h index 4e66c771..af8e3acc 100644 --- a/python/progress.h +++ b/python/progress.h @@ -72,7 +72,7 @@ struct PyFetchProgress : public pkgAcquireStatus, public PyCallbackObj void UpdateStatus(pkgAcquire::ItemDesc & Itm, int status); - virtual bool MediaChange(string Media, string Drive); + virtual bool MediaChange(std::string Media, std::string Drive); void setPyAcquire(PyObject *o) { Py_CLEAR(pyAcquire); @@ -107,11 +107,11 @@ struct PyInstallProgress : public PyCallbackObj struct PyCdromProgress : public pkgCdromStatus, public PyCallbackObj { // update steps, will be called regularly as a "pulse" - virtual void Update(string text="", int current=0); + virtual void Update(std::string text="", int current=0); // ask for cdrom insert virtual bool ChangeCdrom(); // ask for cdrom name - virtual bool AskCdromName(string &Name); + virtual bool AskCdromName(std::string &Name); PyCdromProgress() : PyCallbackObj() {}; }; |
