Fixed espy's bug with experimental

[apt.git] / apt-pkg / contrib / configuration.h

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index cf5a90f5741c6f5c5056ded56b619263687ec0fd..aeb181c7ac5c585a516cdd40fd3b1f1e9be01ced 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: configuration.h,v 1.7 1998/10/30 07:53:44 jgg Exp $
+// $Id: configuration.h,v 1.11 1999/04/03 00:34:33 jgg Exp $

 /* ######################################################################
 
    Configuration Class
 /* ######################################################################
 
    Configuration Class


@@ -14,13 +14,17 @@
    And has associated with it a text string. The Configuration class only
    provides storage and lookup for this tree, other classes provide
    configuration file formats (and parsers/emitters if needed).
    And has associated with it a text string. The Configuration class only
    provides storage and lookup for this tree, other classes provide
    configuration file formats (and parsers/emitters if needed).

-   
+

    Most things can get by quite happily with,
      cout << _config->Find("Foo::Bar") << endl;
    Most things can get by quite happily with,
      cout << _config->Find("Foo::Bar") << endl;

+
+   A special extension, support for ordered lists is provided by using the
+   special syntax, "block::list::" the trailing :: designates the 
+   item as a list. To access the list you must use the tree function on
+   "block::list".

    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_CONFIGURATION_H
 #define PKGLIB_CONFIGURATION_H
 
 #ifndef PKGLIB_CONFIGURATION_H
 #define PKGLIB_CONFIGURATION_H
 


@@ -42,7 +46,7 @@ class Configuration
       
       string FullTag() const;
       
       
       string FullTag() const;
       

-      Item() : Child(0), Next(0) {};
+      Item() : Parent(0), Child(0), Next(0) {};

    };
    Item *Root;
    
    };
    Item *Root;
    


@@ -52,10 +56,13 @@ class Configuration
    public:
 
    string Find(const char *Name,const char *Default = 0);
    public:
 
    string Find(const char *Name,const char *Default = 0);

+   string Find(string Name,const char *Default = 0) {return Find(Name.c_str(),Default);};

    string FindFile(const char *Name,const char *Default = 0);
    string FindDir(const char *Name,const char *Default = 0);
    int FindI(const char *Name,int Default = 0);
    string FindFile(const char *Name,const char *Default = 0);
    string FindDir(const char *Name,const char *Default = 0);
    int FindI(const char *Name,int Default = 0);

+   int FindI(string Name,bool Default = 0) {return FindI(Name.c_str(),Default);};

    bool FindB(const char *Name,bool Default = false);
    bool FindB(const char *Name,bool Default = false);

+   bool FindB(string Name,bool Default = false) {return FindB(Name.c_str(),Default);};

              
    inline void Set(string Name,string Value) {Set(Name.c_str(),Value);};
    void Set(const char *Name,string Value);
              
    inline void Set(string Name,string Value) {Set(Name.c_str(),Value);};
    void Set(const char *Name,string Value);