From c32fa4616109ab6bf8fb108e02faa71149e88a5a Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Mon, 4 Jun 2007 17:57:01 +0200
Subject: [PATCH] ISocketFactory -> SocketFactory

---
 samples/main-simple.cc                | 2 +-
 src/applications/onoff-application.cc | 2 +-
 src/node/i-udp.cc                     | 2 +-
 src/node/i-udp.h                      | 2 +-
 src/node/socket-factory.cc            | 6 +++---
 src/node/socket-factory.h             | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/samples/main-simple.cc b/samples/main-simple.cc
index 50e7b3456..f7c719c62 100644
--- a/samples/main-simple.cc
+++ b/samples/main-simple.cc
@@ -41,7 +41,7 @@ RunSimulation (void)
   Ptr<Node> a = Create<InternetNode> ();
 
   InterfaceId iid = InterfaceId::LookupByName ("IUdp");
-  Ptr<ISocketFactory> socketFactory = a->QueryInterface<ISocketFactory> (iid);
+  Ptr<SocketFactory> socketFactory = a->QueryInterface<SocketFactory> (iid);
 
   Ptr<Socket> sink = socketFactory->CreateSocket ();
   sink->Bind (80);
diff --git a/src/applications/onoff-application.cc b/src/applications/onoff-application.cc
index bcf3a6487..86e023ad4 100644
--- a/src/applications/onoff-application.cc
+++ b/src/applications/onoff-application.cc
@@ -141,7 +141,7 @@ void OnOffApplication::StartApplication()    // Called at time specified by Star
   if (!m_socket)
     {
       InterfaceId iid = InterfaceId::LookupByName (m_iid);
-      Ptr<ISocketFactory> socketFactory = GetNode ()->QueryInterface<ISocketFactory> (iid);
+      Ptr<SocketFactory> socketFactory = GetNode ()->QueryInterface<SocketFactory> (iid);
       m_socket = socketFactory->CreateSocket ();
       m_socket->Bind ();
       m_socket->Connect (m_peerIp, m_peerPort);
diff --git a/src/node/i-udp.cc b/src/node/i-udp.cc
index 210ef27d7..c7be88b70 100644
--- a/src/node/i-udp.cc
+++ b/src/node/i-udp.cc
@@ -22,7 +22,7 @@
 
 namespace ns3 {
 
-const InterfaceId IUdp::iid = MakeInterfaceId ("IUdp", ISocketFactory::iid);
+const InterfaceId IUdp::iid = MakeInterfaceId ("IUdp", SocketFactory::iid);
 
 IUdp::IUdp ()
 {
diff --git a/src/node/i-udp.h b/src/node/i-udp.h
index bb66a7ee6..71abefa4d 100644
--- a/src/node/i-udp.h
+++ b/src/node/i-udp.h
@@ -27,7 +27,7 @@ namespace ns3 {
 
 class Socket;
 
-class IUdp : public ISocketFactory
+class IUdp : public SocketFactory
 {
 public:
   static const InterfaceId iid;
diff --git a/src/node/socket-factory.cc b/src/node/socket-factory.cc
index 2b2f103d5..d77cff2e1 100644
--- a/src/node/socket-factory.cc
+++ b/src/node/socket-factory.cc
@@ -22,11 +22,11 @@
 
 namespace ns3 {
 
-const InterfaceId ISocketFactory::iid = MakeInterfaceId ("ISocketFactory", Object::iid);
+const InterfaceId SocketFactory::iid = MakeInterfaceId ("SocketFactory", Object::iid);
 
-ISocketFactory::ISocketFactory ()
+SocketFactory::SocketFactory ()
 {
-  SetInterfaceId (ISocketFactory::iid);
+  SetInterfaceId (SocketFactory::iid);
 }
 
 } // namespace ns3
diff --git a/src/node/socket-factory.h b/src/node/socket-factory.h
index bf9b05796..09b8c9cda 100644
--- a/src/node/socket-factory.h
+++ b/src/node/socket-factory.h
@@ -28,12 +28,12 @@ namespace ns3 {
 
 class Socket;
 
-class ISocketFactory : public Object
+class SocketFactory : public Object
 {
 public:
   static const InterfaceId iid;
 
-  ISocketFactory ();
+  SocketFactory ();
 
   virtual Ptr<Socket> CreateSocket (void) = 0;
 };