Sync

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

diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 6cb8c11879268fc3b3db09ff299ba51e1eab7890..bd64ee5a22a19e5718e09d2186b2d8bb0822b45a 100644 (file)
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: depcache.h,v 1.3 1998/07/12 23:58:25 jgg Exp $
+// $Id: depcache.h,v 1.5 1998/10/02 04:39:45 jgg Exp $
 /* ######################################################################
 
    DepCache - Dependency Extension data for the cache
@@ -44,6 +44,7 @@
 #endif
 
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/progress.h>
 
 class pkgDepCache : public pkgCache
 {
@@ -93,7 +94,7 @@ class pkgDepCache : public pkgCache
       inline bool Delete() const {return Mode == ModeDelete;};
       inline bool Keep() const {return Mode == ModeKeep;};
       inline bool Upgrade() const {return Status > 0 && Mode == ModeInstall;};
-      inline bool Upgradable() const {return Status == 1;};
+      inline bool Upgradable() const {return Status >= 1;};
       inline bool Downgrade() const {return Status < 0;};
       inline bool Held() const {return Status != 0 && Keep();};
       inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;};
@@ -109,7 +110,7 @@ class pkgDepCache : public pkgCache
    void BuildGroupOrs(VerIterator const &V);
    void UpdateVerState(PkgIterator Pkg);
 
-   bool Init();
+   bool Init(OpProgress *Prog);
 
    protected:
 
@@ -165,11 +166,8 @@ class pkgDepCache : public pkgCache
    void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true);
    
    // This is for debuging
-   void Update();
+   void Update(OpProgress *Prog = 0);
 
-   // Hook to keep the extra data in sync
-   virtual bool ReMap();
-   
    // Size queries
    inline long UsrSize() {return iUsrSize;};
    inline long DebSize() {return iDownloadSize;};
@@ -179,7 +177,7 @@ class pkgDepCache : public pkgCache
    inline long BrokenCount() {return iBrokenCount;};
    inline long BadCount() {return iBadCount;};
    
-   pkgDepCache(MMap &Map);
+   pkgDepCache(MMap &Map,OpProgress &Prog);
    virtual ~pkgDepCache();
 };