rename CleaAll() -> Clear()

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 43533e5bb03b059f71ecbb8c7ac83470c0013d59..95c7cb96ee91bb274cdc927f00a4f91b0765d91f 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -405,8 +405,9 @@ void Configuration::Clear(string const &Name, string const &Value)
      
 }
                                                                        /*}}}*/
      
 }
                                                                        /*}}}*/

-// Configuration::ClearAll - Clear everything                          /*{{{*/
-void Configuration::ClearAll()
+// Configuration::Clear - Clear everything                             /*{{{*/
+// ---------------------------------------------------------------------
+void Configuration::Clear()

 {
    const Configuration::Item *Top = Tree(0);
    while( Top != 0 )
 {
    const Configuration::Item *Top = Tree(0);
    while( Top != 0 )

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 181ef696b840dc275bc34004bec03bd4e3afa262..d9c6a30b532b1298bc4ff1b76fc943885e59e9ec 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -94,7 +94,7 @@ class Configuration
 
    // clear a whole tree
    void Clear(const std::string &Name);
 
    // clear a whole tree
    void Clear(const std::string &Name);

-   void ClearAll();
+   void Clear();

 
    // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
    void Clear(std::string const &List, std::string const &Value);
 
    // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
    void Clear(std::string const &List, std::string const &Value);

diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
index 5ec48834a74400520158771d1a3c0af53ec89b34..5120e86c9c75d4ddaae0b11a173b601160aff1ab 100644 (file)
--- a/test/libapt/configuration_test.cc
+++ b/test/libapt/configuration_test.cc
@@ -81,7 +81,7 @@ int main(int argc,const char *argv[]) {
        equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
 
         Cnf.Set("Moo::Bar", "1");
        equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
 
         Cnf.Set("Moo::Bar", "1");

-        Cnf.ClearAll();
+        Cnf.Clear();

         equals(Cnf.Find("Moo::Bar"), "");
 
        //FIXME: Test for configuration file parsing;
         equals(Cnf.Find("Moo::Bar"), "");
 
        //FIXME: Test for configuration file parsing;