X-Git-Url: http://git.hcoop.net/ntk/apt.git/blobdiff_plain/82b6682ac686fa07b02622aa4746b67eccb77e61..d2cca6ec46865a1f5167f846e67150dc19ca2022:/apt-pkg/vendorlist.h diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h index eaeecb17..a86ccde7 100644 --- a/apt-pkg/vendorlist.h +++ b/apt-pkg/vendorlist.h @@ -15,26 +15,30 @@ #include #include -#include -#include #include +#ifndef APT_8_CLEANER_HEADERS +#include +#include using std::string; using std::vector; +#endif +class Vendor; +class Configuration; class __deprecated pkgVendorList { protected: - vector VendorList; + std::vector VendorList; bool CreateList(Configuration& Cnf); - const Vendor* LookupFingerprint(string Fingerprint); + const Vendor* LookupFingerprint(std::string Fingerprint); public: - typedef vector::const_iterator const_iterator; + typedef std::vector::const_iterator const_iterator; bool ReadMainList(); - bool Read(string File); + bool Read(std::string File); // List accessors inline const_iterator begin() const {return VendorList.begin();}; @@ -42,7 +46,7 @@ class __deprecated pkgVendorList inline unsigned int size() const {return VendorList.size();}; inline bool empty() const {return VendorList.empty();}; - const Vendor* FindVendor(const vector GPGVOutput); + const Vendor* FindVendor(const std::vector GPGVOutput); ~pkgVendorList(); };