--- a/src/mobility/mobility-model-notifier.cc	Sun Mar 02 22:34:27 2008 +0100
+++ b/src/mobility/mobility-model-notifier.cc	Sun Mar 02 22:52:21 2008 +0100
@@ -18,8 +18,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "mobility-model-notifier.h"
-#include "ns3/composite-trace-resolver.h"
-#include "ns3/trace-doc.h"
+#include "ns3/trace-source-accessor.h"
 
 namespace ns3 {
 
@@ -28,7 +27,11 @@
 {
   static TypeId tid = TypeId ("MobilityModelNotifier")
     .SetParent<Object> ()
-    .AddConstructor<MobilityModelNotifier> ();
+    .AddConstructor<MobilityModelNotifier> ()
+    .AddTraceSource ("CourseChange", 
+                     "The value of the position and/or velocity vector changed",
+                     MakeTraceSourceAccessor (&MobilityModelNotifier::m_trace))
+    ;
   return tid;
 }
 
@@ -41,18 +44,4 @@
   m_trace (position);
 }
 
-Ptr<TraceResolver> 
-MobilityModelNotifier::GetTraceResolver (void) const
-{
-  Ptr<CompositeTraceResolver> resolver = 
-    Create<CompositeTraceResolver> ();
-  resolver->AddSource ("course-change", 
-                       TraceDoc ("The value of the position and/or velocity vector changed",
-                                 "Ptr<const MobilityModel>", 
-                                 "the mobility model whose course changed"),
-                       m_trace);
-  resolver->SetParentResolver (Object::GetTraceResolver ());
-  return resolver;
-}
-
 } // namespace ns3

--- a/src/mobility/mobility-model-notifier.h	Sun Mar 02 22:34:27 2008 +0100
+++ b/src/mobility/mobility-model-notifier.h	Sun Mar 02 22:52:21 2008 +0100
@@ -22,7 +22,7 @@
 
 #include "ns3/object.h"
 #include "ns3/callback.h"
-#include "ns3/callback-trace-source.h"
+#include "ns3/traced-callback.h"
 #include "mobility-model.h"
 
 namespace ns3 {
@@ -44,10 +44,8 @@
    * \param position the position which just changed.
    */
   void Notify (Ptr<const MobilityModel> position) const;
-protected:
-  virtual Ptr<TraceResolver> GetTraceResolver (void) const;
 private:
-  CallbackTraceSource<Ptr<const MobilityModel> > m_trace;
+  TracedCallback<Ptr<const MobilityModel> > m_trace;
 };
 
 } // namespace ns3