* apt-pkg/contrib/configuration.cc:

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

diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 08f00441463e428da12e6268c9123a5116742f55..c2c98188a7e12fce76b512c767e56f1c9b256c21 100644 (file)
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -17,14 +17,12 @@
 #ifndef PKGLIB_PKGRECORDS_H
 #define PKGLIB_PKGRECORDS_H
 
 #ifndef PKGLIB_PKGRECORDS_H
 #define PKGLIB_PKGRECORDS_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgrecords.h"
-#endif 

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

+#include <vector>

 
 

-class pkgRecords
+class pkgRecords                                                       /*{{{*/

 {
    public:
    class Parser;
 {
    public:
    class Parser;


@@ -32,23 +30,25 @@ class pkgRecords
    private:
    
    pkgCache &Cache;
    private:
    
    pkgCache &Cache;

-   Parser **Files;
-      
+   std::vector<Parser *>Files;
+

    public:
 
    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    public:
 
    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);

+   Parser &Lookup(pkgCache::DescFileIterator const &Desc);

 
    // Construct destruct
    pkgRecords(pkgCache &Cache);
    ~pkgRecords();
 };
 
    // Construct destruct
    pkgRecords(pkgCache &Cache);
    ~pkgRecords();
 };

-
-class pkgRecords::Parser
+                                                                       /*}}}*/
+class pkgRecords::Parser                                               /*{{{*/

 {
    protected:
    
    virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;
 {
    protected:
    
    virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;

+   virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0;

    
    public:
    friend class pkgRecords;
    
    public:
    friend class pkgRecords;


@@ -57,18 +57,21 @@ class pkgRecords::Parser
    virtual string FileName() {return string();};
    virtual string MD5Hash() {return string();};
    virtual string SHA1Hash() {return string();};
    virtual string FileName() {return string();};
    virtual string MD5Hash() {return string();};
    virtual string SHA1Hash() {return string();};

+   virtual string SHA256Hash() {return string();};

    virtual string SourcePkg() {return string();};
    virtual string SourcePkg() {return string();};

+   virtual string SourceVer() {return string();};

 
    // These are some general stats about the package
    virtual string Maintainer() {return string();};
    virtual string ShortDesc() {return string();};
    virtual string LongDesc() {return string();};
    virtual string Name() {return string();};
 
    // These are some general stats about the package
    virtual string Maintainer() {return string();};
    virtual string ShortDesc() {return string();};
    virtual string LongDesc() {return string();};
    virtual string Name() {return string();};

+   virtual string Homepage() {return string();}

    
    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
    
    virtual ~Parser() {};
 };
    
    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
    
    virtual ~Parser() {};
 };

-
+                                                                       /*}}}*/

 #endif
 #endif