improve the API for Upgrade()

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index a499db8ba3fad782109890ae7be3030f73b0bb05..9ff84e3ffd4781031e0c958085431eef122344e0 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -45,6 +45,15 @@ using std::ostream;
 
 class pkgAcquireStatus;
 
+namespace APT {
+   namespace Upgrade {
+      enum UpgradeMode {NO_INSTALL_OR_REMOVE,
+                        ALLOW_NEW_INSTALLS,
+                        ALLOW_REMOVAL_AND_NEW_INSTALLS};
+      bool Upgrade(pkgDepCache &Cache, UpgradeMode mode);
+   }
+}
+
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {
    protected:
@@ -85,6 +94,7 @@ private:
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {
+ private:
    /** \brief dpointer placeholder (for later in case we need it) */
    void *d;
 
@@ -146,8 +156,6 @@ bool pkgFixBroken(pkgDepCache &Cache);
 
 bool pkgAllUpgrade(pkgDepCache &Cache);
 
-bool pkgAllUpgradeNoDelete(pkgDepCache &Cache);
-
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);