integrate Anthonys rred with POC for client-side merge

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

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 2b87d7da9a6f166a7c608678d0bad4f82b485311..18a90a29da868bd009e5e8da343a324c2477d4c7 100644 (file)
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -4,12 +4,15 @@
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
 #include <string>
 #include <apt-pkg/pkgcache.h>

+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/init.h>
+
+#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;
 using std::string;

+#endif

 
 class pkgAcquire;
 class pkgCacheGenerator;
 
 class pkgAcquire;
 class pkgCacheGenerator;


@@ -18,28 +21,47 @@ class OpProgress;
 class metaIndex
 {
    protected:
 class metaIndex
 {
    protected:

-   vector <pkgIndexFile *> *Indexes;
+   std::vector <pkgIndexFile *> *Indexes;

    const char *Type;
    const char *Type;

-   string URI;
-   string Dist;
+   std::string URI;
+   std::string Dist;

    bool Trusted;
 
    public:
 
    bool Trusted;
 
    public:
 

-   

    // Various accessors
    // Various accessors

-   virtual string GetURI() const {return URI;}
-   virtual string GetDist() const {return Dist;}
+   virtual std::string GetURI() const {return URI;}
+   virtual std::string GetDist() const {return Dist;}

    virtual const char* GetType() const {return Type;}
 
    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 string ArchiveURI(string /*File*/) const = 0;
-   virtual bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const = 0;
-   
-   virtual vector<pkgIndexFile *> *GetIndexFiles() = 0; 
+   virtual std::string ArchiveURI(std::string const& File) 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 bool IsTrusted() const = 0;
 

-   virtual ~metaIndex() {};
+   metaIndex(std::string const &URI, std::string const &Dist, 
+             char const * const Type) 
+      : Indexes(NULL), Type(Type), URI(URI), Dist(Dist)
+   {
+      /* nothing */
+   }
+
+   virtual ~metaIndex() 
+   {
+      if (Indexes == 0)
+        return;
+      for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin();
+           I != (*Indexes).end(); ++I)
+        delete *I;
+      delete Indexes;
+   }

 };
 
 #endif
 };
 
 #endif