merge from the expermental2 branch

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

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index b75a7dbe42881036df81ce4d2f83d247f9f8ba98..802b12b619dd8b233a16a2cab0679613e5868c1b 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -17,28 +17,43 @@
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 

-

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

+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS

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

+#include <apt-pkg/policy.h>

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

+#endif

 
 class pkgPolicy;
 
 class pkgPolicy;

+class pkgSourceList;
+class OpProgress;
+

 class pkgCacheFile
 {
 class pkgCacheFile
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    protected:
    
    MMap *Map;
    pkgCache *Cache;
    pkgDepCache *DCache;
    protected:
    
    MMap *Map;
    pkgCache *Cache;
    pkgDepCache *DCache;

-   pkgPolicy *Policy;
+   pkgSourceList *SrcList;

 
    public:
 
    public:

+   pkgPolicy *Policy;

 
    // We look pretty much exactly like a pointer to a dep cache
    inline operator pkgCache &() {return *Cache;};
    inline operator pkgCache *() {return Cache;};
    inline operator pkgDepCache &() {return *DCache;};
    inline operator pkgDepCache *() {return DCache;};
 
    // We look pretty much exactly like a pointer to a dep cache
    inline operator pkgCache &() {return *Cache;};
    inline operator pkgCache *() {return Cache;};
    inline operator pkgDepCache &() {return *DCache;};
    inline operator pkgDepCache *() {return DCache;};

+   inline operator pkgPolicy &() {return *Policy;};
+   inline operator pkgPolicy *() {return Policy;};
+   inline operator pkgSourceList &() {return *SrcList;};
+   inline operator pkgSourceList *() {return SrcList;};

    inline pkgDepCache *operator ->() {return DCache;};
    inline pkgDepCache &operator *() {return *DCache;};
    inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];};
    inline pkgDepCache *operator ->() {return DCache;};
    inline pkgDepCache &operator *() {return *DCache;};
    inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];};


@@ -46,12 +61,25 @@ class pkgCacheFile
 
    bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true);
    __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); };
 
    bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true);
    __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); };

+   bool BuildSourceList(OpProgress *Progress = NULL);

    bool BuildPolicy(OpProgress *Progress = NULL);
    bool BuildDepCache(OpProgress *Progress = NULL);
    bool Open(OpProgress *Progress = NULL, bool WithLock = true);
    bool BuildPolicy(OpProgress *Progress = NULL);
    bool BuildDepCache(OpProgress *Progress = NULL);
    bool Open(OpProgress *Progress = NULL, bool WithLock = true);

+   inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };

    __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
    __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };

+   static void RemoveCaches();

    void Close();
    void Close();

-   
+
+   inline pkgCache* GetPkgCache() { BuildCaches(NULL, false); return Cache; };
+   inline pkgDepCache* GetDepCache() { BuildDepCache(); return DCache; };
+   inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; };
+   inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; };
+
+   inline bool IsPkgCacheBuilt() const { return (Cache != NULL); };
+   inline bool IsDepCacheBuilt() const { return (DCache != NULL); };
+   inline bool IsPolicyBuilt() const { return (Policy != NULL); };
+   inline bool IsSrcListBuilt() const { return (SrcList != NULL); };
+

    pkgCacheFile();
    virtual ~pkgCacheFile();
 };
    pkgCacheFile();
    virtual ~pkgCacheFile();
 };