move ByHash into its own function

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 5c15ac0e43c67257432b080ab44509d7abe8de78..8a51a455c0263e9f93c6acd390a11c266b492697 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -24,12 +24,16 @@
 #define PKGLIB_PACKAGEMANAGER_H
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/iprogress.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/macros.h>
 
 #include <string>
-#include <iostream>
 #include <set>
 
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/install-progress.h>
+#include <iostream>
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/depcache.h>
 using std::string;
@@ -40,6 +44,11 @@ class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;
+namespace APT {
+   namespace Progress {
+      class PackageManager;
+   };
+};
 
 
 class pkgPackageManager : protected pkgCache::Namespace
@@ -71,7 +80,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool CreateOrderList();
    
    // Analysis helpers
-   bool DepAlwaysTrue(DepIterator D);
+   bool DepAlwaysTrue(DepIterator D) APT_PURE;
    
    // Install helpers
    bool ConfigureAll();
@@ -86,7 +95,12 @@ class pkgPackageManager : protected pkgCache::Namespace
    virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
-   virtual bool Go(APT::Progress::PackageManager *progress) {return true;};
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};
+#else
+   virtual bool Go(int /*statusFd*/=-1) {return true;};
+#endif
+
    virtual void Reset() {};
 
    // the result of the operation
@@ -99,17 +113,13 @@ class pkgPackageManager : protected pkgCache::Namespace
                    pkgRecords *Recs);
 
    // Do the installation 
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    OrderResult DoInstall(APT::Progress::PackageManager *progress);
-
    // compat
-   OrderResult DoInstall(int statusFd=-1) {
-      APT::Progress::PackageManager *progress = new
-         APT::Progress::PackageManagerProgressFd(statusFd);
-      OrderResult res = DoInstall(progress);
-      delete progress;
-      return res;
-   }
-
+   APT_DEPRECATED OrderResult DoInstall(int statusFd=-1);
+#else
+   OrderResult DoInstall(int statusFd=-1);
+#endif
 
    // stuff that needs to be done before the fork() of a library that
    // uses apt
@@ -117,9 +127,16 @@ class pkgPackageManager : protected pkgCache::Namespace
       Res = OrderInstall();
       return Res;
    };
-
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);
+   // compat
+   APT_DEPRECATED OrderResult DoInstallPostFork(int statusFd=-1);
+#else
+   OrderResult DoInstallPostFork(int statusFd=-1);
+#endif
+
+   // ?
    bool FixMissing();
 
    /** \brief returns all packages dpkg let disappear */