cleanup headers and especially #includes everywhere

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

diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index d0f90d3f490fbac49cf827caf8169723bcf4d74a..9cc3f5f258be11451c4492a60ad9ccf1891abd05 100644 (file)
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -11,9 +11,12 @@
 #define _APTEXTRACTTEMPLATE_H_
 
 #include <apt-pkg/fileutl.h>
 #define _APTEXTRACTTEMPLATE_H_
 
 #include <apt-pkg/fileutl.h>

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

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

+#include <string>
+
+class pkgCache;
+

 class DebFile : public pkgDirStream
 {
        FileFd File;
 class DebFile : public pkgDirStream
 {
        FileFd File;


@@ -31,11 +34,11 @@ public:
        bool Go();
        bool ParseInfo();
 
        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;
        unsigned int DepOp, PreDepOp;
 
        char *Config;