releasing 1.1~exp14

[apt.git] / apt-pkg / deb / deblistparser.h

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 30e52718d42b1ba740c52b6593d2c854072ce0c0..0884479db7a512773da2db7f0f253c67031c666c 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -26,7 +26,7 @@
 
 class FileFd;
 
 
 class FileFd;
 

-class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
+class APT_HIDDEN debListParser : public pkgCacheListParser

 {
    public:
 
 {
    public:
 


@@ -45,9 +45,6 @@ class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
    pkgTagFile Tags;
    pkgTagSection Section;
    map_filesize_t iOffset;
    pkgTagFile Tags;
    pkgTagSection Section;
    map_filesize_t iOffset;

-   std::string Arch;
-   std::vector<std::string> Architectures;
-   bool MultiArchEnabled;

 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,


@@ -96,7 +93,7 @@ class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
 
    APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op);
 
 
    APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op);
 

-   debListParser(FileFd *File, std::string const &Arch = "");
+   debListParser(FileFd *File);

    virtual ~debListParser();
 };
 
    virtual ~debListParser();
 };
 


@@ -118,8 +115,15 @@ class APT_HIDDEN debTranslationsParser : public debListParser
    virtual std::string Architecture() APT_OVERRIDE { return ""; }
    virtual std::string Version() APT_OVERRIDE { return ""; }
 
    virtual std::string Architecture() APT_OVERRIDE { return ""; }
    virtual std::string Version() APT_OVERRIDE { return ""; }
 

-   debTranslationsParser(FileFd *File, std::string const &Arch = "")
-      : debListParser(File, Arch) {};
+   debTranslationsParser(FileFd *File)
+      : debListParser(File) {};

 };
 
 };
 

+class APT_HIDDEN debStatusListParser : public debListParser
+{
+ public:
+   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
+   debStatusListParser(FileFd *File)
+      : debListParser(File) {};
+};

 #endif
 #endif