merged r1970 lp:~vorlon/apt/lp.968828

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

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 589997081135cb0a5520a7ecad2dd3ef607e3aad..ecfc7db878aa46c291933714d0103a15e494574c 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,12 +1,24 @@
-#include <apt-pkg/vendorlist.h>
+#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>
 
 #include <apti18n.h>
 

+#if __GNUC__ >= 4
+       #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(); 
 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 

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

       delete *I;
 }
 
       delete *I;
 }
 


@@ -21,11 +33,11 @@ bool pkgVendorList::ReadMainList()
    Configuration Cnf;
 
    string CnfFile = _config->FindDir("Dir::Etc::vendorparts");
    Configuration Cnf;
 
    string CnfFile = _config->FindDir("Dir::Etc::vendorparts");

-   if (FileExists(CnfFile) == true)
+   if (DirectoryExists(CnfFile) == true)

       if (ReadConfigDir(Cnf,CnfFile,true) == false)
         return false;
    CnfFile = _config->FindFile("Dir::Etc::vendorlist");
       if (ReadConfigDir(Cnf,CnfFile,true) == false)
         return false;
    CnfFile = _config->FindFile("Dir::Etc::vendorlist");

-   if (FileExists(CnfFile) == true)
+   if (RealFileExists(CnfFile) == true)

       if (ReadConfigFile(Cnf,CnfFile,true) == false)
         return false;
 
       if (ReadConfigFile(Cnf,CnfFile,true) == false)
         return false;
 


@@ -44,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());
 


@@ -124,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))


@@ -143,3 +155,7 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)       /*
    return NULL;
 }
                                                                        /*}}}*/
    return NULL;
 }
                                                                        /*}}}*/

+
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif