test framework: Unset http proxy variables in setupenvironment

[apt.git] / apt-pkg / indexcopy.h

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 4f4c471696f0c368ad31b67ae6fb1cd5b02b3388..dc3b985a285deb488d8d9d2ee9d644ed2ca7674d 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -10,8 +10,10 @@
 #define INDEXCOPY_H
 
 #include <vector>
+#ifndef APT_11_CLEAN_HEADERS
 #include <string>
 #include <stdio.h>
+#endif
 
 #include <apt-pkg/macros.h>
 
@@ -25,9 +27,9 @@ using std::vector;
 #endif
 
 class pkgTagSection;
-class indexRecords;
 class pkgCdromStatus;
 class FileFd;
+class metaIndex;
 
 class IndexCopy                                                                /*{{{*/
 {
@@ -62,10 +64,10 @@ class PackageCopy : public IndexCopy                                        /*{{{*/
    void * const d;
    protected:
 
-   virtual bool GetFile(std::string &Filename,unsigned long long &Size);
-   virtual bool RewriteEntry(FileFd &Target, std::string const &File);
-   virtual const char *GetFileName() {return "Packages";};
-   virtual const char *Type() {return "Package";};
+   virtual bool GetFile(std::string &Filename,unsigned long long &Size) APT_OVERRIDE;
+   virtual bool RewriteEntry(FileFd &Target, std::string const &File) APT_OVERRIDE;
+   virtual const char *GetFileName() APT_OVERRIDE {return "Packages";};
+   virtual const char *Type() APT_OVERRIDE {return "Package";};
 
    public:
    PackageCopy();
@@ -77,10 +79,10 @@ class SourceCopy : public IndexCopy                                 /*{{{*/
    void * const d;
    protected:
    
-   virtual bool GetFile(std::string &Filename,unsigned long long &Size);
-   virtual bool RewriteEntry(FileFd &Target, std::string const &File);
-   virtual const char *GetFileName() {return "Sources";};
-   virtual const char *Type() {return "Source";};
+   virtual bool GetFile(std::string &Filename,unsigned long long &Size) APT_OVERRIDE;
+   virtual bool RewriteEntry(FileFd &Target, std::string const &File) APT_OVERRIDE;
+   virtual const char *GetFileName() APT_OVERRIDE {return "Sources";};
+   virtual const char *Type() APT_OVERRIDE {return "Source";};
 
    public:
    SourceCopy();
@@ -106,7 +108,7 @@ class SigVerify                                                             /*{{{*/
    /** \brief dpointer placeholder (for later in case we need it) */
    void * const d;
 
-   APT_HIDDEN bool Verify(std::string prefix,std::string file, indexRecords *records);
+   APT_HIDDEN bool Verify(std::string prefix,std::string file, metaIndex *records);
    APT_HIDDEN bool CopyMetaIndex(std::string CDROM, std::string CDName,
                      std::string prefix, std::string file);
 
@@ -114,9 +116,9 @@ class SigVerify                                                             /*{{{*/
    bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
                      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 
-   APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
+   APT_DEPRECATED_MSG("Use ExecGPGV instead") static bool RunGPGV(std::string const &File, std::string const &FileOut,
                       int const &statusfd, int fd[2]);
-   APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
+   APT_DEPRECATED_MSG("Use ExecGPGV instead") static bool RunGPGV(std::string const &File, std::string const &FileOut,
                              int const &statusfd = -1);
 
    SigVerify();