* [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which

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

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index b0012c96b94fcf85f9793123f49506eb656de249..678c22473253f7415709891ef4ce4091f0609dc0 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -22,8 +22,12 @@
 
 class debStatusIndex : public pkgIndexFile
 {
 
 class debStatusIndex : public pkgIndexFile
 {

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

    string File;
    string File;

-   
+

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


@@ -35,17 +39,23 @@ class debStatusIndex : public pkgIndexFile
    virtual bool Exists() const;
    virtual bool HasPackages() const {return true;};
    virtual unsigned long Size() const;
    virtual bool Exists() const;
    virtual bool HasPackages() const {return true;};
    virtual unsigned long Size() const;

-   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) 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(string File);
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    debStatusIndex(string File);

+   virtual ~debStatusIndex() {};

 };
     
 class debPackagesIndex : public pkgIndexFile
 {
 };
     
 class debPackagesIndex : public pkgIndexFile
 {

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

    string URI;
    string Dist;
    string Section;
    string URI;
    string Dist;
    string Section;

+   string Architecture;

 
    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;
 
    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;


@@ -66,23 +76,29 @@ class debPackagesIndex : public pkgIndexFile
    virtual bool Exists() const;
    virtual bool HasPackages() const {return true;};
    virtual unsigned long Size() const;
    virtual bool Exists() const;
    virtual bool HasPackages() const {return true;};
    virtual unsigned long Size() const;

-   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
+   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;

    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 

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

 };
 
 class debTranslationsIndex : public pkgIndexFile
 {
 };
 
 class debTranslationsIndex : public pkgIndexFile
 {

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

    string URI;
    string Dist;
    string Section;
    string URI;
    string Dist;
    string Section;

+   const char * const Language;

    
    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;
    string IndexURI(const char *Type) const;
 
    
    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;
    string IndexURI(const char *Type) const;
 

-   inline string TranslationFile() const {return "Translation-" + LanguageCode();};
+   inline string TranslationFile() const {return string("Translation-").append(Language);};

 
    public:
    
 
    public:
    


@@ -96,14 +112,18 @@ class debTranslationsIndex : public pkgIndexFile
    virtual bool Exists() const;
    virtual bool HasPackages() const;
    virtual unsigned long Size() const;
    virtual bool Exists() const;
    virtual bool HasPackages() const;
    virtual unsigned long Size() const;

-   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
+   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;

    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 

-   debTranslationsIndex(string URI,string Dist,string Section);
+   debTranslationsIndex(string URI,string Dist,string Section, char const * const Language);
+   virtual ~debTranslationsIndex() {};

 };
 
 class debSourcesIndex : public pkgIndexFile
 {
 };
 
 class debSourcesIndex : public pkgIndexFile
 {

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

    string URI;
    string Dist;
    string Section;
    string URI;
    string Dist;
    string Section;


@@ -133,6 +153,7 @@ class debSourcesIndex : public pkgIndexFile
    virtual unsigned long Size() const;
    
    debSourcesIndex(string URI,string Dist,string Section,bool Trusted);
    virtual unsigned long Size() const;
    
    debSourcesIndex(string URI,string Dist,string Section,bool Trusted);

+   virtual ~debSourcesIndex() {};

 };
 
 #endif
 };
 
 #endif