criss-cross merge with my sid branch

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 123ae69849fedadbf5781ed57e8e669768d932fe..e15314a5e796fbd87a7eb1ded8101e6790bbdc8e 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -29,15 +29,13 @@
 
 #include <string>
 #include <vector>
+#include <map>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/metaindex.h>
 
 using std::string;
 using std::vector;
     
-#ifdef __GNUG__
-#pragma interface "apt-pkg/sourcelist.h"
-#endif
 
 class pkgAquire;
 class pkgSourceList
@@ -60,9 +58,10 @@ class pkgSourceList
       bool FixupURI(string &URI) const;
       virtual bool ParseLine(vector<metaIndex *> &List,
                             const char *Buffer,
-                            unsigned long CurLine,string File) const;
-      virtual bool CreateItem(vector<metaIndex *> &List,string URI,
-                             string Dist,string Section) const = 0;
+                            unsigned long const &CurLine,string const &File) const;
+      virtual bool CreateItem(vector<metaIndex *> &List,string const &URI,
+                             string const &Dist,string const &Section,
+                             std::map<string, string> const &Options) const = 0;
       Type();
       virtual ~Type() {};
    };