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 4ef7787e7129bf2dd1d6f55137f8b4f4b051b084..bd3b41cf2b1ed9fd2032556fd040f429c9d943bc 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -1,25 +1,35 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 /* ######################################################################
-   The universe file is designed to work as an intermediate file between
+   The scenario file is designed to work as an intermediate file between
    APT and the resolver. Its on propose very similar to a dpkg status file
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 
-#include <apt-pkg/indexfile.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
 {
+   /** \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;
 
-   edspIndex(string File);
+   edspIndex(std::string File);
 };
 
 #endif