releasing 1.1~exp14

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

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 77e80ed41ef313a5da841018a021ebd643028bdb..c3f01c7746f51082223f35713b48fc76ac36a141 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -85,8 +85,14 @@ class IndexTarget                                                    /*{{{*/
       TARGET_OF,
       FILENAME,
       EXISTING_FILENAME,
       TARGET_OF,
       FILENAME,
       EXISTING_FILENAME,

+      PDIFFS,
+      COMPRESSIONTYPES,
+      DEFAULTENABLED,
+      SOURCESENTRY,
+      BY_HASH,

    };
    std::string Option(OptionKeys const Key) const;
    };
    std::string Option(OptionKeys const Key) const;

+   bool OptionBool(OptionKeys const Key) const;

    std::string Format(std::string format) const;
 };
                                                                        /*}}}*/
    std::string Format(std::string format) const;
 };
                                                                        /*}}}*/


@@ -135,7 +141,6 @@ class pkgIndexFile
    virtual bool HasPackages() const = 0;
    virtual unsigned long Size() const = 0;
    virtual bool Merge(pkgCacheGenerator &/*Gen*/, OpProgress* const /*Prog*/) { return true; };
    virtual bool HasPackages() const = 0;
    virtual unsigned long Size() const = 0;
    virtual bool Merge(pkgCacheGenerator &/*Gen*/, OpProgress* const /*Prog*/) { return true; };

-   virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) {return true;};

    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    static bool TranslationsAvailable();
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    static bool TranslationsAvailable();