merge from the expermental2 branch

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

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index e2414446e17bd61064d14898d9288b50c59802bd..802b12b619dd8b233a16a2cab0679613e5868c1b 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cachefile.h,v 1.3 1999/06/27 03:18:28 jgg Exp $
+// $Id: cachefile.h,v 1.5 2002/04/27 04:28:04 jgg Exp $

 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot
 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot


@@ -9,43 +9,79 @@
    of caches. It can operate as root, as not root, show progress and so on,
    it transparently handles everything necessary.
    
    of caches. It can operate as root, as not root, show progress and so on,
    it transparently handles everything necessary.
    

+   This means it can rebuild caches from the source list and instantiates
+   and prepares the standard policy mechanism.
+   

    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 

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

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

-#include <apt-pkg/dpkginit.h>
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/policy.h>
+#include <apt-pkg/sourcelist.h>
+#endif
+
+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;
    protected:
    
    MMap *Map;

-   pkgDepCache *Cache;
-   pkgDpkgLock *Lock;
-   
+   pkgCache *Cache;
+   pkgDepCache *DCache;
+   pkgSourceList *SrcList;
+

    public:
    public:

-      
+   pkgPolicy *Policy;
+

    // We look pretty much exactly like a pointer to a dep cache
    // We look pretty much exactly like a pointer to a dep cache

-   inline operator pkgDepCache &() {return *Cache;};
-   inline operator pkgDepCache *() {return Cache;};
-   inline pkgDepCache *operator ->() {return Cache;};
-   inline pkgDepCache &operator *() {return *Cache;};
-   inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*Cache)[I];};
-   inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*Cache)[I];};
-
-   // Release the dpkg status lock
-   inline void ReleaseLock() {Lock->Close();};
-   
-   bool Open(OpProgress &Progress,bool WithLock = true);
-   
+   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 unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];};
+
+   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);
+   inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };
+   __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
+   static void RemoveCaches();
+   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();
    pkgCacheFile();

-   ~pkgCacheFile();
+   virtual ~pkgCacheFile();

 };
 
 #endif
 };
 
 #endif