merged r1970 lp:~vorlon/apt/lp.968828

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 96dc5f236cd007dcb521e1258ca968aaea1736b2..1a6a9f01c7ad0bbfcb06484f2ce82d8d9b064627 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,14 +23,16 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 

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

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

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

 #include <set>
 
 #include <set>
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/depcache.h>

 using std::string;
 using std::string;

+#endif

 
 class pkgAcquire;
 class pkgDepCache;
 
 class pkgAcquire;
 class pkgDepCache;


@@ -45,7 +47,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    static bool SigINTStop;
    
    protected:
    static bool SigINTStop;
    
    protected:

-   string *FileNames;
+   std::string *FileNames;

    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;


@@ -78,7 +80,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool EarlyRemove(PkgIterator Pkg);  
    
    // The Actual installation implementation
    bool EarlyRemove(PkgIterator Pkg);  
    
    // The Actual installation implementation

-   virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
+   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(int statusFd=-1) {return true;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
    virtual bool Go(int statusFd=-1) {return true;};