summaryrefslogtreecommitdiff
path: root/apt-pkg/metaindex.h
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2011-10-14 13:55:50 +0200
committerMichael Vogt <egon@debian-devbox>2011-10-14 13:55:50 +0200
commita1e68c33ac15be454984b00d62c7fc331bd0b32b (patch)
treeabf59def54f9df6bbf9aa380b1314364482d8b1c /apt-pkg/metaindex.h
parent7be8c02360bdb9bd7f59b087da874f88af2a7206 (diff)
parent0e7c33134cd32410eb8b344c6b6577826238bbbc (diff)
merged lp:~donkult/apt/experimental
Diffstat (limited to 'apt-pkg/metaindex.h')
-rw-r--r--apt-pkg/metaindex.h23
1 files changed, 9 insertions, 14 deletions
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index f60235a5d..9cc79a7a6 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -4,12 +4,7 @@
#include <string>
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/indexfile.h>
-#include <apt-pkg/vendor.h>
-
-using std::string;
class pkgAcquire;
class pkgCacheGenerator;
@@ -18,35 +13,35 @@ class OpProgress;
class metaIndex
{
protected:
- vector <pkgIndexFile *> *Indexes;
+ std::vector <pkgIndexFile *> *Indexes;
const char *Type;
- string URI;
- string Dist;
+ std::string URI;
+ std::string Dist;
bool Trusted;
public:
// 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;}
// Interface for acquire
- virtual string ArchiveURI(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 vector<pkgIndexFile *> *GetIndexFiles() = 0;
+ virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0;
virtual bool IsTrusted() const = 0;
- metaIndex(string const &URI, string const &Dist, char const * const Type) :
+ metaIndex(std::string const &URI, std::string const &Dist, char const * const Type) :
Indexes(NULL), Type(Type), URI(URI), Dist(Dist) {
}
virtual ~metaIndex() {
if (Indexes == 0)
return;
- for (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;
}