HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apt-key del: Ignore case when checking if a keyid exists in a keyring.
[ntk/apt.git]
/
apt-pkg
/
vendorlist.h
diff --git
a/apt-pkg/vendorlist.h
b/apt-pkg/vendorlist.h
index
eaeecb1
..
bc3702a
100644
(file)
--- a/
apt-pkg/vendorlist.h
+++ b/
apt-pkg/vendorlist.h
@@
-15,26
+15,30
@@
#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>
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/vendor.h>
+#include <apt-pkg/configuration.h>
using std::string;
using std::vector;
using std::string;
using std::vector;
+#endif
+class Vendor;
+class Configuration;
-class
__deprecated
pkgVendorList
+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(st
d::st
ring 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(st
d::st
ring File);
// List accessors
inline const_iterator begin() const {return VendorList.begin();};
// 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();};
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();
};