convert TraceResolver * to Ptr<TraceResolver>

src/node/net-device.cc

@@ -23,6 +23,7 @@
 #include "ns3/assert.h"
 #include "ns3/object.h"
 #include "ns3/debug.h"
+#include "ns3/trace-resolver.h"
 
 
 #include "channel.h"
@@ -183,7 +184,7 @@ NetDevice::Send(Packet& p, const Address& dest, uint16_t protocolNumber)
     }
 }
 
-TraceResolver *
+Ptr<TraceResolver>
 NetDevice::CreateTraceResolver (void)
 {
   return DoCreateTraceResolver ();

src/node/net-device.h

@@ -69,7 +69,7 @@ public:
    *          performed in this object. The caller must
    *          delete the returned object.
    */
-  TraceResolver *CreateTraceResolver (void);
+  Ptr<TraceResolver> CreateTraceResolver (void);
 
   /**
    * \return the channel this NetDevice is connected to. The value
@@ -290,7 +290,7 @@ public:
    *
    * Subclasses must implement this method.
    */
-  virtual TraceResolver *DoCreateTraceResolver (void) = 0;
+  virtual Ptr<TraceResolver> DoCreateTraceResolver (void) = 0;
   /**
    * \returns the channel associated to this NetDevice.
    *

src/node/node-list.cc

@@ -76,7 +76,7 @@ public:
   uint32_t Add (Ptr<Node> node);
   NodeList::Iterator Begin (void);
   NodeList::Iterator End (void);
-  TraceResolver *CreateTraceResolver (void);
+  Ptr<TraceResolver> CreateTraceResolver (void);
   Ptr<Node> GetNode (uint32_t n);
   uint32_t GetNNodes (void);
 
@@ -130,11 +130,11 @@ NodeListPriv::GetNode (uint32_t n)
 }
 
 
-TraceResolver *
+Ptr<TraceResolver>
 NodeListPriv::CreateTraceResolver (void)
 {
-  ArrayTraceResolver<Ptr<Node>, NodeListIndex> *resolver =
-    new ArrayTraceResolver<Ptr<Node>, NodeListIndex>
+  Ptr<ArrayTraceResolver<Ptr<Node>, NodeListIndex> >resolver =
+    Create<ArrayTraceResolver<Ptr<Node>, NodeListIndex> >
     (MakeCallback (&NodeListPriv::GetNNodes, this),
      MakeCallback (&NodeListPriv::GetNode, this));
   return resolver;
@@ -164,7 +164,7 @@ NodeList::End (void)
 {
   return SimulationSingleton<NodeListPriv>::Get ()->End ();
 }
-TraceResolver *
+Ptr<TraceResolver>
 NodeList::CreateTraceResolver (void)
 {
   return SimulationSingleton<NodeListPriv>::Get ()->CreateTraceResolver ();

src/node/node-list.h

@@ -79,7 +79,7 @@ public:
    * \returns the requested trace resolver. The caller
    *          takes ownership of the returned pointer.
    */
-  static TraceResolver *CreateTraceResolver (void);
+  static Ptr<TraceResolver> CreateTraceResolver (void);
 
   /**
    * \param n index of requested node.

src/node/node.cc

@@ -82,11 +82,11 @@ Node::Construct (void)
 Node::~Node ()
 {}
 
-TraceResolver *
+Ptr<TraceResolver>
 Node::CreateTraceResolver (void)
 {
-  CompositeTraceResolver *resolver = new CompositeTraceResolver ();
-  DoFillTraceResolver (*resolver);
+  Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
+  DoFillTraceResolver (*PeekPointer (resolver));
   return resolver;
 }
 
@@ -141,11 +141,11 @@ Node::GetNApplications (void) const
   return m_applications.size ();
 }
 
-TraceResolver *
+Ptr<TraceResolver>
 Node::CreateDevicesTraceResolver (void)
 {
-  ArrayTraceResolver<Ptr<NetDevice>,NodeNetDeviceIndex> *resolver = 
-    new ArrayTraceResolver<Ptr<NetDevice>,NodeNetDeviceIndex> 
+  Ptr<ArrayTraceResolver<Ptr<NetDevice>,NodeNetDeviceIndex> >resolver = 
+    Create<ArrayTraceResolver<Ptr<NetDevice>,NodeNetDeviceIndex> >
     (MakeCallback (&Node::GetNDevices, this), 
      MakeCallback (&Node::GetDevice, this));
   

src/node/node.h

@@ -92,7 +92,7 @@ public:
    * could be used directly by a user who needs access to very low-level
    * trace configuration.
    */
-  TraceResolver *CreateTraceResolver (void);
+  Ptr<TraceResolver> CreateTraceResolver (void);
 
   /**
    * \returns the unique id of this node.
@@ -212,7 +212,7 @@ private:
   bool ReceiveFromDevice (Ptr<NetDevice> device, const Packet &packet, 
                           uint16_t protocol, const Address &from);
   void Construct (void);
-  TraceResolver *CreateDevicesTraceResolver (void);
+  Ptr<TraceResolver> CreateDevicesTraceResolver (void);
 
   struct ProtocolHandlerEntry {
     ProtocolHandler handler;

src/node/queue.cc

@@ -94,10 +94,10 @@ Queue::~Queue()
   NS_DEBUG("Queue::~Queue ()");
 }
 
-TraceResolver *
+Ptr<TraceResolver>
 Queue::CreateTraceResolver (void)
 {
-  CompositeTraceResolver *resolver = new CompositeTraceResolver ();
+  Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
   resolver->Add ("enqueue", m_traceEnqueue, QueueTraceType (QueueTraceType::ENQUEUE));
   resolver->Add ("dequeue", m_traceDequeue, QueueTraceType (QueueTraceType::DEQUEUE));
   resolver->Add ("drop", m_traceDrop, QueueTraceType (QueueTraceType::DROP));

src/node/queue.h

@@ -70,7 +70,7 @@ public:
   Queue ();
   virtual ~Queue ();
 
-  TraceResolver *CreateTraceResolver (void);
+  Ptr<TraceResolver> CreateTraceResolver (void);
   
   /**
    * \return true if the queue is empty; false otherwise