cleanup headers and especially #includes everywhere

[apt.git] / apt-pkg / edsp / edspindexfile.h

diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 87c06557cb5d13d10a925666dfba15f1ecfac03b..bd3b41cf2b1ed9fd2032556fd040f429c9d943bc 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -8,18 +8,28 @@
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 

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

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

+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif
+
+class OpProgress;
+class pkgCacheGenerator;

 
 class edspIndex : public debStatusIndex
 {
 
 class edspIndex : public debStatusIndex
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    public:
 
    virtual const Type *GetType() const;
 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 
    public:
 
    virtual const Type *GetType() const;
 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 

-   edspIndex(string File);
+   edspIndex(std::string File);

 };
 
 #endif
 };
 
 #endif