1.1 --- a/samples/main-attribute-value.cc	Thu May 08 11:16:12 2008 -0700
     1.2 +++ b/samples/main-attribute-value.cc	Thu May 08 12:43:36 2008 -0700
     1.3 @@ -68,7 +68,7 @@
     1.4    n0->AddDevice (net0);
     1.5  
     1.6    Ptr<Queue> q = CreateObject<DropTailQueue> ();
     1.7 -  net0->AddQueue(q);
     1.8 +  net0->SetQueue(q);
     1.9  
    1.10    // At this point, we have created a single node (Node 0) and a 
    1.11    // single PointToPointNetDevice (NetDevice 0) and added a 

     2.1 --- a/src/devices/point-to-point/point-to-point-net-device.cc	Thu May 08 11:16:12 2008 -0700
     2.2 +++ b/src/devices/point-to-point/point-to-point-net-device.cc	Thu May 08 12:43:36 2008 -0700
     2.3 @@ -207,14 +207,14 @@
     2.4    return true;
     2.5  }
     2.6  
     2.7 -void PointToPointNetDevice::AddQueue (Ptr<Queue> q)
     2.8 +void PointToPointNetDevice::SetQueue (Ptr<Queue> q)
     2.9  {
    2.10    NS_LOG_FUNCTION (this << q);
    2.11  
    2.12    m_queue = q;
    2.13  }
    2.14  
    2.15 -void PointToPointNetDevice::AddReceiveErrorModel (Ptr<ErrorModel> em)
    2.16 +void PointToPointNetDevice::SetReceiveErrorModel (Ptr<ErrorModel> em)
    2.17  {
    2.18    NS_LOG_FUNCTION ("(" << em << ")");
    2.19  

     3.1 --- a/src/devices/point-to-point/point-to-point-net-device.h	Thu May 08 11:16:12 2008 -0700
     3.2 +++ b/src/devices/point-to-point/point-to-point-net-device.h	Thu May 08 12:43:36 2008 -0700
     3.3 @@ -121,7 +121,7 @@
     3.4     * @param queue a pointer to the queue for which object is assuming
     3.5     *        ownership.
     3.6     */
     3.7 -  void AddQueue (Ptr<Queue> queue);
     3.8 +  void SetQueue (Ptr<Queue> queue);
     3.9    /**
    3.10     * Attach a receive ErrorModel to the PointToPointNetDevice.
    3.11     *
    3.12 @@ -131,7 +131,7 @@
    3.13     * @see ErrorModel
    3.14     * @param em a pointer to the ErrorModel 
    3.15     */
    3.16 -  void AddReceiveErrorModel(Ptr<ErrorModel> em);
    3.17 +  void SetReceiveErrorModel(Ptr<ErrorModel> em);
    3.18    /**
    3.19     * Receive a packet from a connected PointToPointChannel.
    3.20     *

     4.1 --- a/src/devices/point-to-point/point-to-point-test.cc	Thu May 08 11:16:12 2008 -0700
     4.2 +++ b/src/devices/point-to-point/point-to-point-test.cc	Thu May 08 12:43:36 2008 -0700
     4.3 @@ -44,10 +44,10 @@
     4.4  
     4.5    devA->Attach (channel);
     4.6    devA->SetAddress (Mac48Address::Allocate ());
     4.7 -  devA->AddQueue (CreateObject<DropTailQueue> ());
     4.8 +  devA->SetQueue (CreateObject<DropTailQueue> ());
     4.9    devB->Attach (channel);
    4.10    devB->SetAddress (Mac48Address::Allocate ());
    4.11 -  devB->AddQueue (CreateObject<DropTailQueue> ());
    4.12 +  devB->SetQueue (CreateObject<DropTailQueue> ());
    4.13  
    4.14    a->AddDevice (devA);
    4.15    b->AddDevice (devB);

     5.1 --- a/src/helper/point-to-point-helper.cc	Thu May 08 11:16:12 2008 -0700
     5.2 +++ b/src/helper/point-to-point-helper.cc	Thu May 08 12:43:36 2008 -0700
     5.3 @@ -170,12 +170,12 @@
     5.4    devA->SetAddress (Mac48Address::Allocate ());
     5.5    a->AddDevice (devA);
     5.6    Ptr<Queue> queueA = m_queueFactory.Create<Queue> ();
     5.7 -  devA->AddQueue (queueA);
     5.8 +  devA->SetQueue (queueA);
     5.9    Ptr<PointToPointNetDevice> devB = m_deviceFactory.Create<PointToPointNetDevice> ();
    5.10    devB->SetAddress (Mac48Address::Allocate ());
    5.11    b->AddDevice (devB);
    5.12    Ptr<Queue> queueB = m_queueFactory.Create<Queue> ();
    5.13 -  devB->AddQueue (queueB);
    5.14 +  devB->SetQueue (queueB);
    5.15    Ptr<PointToPointChannel> channel = m_channelFactory.Create<PointToPointChannel> ();
    5.16    devA->Attach (channel);
    5.17    devB->Attach (channel);