Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index aa883df10aab1fe9d794042629d0a7e0932a336b..a3f693d86e4356978a070fd4b26469ca4a48c8f2 100644 (file)
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -10,23 +10,27 @@
 #ifndef PKGLIB_UPGRADE_H
 #define PKGLIB_UPGRADE_H
 
 #ifndef PKGLIB_UPGRADE_H
 #define PKGLIB_UPGRADE_H
 

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

 class pkgDepCache;
 class pkgDepCache;

+class OpProgress;

 
 namespace APT {
    namespace Upgrade {
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {
 
 namespace APT {
    namespace Upgrade {
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {

+        ALLOW_EVERYTHING = 0,

          FORBID_REMOVE_PACKAGES = 1,
          FORBID_INSTALL_NEW_PACKAGES = 2
       };
          FORBID_REMOVE_PACKAGES = 1,
          FORBID_INSTALL_NEW_PACKAGES = 2
       };

-      bool Upgrade(pkgDepCache &Cache, int UpgradeMode);
+      bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress = NULL);

    }
 }
 
 // please use APT::Upgrade::Upgrade() instead
    }
 }
 
 // please use APT::Upgrade::Upgrade() instead

-bool pkgDistUpgrade(pkgDepCache &Cache);
-bool pkgAllUpgrade(pkgDepCache &Cache);
-bool pkgMinimizeUpgrade(pkgDepCache &Cache);
-
+APT_DEPRECATED bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
+APT_DEPRECATED bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);

 
 

+bool pkgMinimizeUpgrade(pkgDepCache &Cache);

 #endif
 #endif