Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index d5d1cf57aa6ec55bb126229f17aa044b44aee60f..817165f087a4393655b314c95bf55a574bf2835b 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -10,32 +10,36 @@
    
    Binary index files 
    Binary translation files 
    
    Binary index files 
    Binary translation files 

-   Bianry index files decribing the local system
+   Binary index files describing the local system

    Source index files
    
    They are all bundled together here, and the interfaces for 
    sources.list, acquire, cache gen and record parsing all use this class
    Source index files
    
    They are all bundled together here, and the interfaces for 
    sources.list, acquire, cache gen and record parsing all use this class

-   to acess the underlying representation.
+   to access the underlying representation.

    
    ##################################################################### */
                                                                        /*}}}*/
 #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 <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>

-    
-using std::string;
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>

 
 

+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+#ifndef APT_10_CLEANER_HEADERS

 class pkgAcquire;
 class pkgAcquire;

+#endif
+

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

+

 class pkgIndexFile
 {
    protected:
 class pkgIndexFile
 {
    protected:


@@ -50,11 +54,12 @@ class pkgIndexFile
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;

-      static Type *GetType(const char *Type);
+      static Type *GetType(const char *Type) APT_PURE;

 
       const char *Label;
 
       virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;};
 
       const char *Label;
 
       virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;};

+      virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string /*File*/) const {return 0;};

       Type();
       virtual ~Type() {};
    };
       Type();
       virtual ~Type() {};
    };


@@ -62,13 +67,13 @@ class pkgIndexFile
    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(bool Short = false) 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 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;};


@@ -77,13 +82,17 @@ 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 MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;};
+   virtual bool Merge(pkgCacheGenerator &/*Gen*/, OpProgress* /*Prog*/) const { return false; };
+   APT_DEPRECATED virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const
+      { return Merge(Gen, &Prog); };
+   virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;};
+   APT_DEPRECATED virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const
+      {return MergeFileProvides(Gen, &Prog);};

    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    static bool TranslationsAvailable();
    static bool CheckLanguageCode(const char *Lang);
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    static bool TranslationsAvailable();
    static bool CheckLanguageCode(const char *Lang);

-   static string LanguageCode();
+   static std::string LanguageCode();

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