merged lp:~donkult/apt/experimental

[apt.git] / apt-pkg / vendorlist.h

diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index ff2f4ed5d508e341e32f346d2f21825b2b9d7f21..733d23a320ac239e12d242ee8dd69c5b1e144df8 100644 (file)
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -15,25 +15,23 @@
 
 #include <string>
 #include <vector>
-#include <apt-pkg/vendor.h>
-#include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
 
-using std::string;
-using std::vector;
+class Vendor;
+class Configuration;
 
-
-class pkgVendorList
+class __deprecated pkgVendorList
 {
    protected:
-   vector<Vendor const *> VendorList;
+   std::vector<Vendor const *> VendorList;
 
    bool CreateList(Configuration& Cnf);
-   const Vendor* LookupFingerprint(string Fingerprint);
+   const Vendor* LookupFingerprint(std::string Fingerprint);
 
    public:
-   typedef vector<Vendor const *>::const_iterator const_iterator;
+   typedef std::vector<Vendor const *>::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();};
@@ -41,7 +39,7 @@ class pkgVendorList
    inline unsigned int size() const {return VendorList.size();};
    inline bool empty() const {return VendorList.empty();};
 
-   const Vendor* FindVendor(const vector<string> GPGVOutput);
+   const Vendor* FindVendor(const std::vector<std::string> GPGVOutput);
 
    ~pkgVendorList();
 };