do not inline virtual destructors with d-pointers

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

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 66c287c30fb711d2495ce83aff3fe45a0cd45fdb..7c4d0c1aa1a6e0f77f42a97e95ae8774a188c0e6 100644 (file)
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -1,17 +1,27 @@
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 

+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/init.h>
+
+#include <stddef.h>

 
 #include <string>
 
 #include <string>

+#include <vector>
+
+#ifndef APT_10_CLEANER_HEADERS

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

+class pkgCacheGenerator;
+class OpProgress;
+#endif
+#ifndef APT_8_CLEANER_HEADERS

 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>

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

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

+using std::string;
+#endif

 
 class pkgAcquire;
 
 class pkgAcquire;

-class pkgCacheGenerator;
-class OpProgress;

 
 class metaIndex
 {
 
 class metaIndex
 {


@@ -24,27 +34,36 @@ class metaIndex
 
    public:
 
 
    public:
 

-   

    // Various accessors
    virtual std::string GetURI() const {return URI;}
    virtual std::string GetDist() const {return Dist;}
    virtual const char* GetType() const {return Type;}
 
    // Various accessors
    virtual std::string GetURI() const {return URI;}
    virtual std::string GetDist() const {return Dist;}
    virtual const char* GetType() const {return Type;}
 

+   // interface to to query it
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   // returns the path of the local file (or "" if its not available)
+   virtual std::string LocalFileName() const {return "";};
+#endif
+

    // Interface for acquire
    // Interface for acquire

-   virtual std::string ArchiveURI(std::string const& /*File*/) const = 0;
+   virtual std::string ArchiveURI(std::string const& File) const = 0;

    virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const = 0;
    virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const = 0;

-   

    virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0; 
    virtual bool IsTrusted() const = 0;
 
    virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0; 
    virtual bool IsTrusted() const = 0;
 

-   metaIndex(std::string const &URI, std::string const &Dist, char const * const Type) :
-               Indexes(NULL), Type(Type), URI(URI), Dist(Dist) {
+   metaIndex(std::string const &URI, std::string const &Dist, 
+             char const * const Type) 
+      : Indexes(NULL), Type(Type), URI(URI), Dist(Dist), Trusted(false)
+   {
+      /* nothing */

    }
 
    }
 

-   virtual ~metaIndex() {
+   virtual ~metaIndex() 
+   {

       if (Indexes == 0)
         return;
       if (Indexes == 0)
         return;

-      for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
+      for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin();
+           I != (*Indexes).end(); ++I)

         delete *I;
       delete Indexes;
    }
         delete *I;
       delete Indexes;
    }