* apt-pkg/contrib/configuration.cc:

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

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 41d712fbfac6b194af4b9983a17f95e6a6c61852..386d291a2e1378a260a977e03db9137f04fe4748 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -12,9 +12,12 @@
 #define PKGLIB_DEBLISTPARSER_H
 
 #include <apt-pkg/pkgcachegen.h>
 #define PKGLIB_DEBLISTPARSER_H
 
 #include <apt-pkg/pkgcachegen.h>

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

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

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

 class debListParser : public pkgCacheGenerator::ListParser
 {
    public:
 class debListParser : public pkgCacheGenerator::ListParser
 {
    public:


@@ -34,7 +37,7 @@ class debListParser : public pkgCacheGenerator::ListParser
    pkgTagFile Tags;
    pkgTagSection Section;
    unsigned long iOffset;
    pkgTagFile Tags;
    pkgTagSection Section;
    unsigned long iOffset;

-   string Arch;
+   std::string Arch;

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


@@ -43,21 +46,21 @@ class debListParser : public pkgCacheGenerator::ListParser
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
                     unsigned int Type);
    bool ParseProvides(pkgCache::VerIterator &Ver);
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
                     unsigned int Type);
    bool ParseProvides(pkgCache::VerIterator &Ver);

-   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, string const &Package, string const &Version);
-   static bool GrabWord(string Word,WordList *List,unsigned char &Out);
+   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string const &Package, std::string const &Version);
+   static bool GrabWord(std::string Word,WordList *List,unsigned char &Out);

    
    public:
 
    
    public:
 

-   static unsigned char GetPrio(string Str);
+   static unsigned char GetPrio(std::string Str);

       
    // These all operate against the current section
       
    // These all operate against the current section

-   virtual string Package();
-   virtual string Architecture();
+   virtual std::string Package();
+   virtual std::string Architecture();

    virtual bool ArchitectureAll();
    virtual bool ArchitectureAll();

-   virtual string Version();
+   virtual std::string Version();

    virtual bool NewVersion(pkgCache::VerIterator &Ver);
    virtual bool NewVersion(pkgCache::VerIterator &Ver);

-   virtual string Description();
-   virtual string DescriptionLanguage();
+   virtual std::string Description();
+   virtual std::string DescriptionLanguage();

    virtual MD5SumValue Description_md5();
    virtual unsigned short VersionHash();
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
    virtual MD5SumValue Description_md5();
    virtual unsigned short VersionHash();
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,


@@ -68,15 +71,15 @@ class debListParser : public pkgCacheGenerator::ListParser
    virtual bool Step();
    
    bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
    virtual bool Step();
    
    bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,

-                       string section);
+                       std::string section);

    
    static const char *ParseDepends(const char *Start,const char *Stop,
    
    static const char *ParseDepends(const char *Start,const char *Stop,

-                           string &Package,string &Ver,unsigned int &Op,
+                           std::string &Package,std::string &Ver,unsigned int &Op,

                            bool const &ParseArchFlags = false,
                            bool const &StripMultiArch = true);
    static const char *ConvertRelation(const char *I,unsigned int &Op);
 
                            bool const &ParseArchFlags = false,
                            bool const &StripMultiArch = true);
    static const char *ConvertRelation(const char *I,unsigned int &Op);
 

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

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