Remove \r escape sequence for the sake of gettext

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index d68fbfbea7e9c8eb0446dfad5de74e06ee0fb4dd..0b38e4244fd24d62e86e83a9cb3f81ba654245e3 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: algorithms.h,v 1.8 1999/10/27 04:38:27 jgg Exp $
+// $Id: algorithms.h,v 1.10 2001/05/22 04:17:41 jgg Exp $

 /* ######################################################################
 
    Algorithms - A set of misc algorithms
 /* ######################################################################
 
    Algorithms - A set of misc algorithms


@@ -27,7 +27,6 @@
 
    ##################################################################### */
                                                                        /*}}}*/
 
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 


@@ -38,12 +37,30 @@
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 

+#include <iostream>
+
+using std::ostream;
+

 class pkgSimulate : public pkgPackageManager
 {
    protected:
 
 class pkgSimulate : public pkgPackageManager
 {
    protected:
 

+   class Policy : public pkgDepCache::Policy
+   {
+      pkgDepCache *Cache;
+      public:
+      
+      virtual VerIterator GetCandidateVer(PkgIterator Pkg)
+      {
+        return (*Cache)[Pkg].CandidateVerIter(*Cache);
+      }
+      
+      Policy(pkgDepCache *Cache) : Cache(Cache) {};
+   };
+   

    unsigned char *Flags;
    
    unsigned char *Flags;
    

+   Policy iPolicy;

    pkgDepCache Sim;
    
    // The Actuall installation implementation
    pkgDepCache Sim;
    
    // The Actuall installation implementation


@@ -51,10 +68,11 @@ class pkgSimulate : public pkgPackageManager
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
    void ShortBreaks();
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
    void ShortBreaks();

+   void Describe(PkgIterator iPkg,ostream &out,bool Now);

    
    public:
 
    
    public:
 

-   pkgSimulate(pkgDepCache &Cache);
+   pkgSimulate(pkgDepCache *Cache);

 };
 
 class pkgProblemResolver
 };
 
 class pkgProblemResolver


@@ -101,7 +119,8 @@ class pkgProblemResolver
    
    void InstallProtect();   
    
    
    void InstallProtect();   
    

-   pkgProblemResolver(pkgDepCache &Cache);
+   pkgProblemResolver(pkgDepCache *Cache);
+   ~pkgProblemResolver();

 };
 
 bool pkgDistUpgrade(pkgDepCache &Cache);
 };
 
 bool pkgDistUpgrade(pkgDepCache &Cache);


@@ -110,4 +129,6 @@ bool pkgFixBroken(pkgDepCache &Cache);
 bool pkgAllUpgrade(pkgDepCache &Cache);
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 
 bool pkgAllUpgrade(pkgDepCache &Cache);
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 

+void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
+                    

 #endif
 #endif