apt-pkg/tagfile.h: add dpointer placeholder, make destructor virtual; apt-pkg/deb...

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

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 48a345adfb175487441caf077dda4317f36244f9..b5085992dacd83492b0342fc1027a9a145058a96 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -16,9 +16,7 @@
 #ifndef PKGLIB_DEBINDEXFILE_H
 #define PKGLIB_DEBINDEXFILE_H
 
 #ifndef PKGLIB_DEBINDEXFILE_H
 #define PKGLIB_DEBINDEXFILE_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/debindexfile.h"
-#endif
+

 
 #include <apt-pkg/indexfile.h>
 
 
 #include <apt-pkg/indexfile.h>
 


@@ -37,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);


@@ -48,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;


@@ -59,7 +58,7 @@ class debPackagesIndex : public pkgIndexFile
 
    // Stuff for accessing files on remote items
    virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
 
    // Stuff for accessing files on remote items
    virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;

-   virtual string ArchiveURI(string File) const;
+   virtual string ArchiveURI(string File) const {return URI + File;};

    
    // Interface for acquire
    virtual string Describe(bool Short) const;   
    
    // Interface for acquire
    virtual string Describe(bool Short) const;   


@@ -68,10 +67,42 @@ 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;
+
+   debPackagesIndex(string const &URI, string const &Dist, string const &Section,
+                       bool const &Trusted, string const &Arch = "native");
+};
+
+class debTranslationsIndex : public pkgIndexFile
+{
+   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;
+
+   inline string TranslationFile() const {return string("Translation-").append(Language);};
+
+   public:
+   
+   virtual const Type *GetType() const;
+
+   // Interface for acquire
+   virtual string Describe(bool Short) const;   
+   virtual bool GetIndexes(pkgAcquire *Owner) const;
+   
+   // Interface for the Cache Generator
+   virtual bool Exists() 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 pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 

-   debPackagesIndex(string URI,string Dist,string Section,bool Trusted);
+   debTranslationsIndex(string URI,string Dist,string Section, char const * const Language);

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