Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental

[apt.git] / cmdline / apt-extracttemplates.h

diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index d0f90d3f490fbac49cf827caf8169723bcf4d74a..6d2870a02365cd48730a9cd237e7e39bf6a97022 100644 (file)
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -11,13 +11,15 @@
 #define _APTEXTRACTTEMPLATE_H_
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/dirstream.h>
 
+#include <string>
+
+class pkgCache;
+
 class DebFile : public pkgDirStream
 {
        FileFd File;
-       unsigned long Size;
        char *Control;
        unsigned long ControlLen;
        
@@ -31,11 +33,11 @@ public:
        bool Go();
        bool ParseInfo();
 
-       static string GetInstalledVer(const string &package);
+       static std::string GetInstalledVer(const std::string &package);
 
-       string Package;
-       string Version;
-       string DepVer, PreDepVer;
+       std::string Package;
+       std::string Version;
+       std::string DepVer, PreDepVer;
        unsigned int DepOp, PreDepOp;
 
        char *Config;