rename URL to Uri in deb822-sources

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

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index 09d3ec2676675c3063f32f5cc016b11eb7d245fe..802b12b619dd8b233a16a2cab0679613e5868c1b 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -17,14 +17,24 @@
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 

-

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

+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS

 #include <apt-pkg/acquire.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/sourcelist.h>

+#endif
+
+class pkgPolicy;
+class pkgSourceList;
+class OpProgress;

 
 class pkgCacheFile
 {
 
 class pkgCacheFile
 {

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

    protected:
    
    MMap *Map;
    protected:
    
    MMap *Map;


@@ -57,6 +67,7 @@ class pkgCacheFile
    bool Open(OpProgress *Progress = NULL, bool WithLock = true);
    inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };
    __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
    bool Open(OpProgress *Progress = NULL, bool WithLock = true);
    inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };
    __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };

+   static void RemoveCaches();

    void Close();
 
    inline pkgCache* GetPkgCache() { BuildCaches(NULL, false); return Cache; };
    void Close();
 
    inline pkgCache* GetPkgCache() { BuildCaches(NULL, false); return Cache; };