* apt-pkg/deb/dpkgpm.cc:

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

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 48ac12cee286982e2a627babf73e64cb5b34739c..fb33ff17d97f20f85a3cfcc9128cc7e7c98f7a8b 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,17 +1,31 @@
+#include<config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+
+#include <stddef.h>
+#include <iostream>
+#include <string>
+#include <vector>
+
 #include <apti18n.h>
 
 #if __GNUC__ >= 4
+       #pragma GCC diagnostic push
        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
+#include <apt-pkg/vendor.h>
 #include <apt-pkg/vendorlist.h>
 
+using std::string;
+using std::vector;
+
 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
-        I != VendorList.end(); I++)
+        I != VendorList.end(); ++I)
       delete *I;
 }
 
@@ -49,7 +63,7 @@ bool pkgVendorList::Read(string File)                                 /*{{{*/
 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());
 
@@ -59,7 +73,7 @@ bool pkgVendorList::CreateList(Configuration& Cnf)                    /*{{{*/
       Configuration Block(Top);
       string VendorID = Top->Tag;
       vector <struct Vendor::Fingerprint *> *Fingerprints = new vector<Vendor::Fingerprint *>;
-      struct Vendor::Fingerprint *Fingerprint = new struct Vendor::Fingerprint;
+      struct Vendor::Fingerprint *Fingerprint = new struct Vendor::Fingerprint();
       string Origin = Block.Find("Origin");
 
       Fingerprint->Print = Block.Find("Fingerprint");
@@ -129,7 +143,7 @@ const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)  /*{{{*/
                                                                        /*}}}*/
 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))
@@ -150,5 +164,5 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)       /*
                                                                        /*}}}*/
 
 #if __GNUC__ >= 4
-       #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+       #pragma GCC diagnostic pop
 #endif