edsp: try harder to not generate unneeded error messages

[apt.git] / apt-pkg / clean.h

diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index 1ebf68dc94d91fab50a46d3f43457daa45e9735d..6cedae0869a7811426273c9bca57e51cbddc21a7 100644 (file)
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -10,22 +10,29 @@
 #ifndef APTPKG_CLEAN_H
 #define APTPKG_CLEAN_H
 
-
+#ifndef APT_10_CLEANER_HEADERS
 #include <apt-pkg/pkgcache.h>
+#endif
+
+#include <string>
+
+class pkgCache;
 
 class pkgArchiveCleaner
 {
    /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;
+   void * const d;
 
    protected:
-   
-   virtual void Erase(const char * /*File*/,string /*Pkg*/,string /*Ver*/,struct stat & /*St*/) {};
 
-   public:   
-   
-   bool Go(string Dir,pkgCache &Cache);
-   virtual ~pkgArchiveCleaner() {};
+   virtual void Erase(const char * /*File*/,std::string /*Pkg*/,std::string /*Ver*/,struct stat & /*St*/) {};
+
+   public:
+
+   bool Go(std::string Dir,pkgCache &Cache);
+
+   pkgArchiveCleaner();
+   virtual ~pkgArchiveCleaner();
 };
 
 #endif