From 3e652dbc55ba944ef5ffd739883cea9183acc03e Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Thu, 22 Jan 2009 23:07:34 -0800 Subject: [PATCH] rename object-names.{cc,h} to names.{cc,h} per convention --- src/core/config.cc | 2 +- src/core/{object-names.cc => names.cc} | 2 +- src/core/{object-names.h => names.h} | 0 src/core/wscript | 4 ++-- src/helper/application-container.cc | 2 +- src/helper/bridge-helper.cc | 2 +- src/helper/csma-helper.cc | 2 +- src/helper/emu-helper.cc | 2 +- src/helper/internet-stack-helper.cc | 2 +- src/helper/ipv4-interface-container.cc | 2 +- src/helper/mobility-helper.cc | 2 +- src/helper/net-device-container.cc | 2 +- src/helper/node-container.cc | 2 +- src/helper/olsr-helper.cc | 2 +- src/helper/on-off-helper.cc | 2 +- src/helper/packet-sink-helper.cc | 2 +- src/helper/packet-socket-helper.cc | 2 +- src/helper/point-to-point-helper.cc | 2 +- src/helper/static-multicast-route-helper.cc | 2 +- src/helper/udp-echo-helper.cc | 2 +- src/helper/v4ping-helper.cc | 2 +- src/helper/wifi-helper.cc | 2 +- src/helper/yans-wifi-helper.cc | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) rename src/core/{object-names.cc => names.cc} (99%) rename src/core/{object-names.h => names.h} (100%) diff --git a/src/core/config.cc b/src/core/config.cc index 1f30e03ff..ab000ca43 100644 --- a/src/core/config.cc +++ b/src/core/config.cc @@ -22,7 +22,7 @@ #include "object.h" #include "global-value.h" #include "object-vector.h" -#include "object-names.h" +#include "names.h" #include "pointer.h" #include "log.h" #include diff --git a/src/core/object-names.cc b/src/core/names.cc similarity index 99% rename from src/core/object-names.cc rename to src/core/names.cc index e42c5122d..8e995fe38 100644 --- a/src/core/object-names.cc +++ b/src/core/names.cc @@ -21,7 +21,7 @@ #include "log.h" #include "assert.h" #include "abort.h" -#include "object-names.h" +#include "names.h" #include "ns3/simulator.h" namespace ns3 { diff --git a/src/core/object-names.h b/src/core/names.h similarity index 100% rename from src/core/object-names.h rename to src/core/names.h diff --git a/src/core/wscript b/src/core/wscript index b62158ea7..cdcd0bc31 100644 --- a/src/core/wscript +++ b/src/core/wscript @@ -53,7 +53,7 @@ def build(bld): 'trace-source-accessor.cc', 'config.cc', 'callback.cc', - 'object-names.cc', + 'names.cc', ] core.uselib = 'RT' @@ -99,7 +99,7 @@ def build(bld): 'object-vector.h', 'deprecated.h', 'abort.h', - 'object-names.h', + 'names.h', ] if sys.platform == 'win32': diff --git a/src/helper/application-container.cc b/src/helper/application-container.cc index be5ce875c..041b0ee6c 100644 --- a/src/helper/application-container.cc +++ b/src/helper/application-container.cc @@ -18,7 +18,7 @@ * Author: Mathieu Lacage */ -#include "ns3/object-names.h" +#include "ns3/names.h" #include "application-container.h" namespace ns3 { diff --git a/src/helper/bridge-helper.cc b/src/helper/bridge-helper.cc index c597d181f..01f12c0a7 100644 --- a/src/helper/bridge-helper.cc +++ b/src/helper/bridge-helper.cc @@ -20,7 +20,7 @@ #include "ns3/log.h" #include "ns3/bridge-net-device.h" #include "ns3/node.h" -#include "ns3/object-names.h" +#include "ns3/names.h" NS_LOG_COMPONENT_DEFINE ("BridgeHelper"); diff --git a/src/helper/csma-helper.cc b/src/helper/csma-helper.cc index a860deab3..6b02c89e0 100644 --- a/src/helper/csma-helper.cc +++ b/src/helper/csma-helper.cc @@ -26,7 +26,7 @@ #include "ns3/pcap-writer.h" #include "ns3/config.h" #include "ns3/packet.h" -#include "ns3/object-names.h" +#include "ns3/names.h" #include namespace ns3 { diff --git a/src/helper/emu-helper.cc b/src/helper/emu-helper.cc index d1305bc14..fca92f2e7 100644 --- a/src/helper/emu-helper.cc +++ b/src/helper/emu-helper.cc @@ -21,7 +21,7 @@ #include "ns3/log.h" #include "ns3/simulator.h" #include "ns3/object-factory.h" -#include "ns3/object-names.h" +#include "ns3/names.h" #include "ns3/queue.h" #include "ns3/emu-net-device.h" #include "ns3/pcap-writer.h" diff --git a/src/helper/internet-stack-helper.cc b/src/helper/internet-stack-helper.cc index a7ddfa93c..e07c0fc0d 100644 --- a/src/helper/internet-stack-helper.cc +++ b/src/helper/internet-stack-helper.cc @@ -21,7 +21,7 @@ #include "ns3/assert.h" #include "ns3/log.h" #include "ns3/object.h" -#include "ns3/object-names.h" +#include "ns3/names.h" #include "ns3/ipv4.h" #include "internet-stack-helper.h" #include "ns3/internet-stack.h" diff --git a/src/helper/ipv4-interface-container.cc b/src/helper/ipv4-interface-container.cc index 44bc2a2b2..6d2b5b011 100644 --- a/src/helper/ipv4-interface-container.cc +++ b/src/helper/ipv4-interface-container.cc @@ -1,6 +1,6 @@ #include "ipv4-interface-container.h" #include "ns3/node-list.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/mobility-helper.cc b/src/helper/mobility-helper.cc index 095c95ce9..1b71b3f14 100644 --- a/src/helper/mobility-helper.cc +++ b/src/helper/mobility-helper.cc @@ -25,7 +25,7 @@ #include "ns3/pointer.h" #include "ns3/config.h" #include "ns3/simulator.h" -#include "ns3/object-names.h" +#include "ns3/names.h" #include namespace ns3 { diff --git a/src/helper/net-device-container.cc b/src/helper/net-device-container.cc index 5651f4aed..f2cfe23f8 100644 --- a/src/helper/net-device-container.cc +++ b/src/helper/net-device-container.cc @@ -19,7 +19,7 @@ */ #include "net-device-container.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/node-container.cc b/src/helper/node-container.cc index f54bc0fd0..9b1727fa3 100644 --- a/src/helper/node-container.cc +++ b/src/helper/node-container.cc @@ -19,7 +19,7 @@ */ #include "node-container.h" #include "ns3/node-list.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/olsr-helper.cc b/src/helper/olsr-helper.cc index 04dcf7628..fd033726d 100644 --- a/src/helper/olsr-helper.cc +++ b/src/helper/olsr-helper.cc @@ -20,7 +20,7 @@ #include "olsr-helper.h" #include "ns3/olsr-agent.h" #include "ns3/node-list.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/on-off-helper.cc b/src/helper/on-off-helper.cc index 6e35098ac..78bd2d607 100644 --- a/src/helper/on-off-helper.cc +++ b/src/helper/on-off-helper.cc @@ -21,7 +21,7 @@ #include "ns3/inet-socket-address.h" #include "ns3/packet-socket-address.h" #include "ns3/string.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/packet-sink-helper.cc b/src/helper/packet-sink-helper.cc index 06328d39c..b0606af50 100644 --- a/src/helper/packet-sink-helper.cc +++ b/src/helper/packet-sink-helper.cc @@ -21,7 +21,7 @@ #include "packet-sink-helper.h" #include "ns3/string.h" #include "ns3/inet-socket-address.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/packet-socket-helper.cc b/src/helper/packet-socket-helper.cc index dc1314cc5..5bace9ec3 100644 --- a/src/helper/packet-socket-helper.cc +++ b/src/helper/packet-socket-helper.cc @@ -20,7 +20,7 @@ #include "packet-socket-helper.h" #include "ns3/packet-socket-factory.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/point-to-point-helper.cc b/src/helper/point-to-point-helper.cc index 46c42ec43..1e182d131 100644 --- a/src/helper/point-to-point-helper.cc +++ b/src/helper/point-to-point-helper.cc @@ -25,7 +25,7 @@ #include "ns3/pcap-writer.h" #include "ns3/config.h" #include "ns3/packet.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/static-multicast-route-helper.cc b/src/helper/static-multicast-route-helper.cc index fbbfbffc9..a069d5834 100644 --- a/src/helper/static-multicast-route-helper.cc +++ b/src/helper/static-multicast-route-helper.cc @@ -23,7 +23,7 @@ #include "ns3/assert.h" #include "ns3/ipv4-address.h" #include "ns3/ipv4.h" -#include "ns3/object-names.h" +#include "ns3/names.h" #include "static-multicast-route-helper.h" namespace ns3 { diff --git a/src/helper/udp-echo-helper.cc b/src/helper/udp-echo-helper.cc index cc2247bfd..8cd9a9dde 100644 --- a/src/helper/udp-echo-helper.cc +++ b/src/helper/udp-echo-helper.cc @@ -21,7 +21,7 @@ #include "ns3/udp-echo-server.h" #include "ns3/udp-echo-client.h" #include "ns3/uinteger.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/v4ping-helper.cc b/src/helper/v4ping-helper.cc index 0ef4f2f40..e8767db76 100644 --- a/src/helper/v4ping-helper.cc +++ b/src/helper/v4ping-helper.cc @@ -20,7 +20,7 @@ #include "v4ping-helper.h" #include "ns3/v4ping.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 { diff --git a/src/helper/wifi-helper.cc b/src/helper/wifi-helper.cc index 57c21bc56..e5a3e5991 100644 --- a/src/helper/wifi-helper.cc +++ b/src/helper/wifi-helper.cc @@ -31,7 +31,7 @@ #include "ns3/pcap-writer.h" #include "ns3/config.h" #include "ns3/simulator.h" -#include "ns3/object-names.h" +#include "ns3/names.h" NS_LOG_COMPONENT_DEFINE ("WifiHelper"); diff --git a/src/helper/yans-wifi-helper.cc b/src/helper/yans-wifi-helper.cc index 4f37987a5..372182fff 100644 --- a/src/helper/yans-wifi-helper.cc +++ b/src/helper/yans-wifi-helper.cc @@ -27,7 +27,7 @@ #include "ns3/pcap-writer.h" #include "ns3/simulator.h" #include "ns3/config.h" -#include "ns3/object-names.h" +#include "ns3/names.h" namespace ns3 {