--- a/src/core/composite-trace-resolver.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/core/composite-trace-resolver.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -38,7 +38,7 @@
 }
 
 void 
-CompositeTraceResolver::AddItem (CompositeItem *item)
+CompositeTraceResolver::AddItem (ResolveItem *item)
 {
   m_items.push_back (item);
 }
@@ -47,7 +47,7 @@
 CompositeTraceResolver::Add (std::string name, 
                              Callback<Ptr<TraceResolver> > createResolver)
 {
-  class MakerCompositeItem : public CompositeItem
+  class MakerResolveItem : public ResolveItem
   {
   public:
     virtual void Connect (std::string subpath, const CallbackBase &cb, const TraceContext &context)
@@ -64,7 +64,7 @@
       this->maker ()->CollectSources (path, ctx, collection);
     }
     Callback<Ptr<TraceResolver> > maker;
-  } *item = new MakerCompositeItem ();
+  } *item = new MakerResolveItem ();
   item->name = name;
   item->context = TraceContext ();
   item->maker = createResolver;
@@ -85,7 +85,7 @@
                                      const TraceSource &trace, 
                                      const TraceContext &context)
 {
-  class SourceCompositeItem : public CompositeItem
+  class SourceResolveItem : public ResolveItem
   {
   public:
     virtual void Connect (std::string subpath, const CallbackBase &cb, const TraceContext &context)
@@ -103,7 +103,7 @@
     }
     TraceSource *trace;
     TraceDoc doc;
-  } *item = new SourceCompositeItem ();
+  } *item = new SourceResolveItem ();
   item->name = name;
   item->context = context;
   item->trace = const_cast<TraceSource *> (&trace);
@@ -115,20 +115,20 @@
 
 
 void 
-CompositeTraceResolver::AddChild (std::string name, Ptr<Object> child)
+CompositeTraceResolver::AddComposite (std::string name, Ptr<Object> composite)
 {
-  DoAddChild (name, child, TraceContext ());
+  DoAddComposite (name, composite, TraceContext ());
 }
 void 
-CompositeTraceResolver::DoAddChild (std::string name, Ptr<Object> child, const TraceContext &context)
+CompositeTraceResolver::DoAddComposite (std::string name, Ptr<Object> composite, const TraceContext &context)
 {
-  class ChildCompositeItem : public CompositeItem
+  class CompositeResolveItem : public ResolveItem
   {
   public:
     virtual void Connect (std::string subpath, const CallbackBase &cb, const TraceContext &context)
-    {child->GetTraceResolver ()->Connect (subpath, cb, context);}
+    {composite->GetTraceResolver ()->Connect (subpath, cb, context);}
     virtual void Disconnect (std::string subpath, const CallbackBase &cb)
-    {child->TraceDisconnect (subpath, cb);}
+    {composite->TraceDisconnect (subpath, cb);}
     virtual void CollectSources (std::string path, const TraceContext &context, 
                                  SourceCollection *collection)
     {
@@ -136,19 +136,19 @@
       path.append (this->name);
       TraceContext ctx = context;
       ctx.Union (this->context);
-      this->child->GetTraceResolver ()->CollectSources (path, ctx, collection);
+      this->composite->GetTraceResolver ()->CollectSources (path, ctx, collection);
     }
 
-    Ptr<Object> child;
-  } *item = new ChildCompositeItem ();
+    Ptr<Object> composite;
+  } *item = new CompositeResolveItem ();
   item->name = name;
   item->context = context;
-  item->child = child;
+  item->composite = composite;
   AddItem (item);
 }
 
 void
-CompositeTraceResolver::SetParent (Ptr<TraceResolver> resolver)
+CompositeTraceResolver::SetParentResolver (Ptr<TraceResolver> resolver)
 {
   m_parent = resolver;
 }
@@ -163,7 +163,7 @@
     ConnectOperation (const CallbackBase &cb, const TraceContext &context)
       : m_cb (cb), m_context (context)
     {}
-    virtual void Do (std::string subpath, CompositeItem *item) const
+    virtual void Do (std::string subpath, ResolveItem *item) const
     {
       NS_DEBUG ("connect to path="<<subpath<<" name="<<item->name);
       TraceContext context = m_context;
@@ -261,7 +261,7 @@
     DisconnectOperation (const CallbackBase &cb)
       : m_cb (cb)
     {}
-    virtual void Do (std::string subpath, CompositeItem *item) const
+    virtual void Do (std::string subpath, ResolveItem *item) const
     {
       NS_DEBUG ("disconnect from path="<<subpath<<" name="<<item->name);
       item->Disconnect (subpath, m_cb);

--- a/src/core/composite-trace-resolver.h	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/core/composite-trace-resolver.h	Tue Aug 28 15:59:49 2007 +0200
@@ -36,7 +36,7 @@
 
 /**
  * \brief a helper class to aggregate contained TraceResolver and other trace sources.
- * \ingroup lowleveltracing
+ * \ingroup tracing
  */
 class CompositeTraceResolver : public TraceResolver
 {
@@ -68,29 +68,29 @@
                   const TraceDoc &doc,
                   const TraceSource &trace);
 
-  void AddChild (std::string name, Ptr<Object> child);
+  void AddComposite (std::string name, Ptr<Object> composite);
 
   template <typename T>
-  void AddChild (std::string name, Ptr<Object> child, const T &contextElement);
+  void AddComposite (std::string name, Ptr<Object> composite, const T &contextElement);
 
   template <typename ITERATOR, typename INDEX>
   void AddArray (std::string name, 
                  ITERATOR begin, ITERATOR end, INDEX index);
 
 
-  void SetParent (Ptr<TraceResolver> parent);
+  void SetParentResolver (Ptr<TraceResolver> parent);
 
+
+private:
   virtual void Connect (std::string path, CallbackBase const &cb, const TraceContext &context);
   virtual void Disconnect (std::string path, CallbackBase const &cb);
   virtual void CollectSources (std::string path, const TraceContext &context, 
                                SourceCollection *collection);
-
-private:
   friend class CompositeTraceResolverTest;
-  class CompositeItem 
+  class ResolveItem 
   {
   public:
-    virtual ~CompositeItem () {}
+    virtual ~ResolveItem () {}
     virtual void Connect (std::string subpath, const CallbackBase &cb, const TraceContext &context) = 0;
     virtual void Disconnect (std::string subpath, const CallbackBase &cb) = 0;
     virtual void CollectSources (std::string path, const TraceContext &context, 
@@ -99,21 +99,21 @@
     std::string name;
     TraceContext context;
   };
-  typedef std::vector<CompositeItem *> TraceItems;
+  typedef std::vector<ResolveItem *> TraceItems;
   class Operation
   {
   public:
     virtual ~Operation () {}
-    virtual void Do (std::string subpath, CompositeItem *item) const = 0;
+    virtual void Do (std::string subpath, ResolveItem *item) const = 0;
     virtual void DoParent (std::string path, Ptr<TraceResolver> parent) const = 0;
   };
 
-  void AddItem (CompositeItem *item);
+  void AddItem (ResolveItem *item);
   void DoRecursiveOperation (std::string path, 
                              const Operation &operation);
   void DoRecursiveOperationForParent (std::string path, 
                                       const Operation &operation);
-  void DoAddChild (std::string name, Ptr<Object> child, const TraceContext &context);
+  void DoAddComposite (std::string name, Ptr<Object> composite, const TraceContext &context);
   void DoAddSource (std::string name,
                     const TraceDoc &doc,
                     const TraceSource &trace,
@@ -149,7 +149,7 @@
 CompositeTraceResolver::AddArray (std::string name, 
                                   ITERATOR begin, ITERATOR end, INDEX index)
 {
-  class ArrayCompositeItem : public CompositeItem
+  class ArrayResolveItem : public ResolveItem
   {
   public:
     virtual void Connect (std::string subpath, const CallbackBase &cb, const TraceContext &context)
@@ -167,7 +167,7 @@
     }
 
     Ptr<ArrayTraceResolver<INDEX> > array;
-  } *item = new ArrayCompositeItem ();
+  } *item = new ArrayResolveItem ();
   item->name = name;
   item->context = TraceContext ();
   item->array = Create<ArrayTraceResolver<INDEX> > ();
@@ -177,11 +177,11 @@
 
 template <typename T>
 void 
-CompositeTraceResolver::AddChild (std::string name, Ptr<Object> child, const T &contextElement)
+CompositeTraceResolver::AddComposite (std::string name, Ptr<Object> composite, const T &contextElement)
 {
   TraceContext context;
   context.AddElement (contextElement);
-  DoAddChild (name, child, context);
+  DoAddComposite (name, composite, context);
 }
 
 

--- a/src/core/object.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/core/object.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -361,7 +361,7 @@
     ns3::Ptr<ns3::CompositeTraceResolver> resolver = 
       ns3::Create<ns3::CompositeTraceResolver> ();
     resolver->AddSource ("basea-x", ns3::TraceDoc ("test source"), m_source);
-    resolver->SetParent (Object::GetTraceResolver ());
+    resolver->SetParentResolver (Object::GetTraceResolver ());
     return resolver;
   }
   ns3::SVTraceSource<int16_t> m_source;
@@ -385,7 +385,7 @@
     ns3::Ptr<ns3::CompositeTraceResolver> resolver = 
       ns3::Create<ns3::CompositeTraceResolver> ();
     resolver->AddSource ("deriveda-x", ns3::TraceDoc ("test source"), m_sourceDerived);
-    resolver->SetParent (BaseA::GetTraceResolver ());
+    resolver->SetParentResolver (BaseA::GetTraceResolver ());
     return resolver;
   }
   ns3::SVTraceSource<int16_t> m_sourceDerived;
@@ -412,7 +412,7 @@
     ns3::Ptr<ns3::CompositeTraceResolver> resolver = 
       ns3::Create<ns3::CompositeTraceResolver> ();
     resolver->AddSource ("baseb-x", ns3::TraceDoc ("test source"), m_source);
-    resolver->SetParent (Object::GetTraceResolver ());
+    resolver->SetParentResolver (Object::GetTraceResolver ());
     return resolver;
   }
   ns3::SVTraceSource<int16_t> m_source;
@@ -436,7 +436,7 @@
     ns3::Ptr<ns3::CompositeTraceResolver> resolver = 
       ns3::Create<ns3::CompositeTraceResolver> ();
     resolver->AddSource ("derivedb-x", ns3::TraceDoc ("test source"), m_sourceDerived);
-    resolver->SetParent (BaseB::GetTraceResolver ());
+    resolver->SetParentResolver (BaseB::GetTraceResolver ());
     return resolver;
   }
   ns3::SVTraceSource<int16_t> m_sourceDerived;

--- a/src/devices/csma/csma-net-device.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/devices/csma/csma-net-device.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -461,7 +461,7 @@
 CsmaNetDevice::GetTraceResolver (void) const
 {
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
-  resolver->AddChild ("queue", m_queue);
+  resolver->AddComposite ("queue", m_queue);
   resolver->AddSource ("rx",
                        TraceDoc ("receive MAC packet",
                                  "const Packet &", "packet received"),
@@ -472,7 +472,7 @@
                                  "const Packet &", "packet dropped"),
                        m_dropTrace,
                        CsmaTraceType (CsmaTraceType::DROP));
-  resolver->SetParent (NetDevice::GetTraceResolver ());
+  resolver->SetParentResolver (NetDevice::GetTraceResolver ());
   return resolver;
 }
 

--- a/src/devices/point-to-point/point-to-point-net-device.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/devices/point-to-point/point-to-point-net-device.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -198,13 +198,13 @@
 PointToPointNetDevice::GetTraceResolver (void) const
 {
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
-  resolver->AddChild ("queue", m_queue);
+  resolver->AddComposite ("queue", m_queue);
   resolver->AddSource ("rx",
                        TraceDoc ("receive MAC packet",
                                  "const Packet &", "packet received"),
                        m_rxTrace,
                        PointToPointTraceType ());
-  resolver->SetParent (NetDevice::GetTraceResolver ());
+  resolver->SetParentResolver (NetDevice::GetTraceResolver ());
   return resolver;
 }
 

--- a/src/internet-node/arp-ipv4-interface.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/internet-node/arp-ipv4-interface.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -46,9 +46,9 @@
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
   if (GetDevice () != 0)
     {
-      resolver->AddChild ("netdevice", GetDevice ());
+      resolver->AddComposite ("netdevice", GetDevice ());
     }
-  resolver->SetParent (Ipv4Interface::GetTraceResolver ());
+  resolver->SetParentResolver (Ipv4Interface::GetTraceResolver ());
   return resolver;
 }
 

--- a/src/internet-node/internet-node.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/internet-node/internet-node.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -79,8 +79,8 @@
 {
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
   Ptr<Ipv4L3Protocol> ipv4 = QueryInterface<Ipv4L3Protocol> (Ipv4L3Protocol::iid);
-  resolver->AddChild ("ipv4", ipv4);
-  resolver->SetParent (Node::GetTraceResolver ());
+  resolver->AddComposite ("ipv4", ipv4);
+  resolver->SetParentResolver (Node::GetTraceResolver ());
   return resolver;
 }
 

--- a/src/internet-node/ipv4-l4-demux.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/internet-node/ipv4-l4-demux.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -94,9 +94,9 @@
       std::ostringstream oss (protValue);
       oss << (*i)->GetProtocolNumber ();
       Ipv4L4ProtocolTraceContextElement protocolNumber = (*i)->GetProtocolNumber ();
-      resolver->AddChild (protValue, protocol, protocolNumber);
+      resolver->AddComposite (protValue, protocol, protocolNumber);
     }
-  resolver->SetParent (Object::GetTraceResolver ());
+  resolver->SetParentResolver (Object::GetTraceResolver ());
   return resolver;
 }
 void

--- a/src/mobility/mobility-model-notifier.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/mobility/mobility-model-notifier.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -50,7 +50,7 @@
                                  "Ptr<const MobilityModel>", 
                                  "the mobility model whose course changed"),
                        m_trace);
-  resolver->SetParent (Object::GetTraceResolver ());
+  resolver->SetParentResolver (Object::GetTraceResolver ());
   return resolver;
 }
 

--- a/src/node/node.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/node/node.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -91,7 +91,7 @@
 {
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
   resolver->AddArray ("devices", m_devices.begin (), m_devices.end (), NodeNetDeviceIndex ());
-  resolver->SetParent (Object::GetTraceResolver ());
+  resolver->SetParentResolver (Object::GetTraceResolver ());
   return resolver;
 }
 

--- a/src/node/queue.cc	Tue Aug 28 15:04:37 2007 +0200
+++ b/src/node/queue.cc	Tue Aug 28 15:59:49 2007 +0200
@@ -115,7 +115,7 @@
                        TraceDoc ("drop packet from queue", 
                                  "const Packet &", "packet dropped"),
                        m_traceDrop, QueueTraceType (QueueTraceType::DROP));
-  resolver->SetParent (Object::GetTraceResolver ());
+  resolver->SetParentResolver (Object::GetTraceResolver ());
   return resolver;
 }