* apt-pkg/indexcopy.cc:

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

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index b0012c96b94fcf85f9793123f49506eb656de249..b5085992dacd83492b0342fc1027a9a145058a96 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -35,7 +35,7 @@ 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;

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


@@ -46,6 +46,7 @@ class debPackagesIndex : public pkgIndexFile
    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,10 +67,11 @@ 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");

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


@@ -77,12 +79,13 @@ class debTranslationsIndex : public pkgIndexFile
    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,10 +99,10 @@ 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);

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