add c++11 override marker to overridden methods

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

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index e6e429c2c59e0d75c50afc09d20026b0982d1e00..5be7794bff67f50e6ade662a50e641b8e97391d5 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: indexfile.h,v 1.6.2.1 2003/12/24 23:09:17 mdz Exp $
 /* ######################################################################
 
    Index File - Abstraction for an index of archive/source file.
@@ -61,19 +60,39 @@ class IndexTarget                                                   /*{{{*/
    /** \brief Is it okay if the file isn't found in the meta index */
    bool IsOptional;
 
-   /** \brief Target specific options defined by the implementation */
+   /** \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 */
    std::map<std::string, std::string> Options;
 
    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);
-
-   std::string Option(std::string const &Key) const;
+        bool const KeepCompressed, std::map<std::string, std::string> const &Options);
+
+   enum OptionKeys {
+      SITE,
+      RELEASE,
+      COMPONENT,
+      LANGUAGE,
+      ARCHITECTURE,
+      BASE_URI,
+      REPO_URI,
+      CREATED_BY,
+      TARGET_OF,
+      FILENAME,
+      EXISTING_FILENAME,
+   };
+   std::string Option(OptionKeys const Key) const;
+   std::string Format(std::string format) const;
 };
                                                                        /*}}}*/
 
 class pkgIndexFile
 {
+   void * const d;
    protected:
    bool Trusted;
 
@@ -128,24 +147,26 @@ class pkgIndexFile
 
    bool IsTrusted() const { return Trusted; };
 
-   pkgIndexFile(bool Trusted);
-   virtual ~pkgIndexFile() {};
+   explicit pkgIndexFile(bool Trusted);
+   virtual ~pkgIndexFile();
 };
 
 class pkgIndexTargetFile : public pkgIndexFile
 {
+   void * const d;
 protected:
    IndexTarget const Target;
 
    std::string IndexFileName() const;
 
 public:
-   virtual std::string ArchiveURI(std::string File) const;
-   virtual std::string Describe(bool Short = false) const;
-   virtual bool Exists() const;
-   virtual unsigned long Size() const;
+   virtual std::string ArchiveURI(std::string File) const APT_OVERRIDE;
+   virtual std::string Describe(bool Short = false) const APT_OVERRIDE;
+   virtual bool Exists() const APT_OVERRIDE;
+   virtual unsigned long Size() const APT_OVERRIDE;
 
    pkgIndexTargetFile(IndexTarget const &Target, bool const Trusted);
+   virtual ~pkgIndexTargetFile();
 };
 
 #endif