* merged with main

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

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 84a8cf07ea3482774dbf93c32a612039ea7d961d..789bc82cfb6c70ad43270dade76ab647afdada84 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: configuration.h,v 1.13 2001/03/11 07:22:19 jgg Exp $
+// $Id: configuration.h,v 1.16 2002/11/11 06:55:50 doogie Exp $
 /* ######################################################################
 
    Configuration Class
@@ -33,6 +33,9 @@
 #endif 
 
 #include <string>
+#include <iostream>
+
+using std::string;
 
 class Configuration
 {
@@ -84,11 +87,17 @@ class Configuration
    bool Exists(const char *Name) const;
    bool ExistsAny(const char *Name) const;
 
+   // clear a whole tree
    void Clear(string Name);
-   
+
+   // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
+   void Clear(string List, string Value);
+   void Clear(string List, int Value);
+
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 
-   void Dump();
+   inline void Dump() { Dump(std::clog); };
+   void Dump(std::ostream& str);
 
    Configuration(const Item *Root);
    Configuration();