fix install-progress location

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 5c15ac0e43c67257432b080ab44509d7abe8de78..8ffac2f1397729405bb245b16b622da20020ecce 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,8 +23,9 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 

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

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

-#include <apt-pkg/iprogress.h>
+#include <apt-pkg/install-progress.h>

 
 #include <string>
 #include <iostream>
 
 #include <string>
 #include <iostream>


@@ -100,16 +101,8 @@ class pkgPackageManager : protected pkgCache::Namespace
 
    // Do the installation 
    OrderResult DoInstall(APT::Progress::PackageManager *progress);
 
    // Do the installation 
    OrderResult DoInstall(APT::Progress::PackageManager *progress);

-

    // compat
    // compat

-   OrderResult DoInstall(int statusFd=-1) {
-      APT::Progress::PackageManager *progress = new
-         APT::Progress::PackageManagerProgressFd(statusFd);
-      OrderResult res = DoInstall(progress);
-      delete progress;
-      return res;
-   }
-
+   __deprecated OrderResult DoInstall(int statusFd=-1);

 
    // stuff that needs to be done before the fork() of a library that
    // uses apt
 
    // stuff that needs to be done before the fork() of a library that
    // uses apt


@@ -120,6 +113,10 @@ class pkgPackageManager : protected pkgCache::Namespace
 
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);
 
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);

+   // compat
+   __deprecated OrderResult DoInstallPostFork(int statusFd=-1);
+
+   // ?

    bool FixMissing();
 
    /** \brief returns all packages dpkg let disappear */
    bool FixMissing();
 
    /** \brief returns all packages dpkg let disappear */