From 76deab84af220ead220cdb792eb83c0fe31fbcba Mon Sep 17 00:00:00 2001
From: Kirill Andreev <andreev@iitp.ru>
Date: Wed, 10 Jun 2009 18:57:27 +0400
Subject: [PATCH] Fixed names

---
 .../dot11s/{dot11s-installator.cc => dot11s-installer.cc} | 8 ++++----
 .../dot11s/{dot11s-installator.h => dot11s-installer.h}   | 2 +-
 src/devices/mesh/dot11s/wscript                           | 4 ++--
 src/helper/dot11s-helper.cc                               | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename src/devices/mesh/dot11s/{dot11s-installator.cc => dot11s-installer.cc} (91%)
 rename src/devices/mesh/dot11s/{dot11s-installator.h => dot11s-installer.h} (97%)

diff --git a/src/devices/mesh/dot11s/dot11s-installator.cc b/src/devices/mesh/dot11s/dot11s-installer.cc
similarity index 91%
rename from src/devices/mesh/dot11s/dot11s-installator.cc
rename to src/devices/mesh/dot11s/dot11s-installer.cc
index 664b4d8ed..2cdee18bf 100644
--- a/src/devices/mesh/dot11s/dot11s-installator.cc
+++ b/src/devices/mesh/dot11s/dot11s-installer.cc
@@ -18,14 +18,14 @@
  * Authors: Kirill Andreev <andreev@iitp.ru>
  */
 #include "ns3/mesh-interface-helper.h"
-#include "dot11s-installator.h"
+#include "dot11s-installer.h"
 #include "peer-management-protocol.h"
 #include "hwmp-protocol.h"
 
 namespace ns3 {
 namespace dot11s {
 bool
-Dot11sStackInstallator::InstallDot11sStack (Ptr<MeshPointDevice> mp, bool root)
+Dot11sStackInstaller::InstallDot11sStack (Ptr<MeshPointDevice> mp, bool root)
 {
   //Install Peer management protocol:
   Ptr<PeerManagementProtocol> pmp = CreateObject<PeerManagementProtocol> ();
@@ -46,7 +46,7 @@ Dot11sStackInstallator::InstallDot11sStack (Ptr<MeshPointDevice> mp, bool root)
   return true;
 }
 void
-Dot11sStackInstallator::Report (const Ptr<MeshPointDevice> mp, std::ostream& os)
+Dot11sStackInstaller::Report (const Ptr<MeshPointDevice> mp, std::ostream& os)
 {
   std::vector<Ptr<NetDevice> > ifaces = mp->GetInterfaces ();
   for (std::vector<Ptr<NetDevice> >::const_iterator i = ifaces.begin(); i != ifaces.end(); ++i)
@@ -64,7 +64,7 @@ Dot11sStackInstallator::Report (const Ptr<MeshPointDevice> mp, std::ostream& os)
   pmp->Report (os);
 }
 void
-Dot11sStackInstallator::ResetStats (const Ptr<MeshPointDevice> mp)
+Dot11sStackInstaller::ResetStats (const Ptr<MeshPointDevice> mp)
 {
   std::vector<Ptr<NetDevice> > ifaces = mp->GetInterfaces ();
   for (std::vector<Ptr<NetDevice> >::const_iterator i = ifaces.begin(); i != ifaces.end(); ++i)
diff --git a/src/devices/mesh/dot11s/dot11s-installator.h b/src/devices/mesh/dot11s/dot11s-installer.h
similarity index 97%
rename from src/devices/mesh/dot11s/dot11s-installator.h
rename to src/devices/mesh/dot11s/dot11s-installer.h
index 9536b4914..09dfd76f6 100644
--- a/src/devices/mesh/dot11s/dot11s-installator.h
+++ b/src/devices/mesh/dot11s/dot11s-installer.h
@@ -24,7 +24,7 @@
 #include "ns3/mesh-point-device.h"
 namespace ns3 {
 namespace dot11s {
-class Dot11sStackInstallator
+class Dot11sStackInstaller
 {
   public:
     ///\brief Installs 802.11s stack. needed by helper only
diff --git a/src/devices/mesh/dot11s/wscript b/src/devices/mesh/dot11s/wscript
index 94ba0a17b..a66de5f4e 100644
--- a/src/devices/mesh/dot11s/wscript
+++ b/src/devices/mesh/dot11s/wscript
@@ -23,10 +23,10 @@ def build(bld):
         'hwmp-mac-plugin.cc',
         'hwmp-protocol.cc',
         'airtime-metric.cc',
-        'dot11s-installator.cc',
+        'dot11s-installer.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'dot11s'
     headers.source = [
-        'dot11s-installator.h',
+        'dot11s-installer.h',
         ]
diff --git a/src/helper/dot11s-helper.cc b/src/helper/dot11s-helper.cc
index f58f0e9fb..264f4c816 100644
--- a/src/helper/dot11s-helper.cc
+++ b/src/helper/dot11s-helper.cc
@@ -19,7 +19,7 @@
  *         Pavel Boyko <boyko@iitp.ru>
  */
 #include "dot11s-helper.h"
-#include "ns3/dot11s-installator.h"
+#include "ns3/dot11s-installer.h"
 #include "ns3/simulator.h"
 #include "ns3/mesh-point-device.h"
 #include "ns3/wifi-net-device.h"
@@ -58,7 +58,7 @@ MeshWifiHelper::Install (const WifiPhyHelper &phyHelper, const MeshInterfaceHelp
     for (unsigned int j = 0; j < roots.size (); j ++)
       if(node_counter == roots[j])
         root = true;
-    if(!Dot11sStackInstallator::InstallDot11sStack (mp, root))
+    if(!Dot11sStackInstaller::InstallDot11sStack (mp, root))
     {
       NS_ASSERT(false);
     }
@@ -80,7 +80,7 @@ MeshWifiHelper::Report (const ns3::Ptr<ns3::NetDevice>& device, std::ostream& os
   NS_ASSERT (mp != 0);
   std::vector<Ptr<NetDevice> > ifaces = mp->GetInterfaces ();
   os << "<MeshPointDevice ReportTime=\"" << Simulator::Now().GetSeconds() << "s\" MpAddress=\"" << mp->GetAddress () << "\">\n";
-  Dot11sStackInstallator::Report (mp, os);
+  Dot11sStackInstaller::Report (mp, os);
   os << "</MeshPointDevice>\n";
 }
 void
@@ -88,7 +88,7 @@ MeshWifiHelper::ResetStats (const ns3::Ptr<ns3::NetDevice>& device)
 {
   Ptr <MeshPointDevice> mp = device->GetObject<MeshPointDevice> ();
   NS_ASSERT (mp != 0);
-  Dot11sStackInstallator::ResetStats (mp);
+  Dot11sStackInstaller::ResetStats (mp);
 }
 } //namespace ns3