just-in-time creation for (explicit) negative deps

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index c92643829f952242042831d4f7708338360c36e3..d801314380db17d03f0912a338354a55161c79bc 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -17,10 +17,6 @@
    list all you have is a list of package index files that have the ability
    to be Acquired.
    
    list all you have is a list of package index files that have the ability
    to be Acquired.
    

-   The vendor machanism is similar, except the vendor types are hard 
-   wired. Before loading the source list the vendor list is loaded.
-   This doesn't load key data, just the checks to perform.
-   

    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_SOURCELIST_H
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_SOURCELIST_H


@@ -53,7 +49,7 @@ class metaIndex;
 
 class pkgSourceList
 {
 
 class pkgSourceList
 {

-   void *d;
+   void * const d;

    public:
 
    // List of supported source list types
    public:
 
    // List of supported source list types


@@ -66,22 +62,22 @@ class pkgSourceList
       static unsigned long GlobalListLen;
       static Type *GetType(const char *Type) APT_PURE;
 
       static unsigned long GlobalListLen;
       static Type *GetType(const char *Type) APT_PURE;
 

-      const char *Name;
-      const char *Label;
+      char const * const Name;
+      char const * const Label;

 
       bool FixupURI(std::string &URI) const;
       virtual bool ParseStanza(std::vector<metaIndex *> &List,
                                pkgTagSection &Tags,
 
       bool FixupURI(std::string &URI) const;
       virtual bool ParseStanza(std::vector<metaIndex *> &List,
                                pkgTagSection &Tags,

-                               int stanza_n,
+                               unsigned int const stanza_n,

                                FileFd &Fd);
       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,
                                FileFd &Fd);
       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,

-                            unsigned long const &CurLine,std::string const &File) const;
+                            unsigned int const CurLine,std::string const &File) const;

       virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI,
                              std::string const &Dist,std::string const &Section,
                              std::map<std::string, std::string> const &Options) const = 0;
       virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI,
                              std::string const &Dist,std::string const &Section,
                              std::map<std::string, std::string> const &Options) const = 0;

-      Type();
-      virtual ~Type() {};
+      Type(char const * const Name, char const * const Label);
+      virtual ~Type();

    };
 
    typedef std::vector<metaIndex *>::const_iterator const_iterator;
    };
 
    typedef std::vector<metaIndex *>::const_iterator const_iterator;


@@ -90,18 +86,19 @@ class pkgSourceList
 
    std::vector<metaIndex *> SrcList;
 
 
    std::vector<metaIndex *> SrcList;
 

-   int ParseFileDeb822(std::string File);
-   bool ParseFileOldStyle(std::string File);
+   private:
+   APT_HIDDEN bool ParseFileDeb822(std::string const &File);
+   APT_HIDDEN bool ParseFileOldStyle(std::string const &File);

 
    public:
 
    bool ReadMainList();
 
    public:
 
    bool ReadMainList();

-   bool Read(std::string File);
+   bool Read(std::string const &File);

 
    // CNC:2003-03-03
    void Reset();
 
    // CNC:2003-03-03
    void Reset();

-   bool ReadAppend(std::string File);
-   bool ReadSourceDir(std::string Dir);
+   bool ReadAppend(std::string const &File);
+   bool ReadSourceDir(std::string const &Dir);

    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};
    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};


@@ -117,7 +114,6 @@ class pkgSourceList
    time_t GetLastModifiedTime();
 
    pkgSourceList();
    time_t GetLastModifiedTime();
 
    pkgSourceList();

-   pkgSourceList(std::string File);

    virtual ~pkgSourceList();
 };
 
    virtual ~pkgSourceList();
 };