summaryrefslogtreecommitdiff
path: root/apt-pkg/vendorlist.h
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2012-04-16 19:24:07 +0200
committerMichael Vogt <egon@debian-devbox>2012-04-16 19:24:07 +0200
commit443f5e8a3205162ec6933529c5ca0c95ad3f6941 (patch)
tree3e2da22dcecc8eeaabc1ac5ceac0407a8e3cc25f /apt-pkg/vendorlist.h
parent96273866174c54bdb25813633891f29668d43848 (diff)
parentf352743312edeebf666e1c8304cdc4baf457469f (diff)
merge from the expermental2 branch
Diffstat (limited to 'apt-pkg/vendorlist.h')
-rw-r--r--apt-pkg/vendorlist.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index eaeecb173..a86ccde7c 100644
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -15,26 +15,30 @@
#include <string>
#include <vector>
-#include <apt-pkg/vendor.h>
-#include <apt-pkg/configuration.h>
#include <apt-pkg/macros.h>
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/vendor.h>
+#include <apt-pkg/configuration.h>
using std::string;
using std::vector;
+#endif
+class Vendor;
+class Configuration;
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();};
@@ -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<string> GPGVOutput);
+ const Vendor* FindVendor(const std::vector<std::string> GPGVOutput);
~pkgVendorList();
};