cleanup

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 582cbc527b1c9b4e7d252fae526318319118a0bb..f35bd9a133840b02a7835fc164a317b08d1166ec 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -10,7 +10,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.


@@ -33,11 +33,25 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>

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

 
 #include <iostream>
 
 #include <iostream>

+#include <string>
+
+#include <apt-pkg/macros.h>

 
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/acquire.h>

 using std::ostream;
 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                           /*{{{*/
 {
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {


@@ -63,21 +77,26 @@ class pkgSimulate : public pkgPackageManager                                /*{{{*/
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation

-   virtual bool Install(PkgIterator Pkg,string File);
+   virtual bool Install(PkgIterator Pkg,std::string File);

    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
 
 private:
    void ShortBreaks();
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
 
 private:
    void ShortBreaks();

-   void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);
+   void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);

    
    public:
 
    pkgSimulate(pkgDepCache *Cache);
    
    public:
 
    pkgSimulate(pkgDepCache *Cache);

+   ~pkgSimulate();

 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {
 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {

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

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


@@ -89,13 +108,13 @@ class pkgProblemResolver                                           /*{{{*/
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};

-   signed short *Scores;
+   int *Scores;

    unsigned char *Flags;
    bool Debug;
    
    // Sort stuff
    static pkgProblemResolver *This;
    unsigned char *Flags;
    bool Debug;
    
    // Sort stuff
    static pkgProblemResolver *This;

-   static int ScoreSort(const void *a,const void *b);
+   static int ScoreSort(const void *a,const void *b) APT_PURE;

 
    struct PackageKill
    {
 
    struct PackageKill
    {


@@ -109,6 +128,9 @@ class pkgProblemResolver                                            /*{{{*/
    bool ResolveInternal(bool const BrokenFix = false);
    bool ResolveByKeepInternal();
    
    bool ResolveInternal(bool const BrokenFix = false);
    bool ResolveByKeepInternal();
    

+   protected:
+   bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
+

    public:
    
    inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};
    public:
    
    inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};


@@ -121,21 +143,16 @@ class pkgProblemResolver                                          /*{{{*/
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 

-   // Install all protected packages   
-   void InstallProtect();   
-   
+   APT_DEPRECATED void InstallProtect();
+

    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };
                                                                        /*}}}*/
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };
                                                                        /*}}}*/

-bool pkgDistUpgrade(pkgDepCache &Cache);

 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);
 
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 

-bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);
-                    
+

 #endif
 #endif