--- a/examples/simple-point-to-point.cc	Thu Sep 06 12:56:31 2007 +0200
+++ b/examples/simple-point-to-point.cc	Thu Sep 06 13:32:29 2007 +0200
@@ -179,7 +179,7 @@
   asciitrace.TraceAllQueues ();
   asciitrace.TraceAllNetDeviceRx ();
 
-  NodeList::ConnectPrinterToAll (std::cout);
+  NodeList::TraceAll (std::cout);
 
   // Also configure some tcpdump traces; each interface will be traced
   // The output files will be named 

--- a/src/core/array-trace-resolver.h	Thu Sep 06 12:56:31 2007 +0200
+++ b/src/core/array-trace-resolver.h	Thu Sep 06 13:32:29 2007 +0200
@@ -64,7 +64,7 @@
   virtual void Disconnect (std::string path, CallbackBase const &cb);
   virtual void CollectSources (std::string path, const TraceContext &context, 
                                SourceCollection *collection);
-  virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context);
+  virtual void TraceAll (std::ostream &os, const TraceContext &context);
 
 private:
   class IteratorBase
@@ -186,7 +186,7 @@
 
 template <typename INDEX>
 void 
-ArrayTraceResolver<INDEX>::ConnectPrinterToAll (std::ostream &os, const TraceContext &context)
+ArrayTraceResolver<INDEX>::TraceAll (std::ostream &os, const TraceContext &context)
 {
   uint32_t j = 0;
   for (m_iter->Rewind (); m_iter->HasNext (); m_iter->Next ())
@@ -195,7 +195,7 @@
         INDEX index = j;
         tmp.AddElement (index);
         Ptr<Object> obj = m_iter->Get ();
-        obj->GetTraceResolver ()->ConnectPrinterToAll (os, tmp);
+        obj->GetTraceResolver ()->TraceAll (os, tmp);
         j++;
     }
 }

--- a/src/core/composite-trace-resolver.cc	Thu Sep 06 12:56:31 2007 +0200
+++ b/src/core/composite-trace-resolver.cc	Thu Sep 06 13:32:29 2007 +0200
@@ -63,11 +63,11 @@
       ctx.Union (this->context);
       this->maker ()->CollectSources (path, ctx, collection);
     }
-    virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context)
+    virtual void TraceAll (std::ostream &os, const TraceContext &context)
     {
       TraceContext ctx = context;
       ctx.Union (this->context);
-      this->maker ()->ConnectPrinterToAll (os, ctx);
+      this->maker ()->TraceAll (os, ctx);
     }
     Callback<Ptr<TraceResolver> > maker;
   } *item = new MakerResolveItem ();
@@ -107,7 +107,7 @@
       ctx.Union (this->context);
       collection->AddUnique (path, ctx, this->doc);
     }
-    virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context)
+    virtual void TraceAll (std::ostream &os, const TraceContext &context)
     {
       TraceContext ctx = context;
       ctx.Union (this->context);
@@ -150,11 +150,11 @@
       ctx.Union (this->context);
       this->composite->GetTraceResolver ()->CollectSources (path, ctx, collection);
     }
-    virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context)
+    virtual void TraceAll (std::ostream &os, const TraceContext &context)
     {
       TraceContext ctx = context;
       ctx.Union (this->context);
-      this->composite->GetTraceResolver ()->ConnectPrinterToAll (os, ctx);
+      this->composite->GetTraceResolver ()->TraceAll (os, ctx);
     }
 
     Ptr<Object> composite;
@@ -312,16 +312,16 @@
     }
 }
 void 
-CompositeTraceResolver::ConnectPrinterToAll (std::ostream &os, const TraceContext &context)
+CompositeTraceResolver::TraceAll (std::ostream &os, const TraceContext &context)
 {
   for (TraceItems::const_iterator i = m_items.begin (); i != m_items.end (); i++)
     {
       NS_DEBUG ("print " << (*i)->name);
-      (*i)->ConnectPrinterToAll (os, context);
+      (*i)->TraceAll (os, context);
     }
   if (m_parent != 0)
     {
-      m_parent->ConnectPrinterToAll (os, context);
+      m_parent->TraceAll (os, context);
     }  
 }
 

--- a/src/core/composite-trace-resolver.h	Thu Sep 06 12:56:31 2007 +0200
+++ b/src/core/composite-trace-resolver.h	Thu Sep 06 13:32:29 2007 +0200
@@ -120,7 +120,7 @@
   virtual void Disconnect (std::string path, CallbackBase const &cb);
   virtual void CollectSources (std::string path, const TraceContext &context, 
                                SourceCollection *collection);
-  virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context);
+  virtual void TraceAll (std::ostream &os, const TraceContext &context);
   friend class CompositeTraceResolverTest;
   class ResolveItem 
   {
@@ -130,7 +130,7 @@
     virtual void Disconnect (std::string subpath, const CallbackBase &cb) = 0;
     virtual void CollectSources (std::string path, const TraceContext &context, 
                                  SourceCollection *collection) = 0;
-    virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context) = 0;
+    virtual void TraceAll (std::ostream &os, const TraceContext &context) = 0;
 
     std::string name;
     TraceContext context;
@@ -201,11 +201,11 @@
       ctx.Union (this->context);
       array->CollectSources (path, ctx, collection);
     }
-    virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context)
+    virtual void TraceAll (std::ostream &os, const TraceContext &context)
     {
       TraceContext ctx = context;
       ctx.Union (this->context);
-      array->ConnectPrinterToAll (os, ctx);
+      array->TraceAll (os, ctx);
     }
 
     Ptr<ArrayTraceResolver<INDEX> > array;

--- a/src/core/object.cc	Thu Sep 06 12:56:31 2007 +0200
+++ b/src/core/object.cc	Thu Sep 06 13:32:29 2007 +0200
@@ -68,7 +68,7 @@
   virtual void Disconnect (std::string path, CallbackBase const &cb);
   virtual void CollectSources (std::string path, const TraceContext &context, 
                                SourceCollection *collection);
-  virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context);
+  virtual void TraceAll (std::ostream &os, const TraceContext &context);
 private:
   Ptr<const Object> ParseForInterface (std::string path);
   Ptr<const Object> m_aggregate;
@@ -116,9 +116,9 @@
   m_aggregate->DoCollectSources (path, context, collection);
 }
 void 
-InterfaceIdTraceResolver::ConnectPrinterToAll (std::ostream &os, const TraceContext &context)
+InterfaceIdTraceResolver::TraceAll (std::ostream &os, const TraceContext &context)
 {
-  m_aggregate->DoConnectPrinterToAll (os, context);
+  m_aggregate->DoTraceAll (os, context);
 }
 
 
@@ -340,7 +340,7 @@
   m_collecting = false;
 }
 void 
-Object::DoConnectPrinterToAll (std::ostream &os, const TraceContext &context) const
+Object::DoTraceAll (std::ostream &os, const TraceContext &context) const
 {
   const Object *current;
   current = this;
@@ -358,7 +358,7 @@
   while (current != this)
     {
       NS_ASSERT (current != 0);
-      current->GetTraceResolver ()->ConnectPrinterToAll (os, context);
+      current->GetTraceResolver ()->TraceAll (os, context);
       current = current->m_next;
     }
 

--- a/src/core/object.h	Thu Sep 06 12:56:31 2007 +0200
+++ b/src/core/object.h	Thu Sep 06 13:32:29 2007 +0200
@@ -184,7 +184,7 @@
   Ptr<Object> DoQueryInterface (InterfaceId iid) const;
   void DoCollectSources (std::string path, const TraceContext &context, 
                          TraceResolver::SourceCollection *collection) const;
-  void DoConnectPrinterToAll (std::ostream &os, const TraceContext &context) const;
+  void DoTraceAll (std::ostream &os, const TraceContext &context) const;
   bool Check (void) const;
   void MaybeDelete (void) const;
   mutable uint32_t m_count;

--- a/src/core/trace-resolver.h	Thu Sep 06 12:56:31 2007 +0200
+++ b/src/core/trace-resolver.h	Thu Sep 06 13:32:29 2007 +0200
@@ -101,7 +101,7 @@
   virtual void CollectSources (std::string path, const TraceContext &context, 
                                SourceCollection *collection) = 0;
 
-  virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context) = 0;
+  virtual void TraceAll (std::ostream &os, const TraceContext &context) = 0;
 protected:
   /**
    * \param path a namespace path

--- a/src/node/node-list.cc	Thu Sep 06 12:56:31 2007 +0200
+++ b/src/node/node-list.cc	Thu Sep 06 13:32:29 2007 +0200
@@ -172,9 +172,9 @@
   SimulationSingleton<NodeListPriv>::Get ()->GetTraceResolver ()->Disconnect (name, cb);
 }
 void 
-NodeList::ConnectPrinterToAll (std::ostream &os)
+NodeList::TraceAll (std::ostream &os)
 {
-  SimulationSingleton<NodeListPriv>::Get ()->GetTraceResolver ()->ConnectPrinterToAll (os, TraceContext ());
+  SimulationSingleton<NodeListPriv>::Get ()->GetTraceResolver ()->TraceAll (os, TraceContext ());
 }
 Ptr<TraceResolver> 
 NodeList::GetTraceResolver (void)

--- a/src/node/node-list.h	Thu Sep 06 12:56:31 2007 +0200
+++ b/src/node/node-list.h	Thu Sep 06 13:32:29 2007 +0200
@@ -101,7 +101,7 @@
    * the input namespace regexp.
    */
   static void Disconnect (std::string name, const CallbackBase &cb);
-  static void ConnectPrinterToAll (std::ostream &os);
+  static void TraceAll (std::ostream &os);
   static Ptr<TraceResolver> GetTraceResolver (void);
 private:
 };