merged the relevant bits from lp:~mvo/apt/lp346386

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

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 06e5a7f355ff7694cf7ba7dc91f1d57c733f1456..1d34dc773bb3123cfef7681d76dc45b96568e93b 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -1,14 +1,15 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: indexfile.h,v 1.3 2001/03/11 07:35:49 jgg Exp $
+// $Id: indexfile.h,v 1.6.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Index File - Abstraction for an index of archive/source file.
    
 /* ######################################################################
 
    Index File - Abstraction for an index of archive/source file.
    

-   There are 3 primary sorts of index files, all represented by this 
+   There are 4 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
    


@@ -21,20 +22,26 @@
 #ifndef PKGLIB_INDEXFILE_H
 #define PKGLIB_INDEXFILE_H
 
 #ifndef PKGLIB_INDEXFILE_H
 #define PKGLIB_INDEXFILE_H
 

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

 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>

-    
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+

 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;
 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;

+

 class pkgIndexFile
 {
 class pkgIndexFile
 {

+   protected:
+   bool Trusted;
+     

    public:
 
    class Type
    public:
 
    class Type


@@ -50,19 +57,19 @@ 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;
    
    // Return descriptive strings of various sorts
    };
 
    virtual const Type *GetType() const = 0;
    
    // Return descriptive strings of various sorts

-   virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
-   virtual string SourceInfo(pkgSrcRecords::Parser const &Record,
+   virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
+   virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,

                             pkgSrcRecords::File const &File) const;
                             pkgSrcRecords::File const &File) const;

-   virtual string Describe() const = 0;   
+   virtual std::string Describe(bool Short = false) const = 0;   

 
    // Interface for acquire
 
    // Interface for acquire

-   virtual string ArchiveURI(string /*File*/) const {return string();};
-   virtual bool GetIndexes(pkgAcquire *Owner) const;
+   virtual std::string ArchiveURI(std::string /*File*/) const {return std::string();};

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


@@ -71,9 +78,21 @@ class pkgIndexFile
    virtual bool Exists() const = 0;
    virtual bool HasPackages() const = 0;
    virtual unsigned long Size() const = 0;
    virtual bool Exists() const = 0;
    virtual bool HasPackages() const = 0;
    virtual unsigned long Size() const = 0;

-   virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return false;};
+   virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const { return false; };
+   __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const
+      { return Merge(Gen, &Prog); };
+   virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;};
+   __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const
+      {return MergeFileProvides(Gen, &Prog);};

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

+
+   static bool TranslationsAvailable();
+   static bool CheckLanguageCode(const char *Lang);
+   static std::string LanguageCode();
+
+   bool IsTrusted() const { return Trusted; };

    
    

+   pkgIndexFile(bool Trusted): Trusted(Trusted) {};

    virtual ~pkgIndexFile() {};
 };
 
    virtual ~pkgIndexFile() {};
 };