Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 0ccb4aa0052c8f7311ac4b14d778207e5df6d892..261dd81613739286ecb2d2bdec625d37317c0b82 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -27,23 +27,40 @@
 #ifndef PKGLIB_SOURCELIST_H
 #define PKGLIB_SOURCELIST_H
 
 #ifndef PKGLIB_SOURCELIST_H
 #define PKGLIB_SOURCELIST_H
 

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <time.h>
+

 #include <string>
 #include <vector>
 #include <map>
 #include <string>
 #include <vector>
 #include <map>

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

 
 

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

 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/metaindex.h>
 using std::string;
 using std::vector;
 #endif
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/metaindex.h>
 using std::string;
 using std::vector;
 #endif
 

+class FileFd;
+class pkgTagSection;

 class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
 
 class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
 

-class pkgSourceList
+class pkgSource
+{
+   protected:
+
+   std::vector<metaIndex *> SrcList;
+
+};
+
+class pkgSourceList : public pkgSource

 {
    public:
    
 {
    public:
    


@@ -55,7 +72,7 @@ class pkgSourceList
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;

-      static Type *GetType(const char *Type);
+      static Type *GetType(const char *Type) APT_PURE;

 
       const char *Name;
       const char *Label;
 
       const char *Name;
       const char *Label;


@@ -77,7 +94,7 @@ class pkgSourceList
    
    typedef std::vector<metaIndex *>::const_iterator const_iterator;
    
    
    typedef std::vector<metaIndex *>::const_iterator const_iterator;
    

-   protected:
+   public:

 
    std::vector<metaIndex *> SrcList;
 
 
    std::vector<metaIndex *> SrcList;