make all d-pointer * const pointers

[apt.git] / apt-pkg / deb / debindexfile.h

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 18322dc1b1b3902750f38017a63073afcc988c65..1de609a7b9ac04e3c67f3cf46b38f06c3cb0bea4 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debindexfile.h,v 1.3.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Debian Index Files
 /* ######################################################################
 
    Debian Index Files


@@ -28,118 +27,68 @@ class pkgAcquire;
 class pkgCacheGenerator;
 
 
 class pkgCacheGenerator;
 
 

-class debStatusIndex : public pkgIndexFile
+class APT_HIDDEN debStatusIndex : public pkgIndexFile

 {
 {

-   /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;
-
+   void * const d;

    protected:
    std::string File;
 
    public:
 
    virtual const Type *GetType() const APT_CONST;
    protected:
    std::string File;
 
    public:
 
    virtual const Type *GetType() const APT_CONST;

-   
+

    // Interface for acquire
    virtual std::string Describe(bool /*Short*/) const {return File;};
    // Interface for acquire
    virtual std::string Describe(bool /*Short*/) const {return File;};

-   
+

    // Interface for the Cache Generator
    virtual bool Exists() const;
    virtual bool HasPackages() const {return true;};
    virtual unsigned long Size() const;
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
    // Interface for the Cache Generator
    virtual bool Exists() const;
    virtual bool HasPackages() const {return true;};
    virtual unsigned long Size() const;
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;

-   bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog, unsigned long const Flag) const;

    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    debStatusIndex(std::string File);
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    debStatusIndex(std::string File);

-   virtual ~debStatusIndex() {};
+   virtual ~debStatusIndex();

 };
 };

-    
-class debPackagesIndex : public pkgIndexFile
-{
-   /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;

 
 

-   std::string URI;
-   std::string Dist;
-   std::string Section;
-   std::string Architecture;
-
-   std::string Info(const char *Type) const;
-   std::string IndexFile(const char *Type) const;
-   std::string IndexURI(const char *Type) const;
-   
+class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
+{
+   void * const d;

    public:
    public:

-   
+

    virtual const Type *GetType() const APT_CONST;
 
    // Stuff for accessing files on remote items
    virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
    virtual const Type *GetType() const APT_CONST;
 
    // Stuff for accessing files on remote items
    virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;

-   virtual std::string ArchiveURI(std::string File) const {return URI + File;};
-   
-   // Interface for acquire
-   virtual std::string Describe(bool Short) const;   
-   
+

    // Interface for the Cache Generator
    // Interface for the Cache Generator

-   virtual bool Exists() const;

    virtual bool HasPackages() const {return true;};
    virtual bool HasPackages() const {return true;};

-   virtual unsigned long Size() const;

    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 

-   debPackagesIndex(std::string const &URI, std::string const &Dist, std::string const &Section,
-                       bool const &Trusted, std::string const &Arch = "native");
-   virtual ~debPackagesIndex() {};
+   debPackagesIndex(IndexTarget const &Target, bool const Trusted);
+   virtual ~debPackagesIndex();

 };
 
 };
 

-class debTranslationsIndex : public pkgIndexFile
+class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile

 {
 {

-   /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;
-
-   std::string URI;
-   std::string Dist;
-   std::string Section;
-   const char * const Language;
-   
-   std::string Info(const char *Type) const;
-   std::string IndexFile(const char *Type) const;
-   std::string IndexURI(const char *Type) const;
-
-   inline std::string TranslationFile() const {return std::string("Translation-").append(Language);};
-
+   void * const d;

    public:
    public:

-   
+

    virtual const Type *GetType() const APT_CONST;
 
    virtual const Type *GetType() const APT_CONST;
 

-   // Interface for acquire
-   virtual std::string Describe(bool Short) const;   
-   virtual bool GetIndexes(pkgAcquire *Owner) const;
-   

    // Interface for the Cache Generator
    // Interface for the Cache Generator

-   virtual bool Exists() const;

    virtual bool HasPackages() const;
    virtual bool HasPackages() const;

-   virtual unsigned long Size() const;

    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 

-   debTranslationsIndex(std::string URI,std::string Dist,std::string Section, char const * const Language);
-   virtual ~debTranslationsIndex() {};
+   debTranslationsIndex(IndexTarget const &Target);
+   virtual ~debTranslationsIndex();

 };
 
 };
 

-class debSourcesIndex : public pkgIndexFile
+class APT_HIDDEN debSourcesIndex : public pkgIndexTargetFile

 {
 {

-   /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;
-
-   std::string URI;
-   std::string Dist;
-   std::string Section;
-
-   std::string Info(const char *Type) const;
-   std::string IndexFile(const char *Type) const;
-   std::string IndexURI(const char *Type) const;
-   
+   void * const d;

    public:
 
    virtual const Type *GetType() const APT_CONST;
    public:
 
    virtual const Type *GetType() const APT_CONST;


@@ -147,27 +96,21 @@ class debSourcesIndex : public pkgIndexFile
    // Stuff for accessing files on remote items
    virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
                             pkgSrcRecords::File const &File) const;
    // Stuff for accessing files on remote items
    virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
                             pkgSrcRecords::File const &File) const;

-   virtual std::string ArchiveURI(std::string File) const {return URI + File;};
-   
-   // Interface for acquire
-   virtual std::string Describe(bool Short) const;   

 
    // Interface for the record parsers
    virtual pkgSrcRecords::Parser *CreateSrcParser() const;
 
    // Interface for the record parsers
    virtual pkgSrcRecords::Parser *CreateSrcParser() const;

-   
+

    // Interface for the Cache Generator
    // Interface for the Cache Generator

-   virtual bool Exists() const;

    virtual bool HasPackages() const {return false;};
    virtual bool HasPackages() const {return false;};

-   virtual unsigned long Size() const;
-   
-   debSourcesIndex(std::string URI,std::string Dist,std::string Section,bool Trusted);
-   virtual ~debSourcesIndex() {};
+
+   debSourcesIndex(IndexTarget const &Target, bool const Trusted);
+   virtual ~debSourcesIndex();

 };
 
 };
 

-class debDebPkgFileIndex : public pkgIndexFile
+class APT_HIDDEN debDebPkgFileIndex : public pkgIndexFile

 {
  private:
 {
  private:

-   void *d;
+   void * const d;

    std::string DebFile;
    std::string DebFileFullPath;
 
    std::string DebFile;
    std::string DebFileFullPath;
 


@@ -178,6 +121,14 @@ class debDebPkgFileIndex : public pkgIndexFile
       return DebFile;
    }
 
       return DebFile;
    }
 

+   /** get the control (file) content of the deb file
+    *
+    * @param[out] content of the control file
+    * @param debfile is the filename of the .deb-file
+    * @return \b true if successful, otherwise \b false.
+    */
+   static bool GetContent(std::ostream &content, std::string const &debfile);
+

    // Interface for the Cache Generator
    virtual bool Exists() const;
    virtual bool HasPackages() const {
    // Interface for the Cache Generator
    virtual bool Exists() const;
    virtual bool HasPackages() const {


@@ -191,12 +142,13 @@ class debDebPkgFileIndex : public pkgIndexFile
    virtual std::string ArchiveURI(std::string /*File*/) const;
 
    debDebPkgFileIndex(std::string DebFile);
    virtual std::string ArchiveURI(std::string /*File*/) const;
 
    debDebPkgFileIndex(std::string DebFile);

-   virtual ~debDebPkgFileIndex() {};
-};   
+   virtual ~debDebPkgFileIndex();
+};

 
 

-class debDscFileIndex : public pkgIndexFile
+class APT_HIDDEN debDscFileIndex : public pkgIndexFile

 {
  private:
 {
  private:

+   void * const d;

    std::string DscFile;
  public:
    virtual const Type *GetType() const APT_CONST;
    std::string DscFile;
  public:
    virtual const Type *GetType() const APT_CONST;


@@ -209,11 +161,12 @@ class debDscFileIndex : public pkgIndexFile
    };
 
    debDscFileIndex(std::string &DscFile);
    };
 
    debDscFileIndex(std::string &DscFile);

-   virtual ~debDscFileIndex() {};
+   virtual ~debDscFileIndex();

 };
 
 };
 

-class debDebianSourceDirIndex : public debDscFileIndex
+class APT_HIDDEN debDebianSourceDirIndex : public debDscFileIndex

 {
 {

+ public:

    virtual const Type *GetType() const APT_CONST;
 };
 
    virtual const Type *GetType() const APT_CONST;
 };