--- a/src/internet-node/udp-socket.h	Tue Jul 31 11:42:25 2007 +0200
+++ b/src/internet-node/udp-socket.h	Wed Aug 01 08:58:18 2007 +0200
@@ -51,23 +51,23 @@
   virtual int ShutdownRecv (void);
 
 private:
-  virtual void DoClose(ns3::Callback<void, Ptr<Socket> > closeCompleted);
-  virtual void DoConnect(const Address & address,
-			 ns3::Callback<void, Ptr<Socket> > connectionSucceeded,
-			 ns3::Callback<void, Ptr<Socket> > connectionFailed,
-			 ns3::Callback<void, Ptr<Socket> > halfClose);
-  virtual int DoAccept(ns3::Callback<bool, Ptr<Socket>, const Address&> connectionRequest,
-		       ns3::Callback<void, Ptr<Socket>, const Address&> newConnectionCreated,
-		       ns3::Callback<void, Ptr<Socket> > closeRequested);
+  virtual int DoClose(Callback<void, Ptr<Socket> > closeCompleted);
+  virtual int DoConnect(const Address & address,
+                        Callback<void, Ptr<Socket> > connectionSucceeded,
+                        Callback<void, Ptr<Socket> > connectionFailed,
+                        Callback<void, Ptr<Socket> > halfClose);
+  virtual int DoAccept(Callback<bool, Ptr<Socket>, const Address&> connectionRequest,
+		       Callback<void, Ptr<Socket>, const Address&> newConnectionCreated,
+		       Callback<void, Ptr<Socket> > closeRequested);
   virtual int DoSend (const uint8_t* buffer,
                     uint32_t size,
-                    ns3::Callback<void, Ptr<Socket>, uint32_t> dataSent);
+                    Callback<void, Ptr<Socket>, uint32_t> dataSent);
   virtual int DoSendTo(const Address &address,
                       const uint8_t *buffer,
                       uint32_t size,
-                      ns3::Callback<void, Ptr<Socket>, uint32_t> dataSent);
-  virtual void DoRecv(ns3::Callback<void, Ptr<Socket>, const uint8_t*, uint32_t,const Address&>);
-  virtual void DoRecvDummy(ns3::Callback<void, Ptr<Socket>, uint32_t,const Address&>);
+                      Callback<void, Ptr<Socket>, uint32_t> dataSent);
+  virtual void DoRecv(Callback<void, Ptr<Socket>, const uint8_t*, uint32_t,const Address&>);
+  virtual void DoRecvDummy(Callback<void, Ptr<Socket>, uint32_t,const Address&>);
 
 private:
   friend class Udp;
@@ -76,9 +76,9 @@
   void ForwardUp (const Packet &p, Ipv4Address ipv4, uint16_t port);
   void Destroy (void);
   int DoSendPacketTo (const Packet &p, const Address &daddr,
-		      ns3::Callback<void, Ptr<Socket>, uint32_t> dataSent);
+		      Callback<void, Ptr<Socket>, uint32_t> dataSent);
   int DoSendPacketTo (const Packet &p, Ipv4Address daddr, uint16_t dport,
-		      ns3::Callback<void, Ptr<Socket>, uint32_t> dataSent);
+		      Callback<void, Ptr<Socket>, uint32_t> dataSent);
 
   Ipv4EndPoint *m_endPoint;
   Ptr<Node> m_node;