Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index 7f96fc7665f7b71249b4ef987b0fd3e7965da4d7..bc3702a93852e8952e625420e3810dbb4a8118c5 100644 (file)
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -15,28 +15,30 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS

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

-

 using std::string;
 using std::vector;
 using std::string;
 using std::vector;

-
-#ifdef __GNUG__
-#pragma interface "apt-pkg/vendorlist.h"

 #endif
 
 #endif
 

-class pkgVendorList
+class Vendor;
+class Configuration;
+
+class APT_DEPRECATED pkgVendorList

 {
    protected:
 {
    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();};


@@ -44,7 +46,7 @@ class 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();
 };