refactor key removal code to reuse it in next step

[apt.git] / apt-inst / extract.h

diff --git a/apt-inst/extract.h b/apt-inst/extract.h
index a9152a26f66f4dd23bb9f0023bda33b5aae89d2d..8ad9ac629fac227e68f39a213a7ef0bb883eaa19 100644 (file)
--- a/apt-inst/extract.h
+++ b/apt-inst/extract.h
@@ -17,13 +17,12 @@
 #ifndef PKGLIB_EXTRACT_H
 #define PKGLIB_EXTRACT_H
 
 #ifndef PKGLIB_EXTRACT_H
 #define PKGLIB_EXTRACT_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/extract.h"
-#endif
-

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

+#include <apt-pkg/cacheiterators.h>
+
+#include <string>

 
 class pkgExtract : public pkgDirStream
 {
 
 class pkgExtract : public pkgDirStream
 {


@@ -35,7 +34,7 @@ class pkgExtract : public pkgDirStream
    
    bool HandleOverwrites(pkgFLCache::NodeIterator Nde,
                         bool DiverCheck = false);
    
    bool HandleOverwrites(pkgFLCache::NodeIterator Nde,
                         bool DiverCheck = false);

-   bool CheckDirReplace(string Dir,unsigned int Depth = 0);
+   bool CheckDirReplace(std::string Dir,unsigned int Depth = 0);

    
    public:
    
    
    public: