merged from david

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

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 48ac12cee286982e2a627babf73e64cb5b34739c..ecfc7db878aa46c291933714d0103a15e494574c 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,17 +1,24 @@
+#include<config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>

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

 #include <apti18n.h>
 
 #if __GNUC__ >= 4
        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 #include <apti18n.h>
 
 #if __GNUC__ >= 4
        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 

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

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

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

 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 

-        I != VendorList.end(); I++)
+        I != VendorList.end(); ++I)

       delete *I;
 }
 
       delete *I;
 }
 


@@ -49,7 +56,7 @@ bool pkgVendorList::Read(string File)                                 /*{{{*/
 bool pkgVendorList::CreateList(Configuration& Cnf)                     /*{{{*/
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
 bool pkgVendorList::CreateList(Configuration& Cnf)                     /*{{{*/
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 

-       I != VendorList.end(); I++)
+       I != VendorList.end(); ++I)

       delete *I;
    VendorList.erase(VendorList.begin(),VendorList.end());
 
       delete *I;
    VendorList.erase(VendorList.begin(),VendorList.end());
 


@@ -129,7 +136,7 @@ const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)  /*{{{*/
                                                                        /*}}}*/
 const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)  /*{{{*/
 {
                                                                        /*}}}*/
 const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)  /*{{{*/
 {

-   for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); I++)
+   for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); ++I)

    {
       string::size_type pos = (*I).find("VALIDSIG ");
       if (_config->FindB("Debug::Vendor", false))
    {
       string::size_type pos = (*I).find("VALIDSIG ");
       if (_config->FindB("Debug::Vendor", false))