Merge branch 'debian/sid' into debian/experimental

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

diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index 0b581604bc0eeb96cef4a726c68db0bc6bf2a99d..829cdae755c39b5ca8eb5c1d6542c6f3589310e0 100644 (file)
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-extracttemplates.h,v 1.1 2001/02/25 04:53:59 tausq Exp $
+// $Id: apt-extracttemplates.h,v 1.2 2001/02/27 04:26:03 jgg Exp $
 /* ######################################################################
 
    apt-extracttemplate - tool to extract template and config data
@@ -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;
        
@@ -26,16 +28,16 @@ public:
        ~DebFile();
        bool DoItem(Item &I, int &fd);
        bool Process(pkgDirStream::Item &I, const unsigned char *data, 
-               unsigned long size, unsigned long pos);
+               unsigned long long size, unsigned long long pos);
 
        bool Go();
        bool ParseInfo();
 
-       static char *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;