merged lp:~donkult/apt/experimental

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

diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index eaeecb173b36b005883e99ae11fd427f2db4f222..733d23a320ac239e12d242ee8dd69c5b1e144df8 100644 (file)
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -15,26 +15,23 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <apt-pkg/vendor.h>
-#include <apt-pkg/configuration.h>

 #include <apt-pkg/macros.h>
 
 #include <apt-pkg/macros.h>
 

-using std::string;
-using std::vector;
-
+class Vendor;
+class Configuration;

 
 class __deprecated pkgVendorList
 {
    protected:
 
 class __deprecated pkgVendorList
 {
    protected:

-   vector<Vendor const *> VendorList;
+   std::vector<Vendor const *> VendorList;

 
    bool CreateList(Configuration& Cnf);
 
    bool CreateList(Configuration& Cnf);

-   const Vendor* LookupFingerprint(string Fingerprint);
+   const Vendor* LookupFingerprint(std::string Fingerprint);

 
    public:
 
    public:

-   typedef vector<Vendor const *>::const_iterator const_iterator;
+   typedef std::vector<Vendor const *>::const_iterator const_iterator;

    bool ReadMainList();
    bool ReadMainList();

-   bool Read(string File);
+   bool Read(std::string File);

 
    // List accessors
    inline const_iterator begin() const {return VendorList.begin();};
 
    // List accessors
    inline const_iterator begin() const {return VendorList.begin();};


@@ -42,7 +39,7 @@ class __deprecated pkgVendorList
    inline unsigned int size() const {return VendorList.size();};
    inline bool empty() const {return VendorList.empty();};
 
    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();
 };
 
    ~pkgVendorList();
 };