More touch ups

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 90b2e18af9fe5424f86476db91e3ff2df382ecc7..f264b314dceaccf431556aa0af5187c495aaa6fe 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: pkgcachegen.h,v 1.15 1999/05/23 22:55:54 jgg Exp $
+// $Id: pkgcachegen.h,v 1.17 1999/07/26 17:46:08 jgg Exp $
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
@@ -45,7 +45,7 @@ class pkgCacheGenerator
    
    DynamicMMap ⤅
    pkgCache Cache;
-   OpProgress &Progress;
+   OpProgress *Progress;
    
    string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
@@ -59,8 +59,9 @@ class pkgCacheGenerator
 
    public:   
 
+   void DropProgress() {Progress = 0;};
    bool SelectFile(string File,unsigned long Flags = 0);
-   bool MergeList(ListParser &List);
+   bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};
    inline pkgCache::PkgFileIterator GetCurFile() 
          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};
@@ -82,7 +83,7 @@ class pkgCacheGenerator::ListParser
    
    // Some cache items
    pkgCache::VerIterator OldDepVer;
-   __apt_ptrloc *OldDepLast;
+   map_ptrloc *OldDepLast;
       
    protected:
 
@@ -112,4 +113,8 @@ class pkgCacheGenerator::ListParser
    virtual ~ListParser() {};
 };
 
+bool pkgMergeStatus(OpProgress &Progress,pkgCacheGenerator &Gen,
+                   unsigned long &CurrentSize,unsigned long TotalSize);
+bool pkgAddStatusSize(unsigned long &TotalSize);
+
 #endif