Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / deb / dpkgpm.h

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 5f00eee5d9c40cc1880d1750d8de7d759b012bda..e967bfe994b07f9ade9bc9a04034b32f6f92cf8d 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -11,10 +11,20 @@
 #define PKGLIB_DPKGPM_H
 
 #include <apt-pkg/packagemanager.h>
 #define PKGLIB_DPKGPM_H
 
 #include <apt-pkg/packagemanager.h>

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

 #include <vector>
 #include <map>
 #include <stdio.h>
 #include <vector>
 #include <map>
 #include <stdio.h>

-#include <apt-pkg/macros.h>
+#include <string>
+
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/init.h>
+#endif
+
+class pkgDepCache;
+namespace APT { namespace Progress { class PackageManager; } }

 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;


@@ -81,14 +91,13 @@ class pkgDPkgPM : public pkgPackageManager
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);

-   __deprecated bool SendV2Pkgs(FILE *F);
+   APT_DEPRECATED bool SendV2Pkgs(FILE *F);

    bool SendPkgsInfo(FILE * const F, unsigned int const &Version);
    void WriteHistoryTag(std::string const &tag, std::string value);
    std::string ExpandShortPackageName(pkgDepCache &Cache,
                                       const std::string &short_pkgname);
 
    // Terminal progress 
    bool SendPkgsInfo(FILE * const F, unsigned int const &Version);
    void WriteHistoryTag(std::string const &tag, std::string value);
    std::string ExpandShortPackageName(pkgDepCache &Cache,
                                       const std::string &short_pkgname);
 
    // Terminal progress 

-   void SetupTerminalScrollArea(int nr_scrolled_rows);

    void SendTerminalProgress(float percentage);
 
    // apport integration
    void SendTerminalProgress(float percentage);
 
    // apport integration


@@ -100,6 +109,8 @@ class pkgDPkgPM : public pkgPackageManager
 
    // helper
    void BuildPackagesProgressMap();
 
    // helper
    void BuildPackagesProgressMap();

+   void StartPtyMagic();
+   void StopPtyMagic();

    
    // input processing
    void DoStdin(int master);
    
    // input processing
    void DoStdin(int master);


@@ -113,6 +124,8 @@ class pkgDPkgPM : public pkgPackageManager
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);
 
    virtual bool Go(APT::Progress::PackageManager *progress);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);
 
    virtual bool Go(APT::Progress::PackageManager *progress);

+   virtual bool Go(int StatusFd=-1);
+

    virtual void Reset();
    
    public:
    virtual void Reset();
    
    public: