diff options
Diffstat (limited to 'apt-pkg/indexfile.h')
| -rw-r--r-- | apt-pkg/indexfile.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 2b5ae6342..1d34dc773 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -27,12 +27,16 @@ #include <apt-pkg/pkgcache.h> #include <apt-pkg/srcrecords.h> #include <apt-pkg/pkgrecords.h> - +#include <apt-pkg/macros.h> + +#ifndef APT_8_CLEANER_HEADERS using std::string; +#endif class pkgAcquire; class pkgCacheGenerator; class OpProgress; + class pkgIndexFile { protected: @@ -59,13 +63,13 @@ class pkgIndexFile virtual const Type *GetType() const = 0; // Return descriptive strings of various sorts - virtual string ArchiveInfo(pkgCache::VerIterator Ver) const; - virtual string SourceInfo(pkgSrcRecords::Parser const &Record, + virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const; + virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record, pkgSrcRecords::File const &File) const; - virtual string Describe(bool Short = false) const = 0; + virtual std::string Describe(bool Short = false) const = 0; // Interface for acquire - virtual string ArchiveURI(string /*File*/) const {return string();}; + virtual std::string ArchiveURI(std::string /*File*/) const {return std::string();}; // Interface for the record parsers virtual pkgSrcRecords::Parser *CreateSrcParser() const {return 0;}; @@ -84,7 +88,7 @@ class pkgIndexFile static bool TranslationsAvailable(); static bool CheckLanguageCode(const char *Lang); - static string LanguageCode(); + static std::string LanguageCode(); bool IsTrusted() const { return Trusted; }; |