support gpg 2.1.x in apt-key

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

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index c51879bb895c760c172fa8bc6f34f94816d772e6..44d39110d2a6504961e662c06666cf0427895749 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -60,6 +60,9 @@ class IndexTarget                                                     /*{{{*/
    /** \brief Is it okay if the file isn't found in the meta index */
    bool IsOptional;
 
    /** \brief Is it okay if the file isn't found in the meta index */
    bool IsOptional;
 

+   /** \brief If the file is downloaded compressed, do not unpack it */
+   bool KeepCompressed;
+

    /** \brief options with which this target was created
        Prefer the usage of #Option if at all possible.
        Beware: Not all of these options are intended for public use */
    /** \brief options with which this target was created
        Prefer the usage of #Option if at all possible.
        Beware: Not all of these options are intended for public use */


@@ -67,7 +70,7 @@ class IndexTarget                                                     /*{{{*/
 
    IndexTarget(std::string const &MetaKey, std::string const &ShortDesc,
         std::string const &LongDesc, std::string const &URI, bool const IsOptional,
 
    IndexTarget(std::string const &MetaKey, std::string const &ShortDesc,
         std::string const &LongDesc, std::string const &URI, bool const IsOptional,

-        std::map<std::string, std::string> const &Options);
+        bool const KeepCompressed, std::map<std::string, std::string> const &Options);

 
    enum OptionKeys {
       SITE,
 
    enum OptionKeys {
       SITE,


@@ -89,7 +92,7 @@ class IndexTarget                                                     /*{{{*/
 
 class pkgIndexFile
 {
 
 class pkgIndexFile
 {

-   void *d;
+   void * const d;

    protected:
    bool Trusted;
 
    protected:
    bool Trusted;
 


@@ -144,13 +147,13 @@ class pkgIndexFile
 
    bool IsTrusted() const { return Trusted; };
 
 
    bool IsTrusted() const { return Trusted; };
 

-   pkgIndexFile(bool Trusted);
+   explicit pkgIndexFile(bool Trusted);

    virtual ~pkgIndexFile();
 };
 
 class pkgIndexTargetFile : public pkgIndexFile
 {
    virtual ~pkgIndexFile();
 };
 
 class pkgIndexTargetFile : public pkgIndexFile
 {

-   void *d;
+   void * const d;

 protected:
    IndexTarget const Target;
 
 protected:
    IndexTarget const Target;