1.1 --- a/src/core/object.h	Sun Mar 02 21:00:37 2008 +0100
     1.2 +++ b/src/core/object.h	Mon Mar 03 01:58:57 2008 +0100
     1.3 @@ -23,8 +23,8 @@
     1.4  
     1.5  #include <stdint.h>
     1.6  #include <string>
     1.7 +#include <vector>
     1.8  #include "ptr.h"
     1.9 -#include "trace-resolver.h"
    1.10  #include "callback.h"
    1.11  #include "attribute.h"
    1.12  #include "object-base.h"
    1.13 @@ -42,7 +42,6 @@
    1.14  
    1.15  namespace ns3 {
    1.16  
    1.17 -class TraceContext;
    1.18  class CallbackBase;
    1.19  class Object;
    1.20  class AttributeAccessor;
    1.21 @@ -444,29 +443,6 @@
    1.22     */
    1.23    void AggregateObject (Ptr<Object> other);
    1.24  
    1.25 -  /**
    1.26 -   * \param path the path to match for the callback
    1.27 -   * \param cb callback to connect
    1.28 -   *
    1.29 -   * Connect the input callback to all trace sources which
    1.30 -   * match the input path.
    1.31 -   *
    1.32 -   */
    1.33 -  void TraceConnect (std::string path, const CallbackBase &cb) const;
    1.34 -  /**
    1.35 -   * \param path the path to match for the callback
    1.36 -   * \param cb callback to disconnect
    1.37 -   *
    1.38 -   * Disconnect the input callback from all trace sources which
    1.39 -   * match the input path.
    1.40 -   */
    1.41 -  void TraceDisconnect (std::string path, const CallbackBase &cb) const;
    1.42 -  /**
    1.43 -   * \returns the trace resolver associated to this object.
    1.44 -   *
    1.45 -   * This method should be rarely called by users.
    1.46 -   */
    1.47 -  virtual Ptr<TraceResolver> GetTraceResolver (void) const;
    1.48  protected:
    1.49    /**
    1.50     * This method is called by Object::Dispose.
    1.51 @@ -476,8 +452,6 @@
    1.52    virtual void DoDispose (void);
    1.53    virtual void NotifyConstructionCompleted (void);
    1.54  private:
    1.55 -  friend class TypeIdTraceResolver;
    1.56 -
    1.57    template <typename T>
    1.58    friend Ptr<T> CreateObject (const AttributeList &attributes);
    1.59  
    1.60 @@ -502,9 +476,6 @@
    1.61    bool DoSet (Ptr<const AttributeAccessor> spec, Attribute intialValue, 
    1.62                Ptr<const AttributeChecker> checker, Attribute value);
    1.63    Ptr<Object> DoGetObject (TypeId tid) const;
    1.64 -  void DoCollectSources (std::string path, const TraceContext &context, 
    1.65 -                         TraceResolver::SourceCollection *collection) const;
    1.66 -  void DoTraceAll (std::ostream &os, const TraceContext &context) const;
    1.67    bool Check (void) const;
    1.68    bool CheckLoose (void) const;
    1.69    /**