* merged with mainline

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

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index d3a8f991705abddd2f529518a5055552214402bc..61049f4bd9c8002c69f2bc4a0e16b8dcec1efa8f 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -5,11 +5,10 @@
 
    Index File - Abstraction for an index of archive/source file.
    
 
    Index File - Abstraction for an index of archive/source file.
    

-   There are 4 primary sorts of index files, all represented by this 
+   There are 3 primary sorts of index files, all represented by this 

    class:
    
    Binary index files 
    class:
    
    Binary index files 

-   Binary translation files 

    Bianry index files decribing the local system
    Source index files
    
    Bianry index files decribing the local system
    Source index files
    


@@ -56,6 +55,7 @@ class pkgIndexFile
 
       virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;};
       Type();
 
       virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;};
       Type();

+      virtual ~Type() {};

    };
 
    virtual const Type *GetType() const = 0;
    };
 
    virtual const Type *GetType() const = 0;


@@ -80,10 +80,6 @@ class pkgIndexFile
    virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;};
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;};
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 

-   static bool UseTranslation();
-   static bool CheckLanguageCode(const char *Lang);
-   static string LanguageCode();
-

    bool IsTrusted() const { return Trusted; };
    
    pkgIndexFile(bool Trusted): Trusted(Trusted) {};
    bool IsTrusted() const { return Trusted; };
    
    pkgIndexFile(bool Trusted): Trusted(Trusted) {};