Fix several typos

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

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

-// $Id: algorithms.h,v 1.5 1998/10/08 04:54:59 jgg Exp $

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


@@ -10,7 +9,7 @@
    see all of the effects of an upgrade run.
 
    pkgDistUpgrade computes an upgrade that causes as many packages as
    see all of the effects of an upgrade run.
 
    pkgDistUpgrade computes an upgrade that causes as many packages as

-   possible to move to the newest verison.
+   possible to move to the newest version.

    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.
    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.


@@ -27,38 +26,77 @@
 
    ##################################################################### */
                                                                        /*}}}*/
 
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

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

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

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

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 
 

-class pkgSimulate : public pkgPackageManager
+#include <iostream>
+#include <string>
+
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/acquire.h>
+using std::ostream;
+#endif
+
+#ifndef APT_9_CLEANER_HEADERS
+// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatibility
+#include <apt-pkg/upgrade.h>
+#include <apt-pkg/update.h>
+#endif
+
+
+class pkgSimulate : public pkgPackageManager                           /*{{{*/

 {
 {

+   void * const d;

    protected:
 
    protected:
 

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

    unsigned char *Flags;
    
    unsigned char *Flags;
    

+   Policy iPolicy;

    pkgDepCache Sim;
    pkgDepCache Sim;

-   
-   // The Actuall installation implementation
-   virtual bool Install(PkgIterator Pkg,string File);
-   virtual bool Configure(PkgIterator Pkg);
-   virtual bool Remove(PkgIterator Pkg);
-   void ShortBreaks();
-   
+   pkgDepCache::ActionGroup group;
+
+   // The Actual installation implementation
+   virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
+   virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
+   virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE;
+
+private:
+   APT_HIDDEN void ShortBreaks();
+   APT_HIDDEN void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);
+

    public:
 
    public:
 

-   pkgSimulate(pkgDepCache &Cache);
+   explicit pkgSimulate(pkgDepCache *Cache);
+   virtual ~pkgSimulate();

 };
 };

-
-class pkgProblemResolver
+                                                                       /*}}}*/
+class pkgProblemResolver                                               /*{{{*/

 {
 {

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

    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;


@@ -68,14 +106,14 @@ class pkgProblemResolver
    typedef pkgCache::Package Package;
    
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
    typedef pkgCache::Package Package;
    
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),

-               Upgradable = (1 << 2), ReInstateTried = (1 << 3)};
-   signed short *Scores;
+               Upgradable = (1 << 2), ReInstateTried = (1 << 3),
+               ToRemove = (1 << 4)};
+   int *Scores;

    unsigned char *Flags;
    bool Debug;
    
    // Sort stuff
    unsigned char *Flags;
    bool Debug;
    
    // Sort stuff

-   static pkgProblemResolver *This;
-   static int ScoreSort(const void *a,const void *b);
+   APT_HIDDEN int ScoreSort(Package const *A, Package const *B) APT_PURE;

 
    struct PackageKill
    {
 
    struct PackageKill
    {


@@ -83,26 +121,37 @@ class pkgProblemResolver
       DepIterator Dep;
    };
 
       DepIterator Dep;
    };
 

-   void MakeScores();
-   bool DoUpgrade(pkgCache::PkgIterator Pkg);
-   
+   APT_HIDDEN void MakeScores();
+   APT_HIDDEN bool DoUpgrade(pkgCache::PkgIterator Pkg);
+
+   APT_HIDDEN bool ResolveInternal(bool const BrokenFix = false);
+   APT_HIDDEN bool ResolveByKeepInternal();
+
+   protected:
+   bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
+

    public:
    
    public:
    

-   inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected;};
+   inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};
+   inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
+   inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};

 
 

-   // Try to intelligently resolve problems by installing and removing packages   
-   bool Resolve(bool BrokenFix = false);
+   // Try to intelligently resolve problems by installing and removing packages
+   bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);

 
    // Try to resolve problems only by using keep
 
    // Try to resolve problems only by using keep

-   bool ResolveByKeep();
-      
-   pkgProblemResolver(pkgDepCache &Cache);
-};
+   bool ResolveByKeep(OpProgress * const Progress = NULL);
+
+   APT_DEPRECATED_MSG("NOOP as MarkInstall enforces not overriding FromUser markings") void InstallProtect();

 
 

-bool pkgDistUpgrade(pkgDepCache &Cache);
+   explicit pkgProblemResolver(pkgDepCache *Cache);
+   virtual ~pkgProblemResolver();
+};
+                                                                       /*}}}*/

 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);
 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);

-bool pkgAllUpgrade(pkgDepCache &Cache);
-bool pkgMinimizeUpgrade(pkgDepCache &Cache);
+
+void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
+

 
 #endif
 
 #endif