add back support for introspected doxygen.
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Thu, 13 Mar 2008 12:56:49 -0700
changeset 2602 d9262bff6df2
parent 2601 4297e8c61615
child 2603 1308da4cb3bf
add back support for introspected doxygen.
examples/csma-broadcast.cc
examples/csma-multicast.cc
examples/csma-one-subnet.cc
examples/csma-packet-socket.cc
examples/mixed-global-routing.cc
examples/simple-alternate-routing.cc
examples/simple-error-model.cc
examples/simple-global-routing.cc
examples/simple-point-to-point-olsr.cc
examples/simple-point-to-point.cc
examples/tcp-large-transfer-errors.cc
examples/tcp-large-transfer.cc
examples/tcp-nonlistening-server.cc
examples/tcp-small-transfer-oneloss.cc
examples/tcp-small-transfer.cc
samples/main-adhoc-wifi.cc
samples/main-ap-wifi.cc
samples/main-grid-topology.cc
samples/main-random-topology.cc
samples/main-random-walk.cc
samples/main-simple.cc
src/applications/onoff/onoff-application.cc
src/applications/packet-sink/packet-sink.cc
src/applications/udp-echo/udp-echo-client.cc
src/applications/udp-echo/udp-echo-server.cc
src/common/error-model.cc
src/core/attribute-test.cc
src/core/object.cc
src/core/object.h
src/devices/csma/csma-channel.cc
src/devices/csma/csma-net-device.cc
src/devices/csma/csma-topology.h
src/devices/point-to-point/point-to-point-channel.cc
src/devices/point-to-point/point-to-point-net-device.cc
src/devices/wifi/aarf-wifi-manager.cc
src/devices/wifi/adhoc-wifi-mac.cc
src/devices/wifi/amrr-wifi-manager.cc
src/devices/wifi/arf-wifi-manager.cc
src/devices/wifi/constant-rate-wifi-manager.cc
src/devices/wifi/ideal-wifi-manager.cc
src/devices/wifi/nqap-wifi-mac.cc
src/devices/wifi/nqsta-wifi-mac.cc
src/devices/wifi/wifi-channel.cc
src/devices/wifi/wifi-helper.cc
src/devices/wifi/wifi-mac.cc
src/devices/wifi/wifi-net-device.cc
src/devices/wifi/wifi-phy.cc
src/devices/wifi/wifi-remote-station-manager.cc
src/devices/wifi/wifi-remote-station-manager.h
src/internet-node/arp-l3-protocol.cc
src/internet-node/ipv4-l3-protocol.cc
src/internet-node/ipv4-l4-demux.cc
src/internet-node/ipv4-l4-protocol.cc
src/internet-node/rtt-estimator.cc
src/internet-node/tcp-l4-protocol.cc
src/internet-node/udp-l4-protocol.cc
src/mobility/hierarchical-mobility-model.cc
src/mobility/mobility-helper.cc
src/mobility/mobility-model.cc
src/mobility/position-allocator.cc
src/mobility/random-direction-2d-mobility-model.cc
src/mobility/random-walk-2d-mobility-model.cc
src/mobility/random-waypoint-mobility-model.cc
src/mobility/static-mobility-model.cc
src/mobility/static-speed-mobility-model.cc
src/node/application.cc
src/node/channel.cc
src/node/drop-tail-queue.cc
src/node/ipv4.cc
src/node/net-device.cc
src/node/node.cc
src/node/packet-socket-factory.cc
src/node/queue.cc
src/node/socket-factory.cc
src/node/tcp.cc
src/node/udp.cc
src/routing/global-routing/global-router-interface.cc
src/routing/olsr/olsr-agent-impl.cc
src/routing/olsr/olsr-agent.cc
src/routing/olsr/olsr-helper.cc
utils/print-introspected-doxygen.cc
--- a/examples/csma-broadcast.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/csma-broadcast.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -150,7 +150,7 @@
   NS_LOG_INFO ("Create Applications.");
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("255.255.255.255", port)), 
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable(1), 
                                     "OffTime", ConstantVariable(0));
   n0->AddApplication (ooff);
@@ -161,7 +161,7 @@
   // Create an optional packet sink to receive these packets
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                              "Protocol", TypeId::LookupByName ("Udp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n1->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.0));
@@ -169,7 +169,7 @@
 
   // Create an optional packet sink to receive these packets
   sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                                   "Protocol", TypeId::LookupByName ("Udp"));
+                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n2->AddApplication (sink);
 
   // Start the sink
--- a/examples/csma-multicast.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/csma-multicast.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -279,7 +279,7 @@
   // every few seconds
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress (multicastGroup, port)), 
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable(1), 
                                     "OffTime", ConstantVariable(0),
                                     "DataRate", DataRate ("255b/s"),
@@ -296,7 +296,7 @@
   // for every packet received
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                              "Protocol", TypeId::LookupByName ("Udp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n4->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.0));
--- a/examples/csma-one-subnet.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/csma-one-subnet.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -161,7 +161,7 @@
   uint16_t port = 9;   // Discard port (RFC 863)
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.1.2", port)), 
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable(1), 
                                     "OffTime", ConstantVariable(0));
   n0->AddApplication (ooff);
@@ -175,7 +175,7 @@
 // Create a similar flow from n3 to n0, starting at time 1.1 seconds
 //
   ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.1.1", port)), 
-                                         "Protocol", TypeId::LookupByName ("Udp"),
+                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                          "OnTime", ConstantVariable(1), 
                                          "OffTime", ConstantVariable(0));
   n3->AddApplication (ooff);
--- a/examples/csma-packet-socket.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/csma-packet-socket.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -141,7 +141,7 @@
   NS_LOG_INFO ("Create Applications.");
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (n0ToN1),
-                                    "Protocol", TypeId::LookupByName ("Packet"),
+                                    "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"),
                                     "OnTime", ConstantVariable(1), 
                                     "OffTime", ConstantVariable(0));
   n0->AddApplication (ooff);
@@ -151,7 +151,7 @@
 
   // Create a similar flow from n3 to n0, starting at time 1.1 seconds
   ooff = CreateObject<OnOffApplication> ("Remote", Address (n3ToN0),
-                                         "Protocol", TypeId::LookupByName ("Packet"),
+                                         "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"),
                                          "OnTime", ConstantVariable(1), 
                                          "OffTime", ConstantVariable(0));
   n3->AddApplication (ooff);
--- a/examples/mixed-global-routing.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/mixed-global-routing.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -187,7 +187,7 @@
   uint16_t port = 9;   // Discard port (RFC 863)
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), 
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable (1), 
                                     "OffTime", ConstantVariable (0),
                                     "DataRate", DataRate("300bps"),
--- a/examples/simple-alternate-routing.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/simple-alternate-routing.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -184,7 +184,7 @@
   // Create a flow from n3 to n1, starting at time 1.1 seconds
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.1.1", port)),
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable (1), 
                                     "OffTime", ConstantVariable (0));
   n3->AddApplication (ooff);
@@ -195,7 +195,7 @@
   // Create a packet sink to receive these packets
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), 
-                              "Protocol", TypeId::LookupByName ("Udp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n1->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.1));
--- a/examples/simple-error-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/simple-error-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -144,7 +144,7 @@
   uint16_t port = 9;   // Discard port (RFC 863)
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), 
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable(1), 
                                     "OffTime", ConstantVariable(0));
   n0->AddApplication (ooff);
@@ -154,7 +154,7 @@
 
   // Create an optional packet sink to receive these packets
   Ptr<PacketSink> sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                                                   "Protocol", TypeId::LookupByName ("Udp"));
+                                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n3->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.0));
@@ -162,7 +162,7 @@
 
   // Create a similar flow from n3 to n1, starting at time 1.1 seconds
   ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), 
-                                         "Protocol", TypeId::LookupByName ("Udp"),
+                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                          "OnTime", ConstantVariable(1), 
                                          "OffTime", ConstantVariable(0));
   n3->AddApplication (ooff);
@@ -172,7 +172,7 @@
 
   // Create a packet sink to receive these packets
   sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                                   "Protocol", TypeId::LookupByName ("Udp"));
+                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n1->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.1));
--- a/examples/simple-global-routing.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/simple-global-routing.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -161,7 +161,7 @@
   uint16_t port = 9;   // Discard port (RFC 863)
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), 
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable (1), 
                                     "OffTime", ConstantVariable (0));
   n0->AddApplication (ooff);
@@ -173,7 +173,7 @@
   // The last argument "true" disables output from the Receive callback
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                              "Protocol", TypeId::LookupByName ("Udp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n3->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.0));
@@ -181,7 +181,7 @@
 
   // Create a similar flow from n3 to n1, starting at time 1.1 seconds
   ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.2.1", port)),
-                                         "Protocol", TypeId::LookupByName ("Udp"),
+                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                          "OnTime", ConstantVariable (1), 
                                          "OffTime", ConstantVariable (0));
   n3->AddApplication (ooff);
@@ -191,7 +191,7 @@
 
   // Create a packet sink to receive these packets
   sink = CreateObject<PacketSink> ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), 
-                                   "Protocol", TypeId::LookupByName ("Udp"));
+                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n1->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.1));
--- a/examples/simple-point-to-point-olsr.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/simple-point-to-point-olsr.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -168,7 +168,7 @@
   uint16_t port = 9;   // Discard port (RFC 863)
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.4.2", port)), 
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable(1), 
                                     "OffTime", ConstantVariable(0));
   n0->AddApplication (ooff);
@@ -178,14 +178,14 @@
   // Create an optional packet sink to receive these packets
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                              "Protocol", TypeId::LookupByName ("Udp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n3->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.0));
 
   // Create a similar flow from n3 to n1, starting at time 1.1 seconds
   ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), 
-                                         "Protocol", TypeId::LookupByName ("Udp"),
+                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                          "OnTime", ConstantVariable(1), 
                                          "OffTime", ConstantVariable(0));
   n3->AddApplication (ooff);
@@ -194,7 +194,7 @@
 
   // Create a packet sink to receive these packets
   sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                                   "Protocol", TypeId::LookupByName ("Udp"));
+                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n1->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.1));
--- a/examples/simple-point-to-point.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/simple-point-to-point.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -137,7 +137,7 @@
   uint16_t port = 9;   // Discard port (RFC 863)
   Ptr<OnOffApplication> ooff = 
     CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), 
-                                    "Protocol", TypeId::LookupByName ("Udp"),
+                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                     "OnTime", ConstantVariable(1), 
                                     "OffTime", ConstantVariable(0));
   n0->AddApplication (ooff);
@@ -147,14 +147,14 @@
   // Create an optional packet sink to receive these packets
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                              "Protocol", TypeId::LookupByName ("Udp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n3->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.0));
 
   // Create a similar flow from n3 to n1, starting at time 1.1 seconds
   ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), 
-                                         "Protocol", TypeId::LookupByName ("Udp"),
+                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
                                          "OnTime", ConstantVariable(1), 
                                          "OffTime", ConstantVariable(0));
   n3->AddApplication (ooff);
@@ -163,7 +163,7 @@
 
   // Create a packet sink to receive these packets
   sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
-                                   "Protocol", TypeId::LookupByName ("Udp"));
+                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
   n1->AddApplication (sink);
   // Start the sink
   sink->Start (Seconds (1.1));
@@ -173,7 +173,7 @@
   uint16_t servPort = 500;
 
   ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", servPort)), 
-                                         "Protocol", TypeId::LookupByName ("Tcp"),
+                                         "Protocol", TypeId::LookupByName ("ns3::Tcp"),
                                          "OnTime", ConstantVariable(1), 
                                          "OffTime", ConstantVariable(0));
   n0->AddApplication (ooff);
@@ -183,7 +183,7 @@
 
   // Create a packet sink to receive these TCP packets
   sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
-                                   "Protocol", TypeId::LookupByName ("Tcp"));
+                                   "Protocol", TypeId::LookupByName ("ns3::Tcp"));
   n3->AddApplication (sink);
   sink->Start (Seconds (1.2));
 
--- a/examples/tcp-large-transfer-errors.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/tcp-large-transfer-errors.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -199,7 +199,7 @@
   // Create a packet sink to receive these packets
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
-                              "Protocol", TypeId::LookupByName ("Tcp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Tcp"));
   n2->AddApplication (sink);
   sink->Start (Seconds (0.0));
   sink->Stop (Seconds (10000.0));
--- a/examples/tcp-large-transfer.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/tcp-large-transfer.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -199,7 +199,7 @@
   // Create a packet sink to receive these packets
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
-                              "Protocol", TypeId::LookupByName ("Tcp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Tcp"));
   n2->AddApplication (sink);
   sink->Start (Seconds (0.0));
   sink->Stop (Seconds (100.0));
--- a/examples/tcp-nonlistening-server.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/tcp-nonlistening-server.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -162,7 +162,7 @@
   Ptr<PacketSink> sink = Create<PacketSink> (
     n2,
     InetSocketAddress (Ipv4Address::GetAny (), servPort),
-    "Tcp");
+    "ns3::Tcp");
   // Start the sink
   sink->Start (Seconds (0.0));
   sink->Stop (Seconds (10.0));
--- a/examples/tcp-small-transfer-oneloss.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/tcp-small-transfer-oneloss.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -181,7 +181,7 @@
   // Create a packet sink to receive these packets
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
-                              "Protocol", TypeId::LookupByName ("Tcp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Tcp"));
   n2->AddApplication (sink);
   sink->Start (Seconds (0.0));
   sink->Stop (Seconds (100.0));
--- a/examples/tcp-small-transfer.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/examples/tcp-small-transfer.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -191,7 +191,7 @@
   // Create a packet sink to receive these packets
   Ptr<PacketSink> sink = 
     CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
-                              "Protocol", TypeId::LookupByName ("Tcp"));
+                              "Protocol", TypeId::LookupByName ("ns3::Tcp"));
   n2->AddApplication (sink);
   sink->Start (Seconds (0.0));
   sink->Stop (Seconds (100.0));
--- a/samples/main-adhoc-wifi.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/samples/main-adhoc-wifi.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -117,7 +117,7 @@
 Ptr<Socket>
 Experiment::SetupPacketReceive (Ptr<Node> node)
 {
-  TypeId tid = TypeId::LookupByName ("Packet");
+  TypeId tid = TypeId::LookupByName ("ns3::PacketSocketFactory");
   Ptr<SocketFactory> socketFactory = node->GetObject<SocketFactory> (tid);
   Ptr<Socket> sink = socketFactory->CreateSocket ();
   sink->Bind ();
@@ -150,7 +150,7 @@
   destination.SetPhysicalAddress (devices.Get (1)->GetAddress ());
   Ptr<Application> app = 
     CreateObject<OnOffApplication> ("Remote", Address (destination),
-                                    "Protocol", TypeId::LookupByName ("Packet"),
+                                    "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"),
                                     "OnTime", ConstantVariable (250),
                                     "OffTime", ConstantVariable (0),
                                     "DataRate", DataRate (60000000),
@@ -185,61 +185,61 @@
   WifiHelper wifi;
   GnuplotDataset dataset;
 
-  wifi.SetMac ("AdhocWifiMac");
-  wifi.SetPhy ("WifiPhy");
+  wifi.SetMac ("ns3::AdhocWifiMac");
+  wifi.SetPhy ("ns3::WifiPhy");
 
   NS_LOG_DEBUG ("54");
   experiment = Experiment ("54mb");
-  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                 "DataMode", String ("wifia-54mbs"));
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("48");
   experiment = Experiment ("48mb");
-  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                 "DataMode", String ("wifia-48mbs"));
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("36");
   experiment = Experiment ("36mb");
-  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                 "DataMode", String ("wifia-36mbs"));
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("24");
   experiment = Experiment ("24mb");
-  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                 "DataMode", String ("wifia-24mbs"));
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("18");
   experiment = Experiment ("18mb");
-  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                 "DataMode", String ("wifia-18mbs"));
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("12");
   experiment = Experiment ("12mb");
-  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                 "DataMode", String ("wifia-12mbs"));
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("9");
   experiment = Experiment ("9mb");
-  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                 "DataMode", String ("wifia-9mbs"));
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("6");
   experiment = Experiment ("6mb");
-  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                 "DataMode", String ("wifia-6mbs"));
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
@@ -254,19 +254,19 @@
 
   NS_LOG_DEBUG ("arf");
   experiment = Experiment ("arf");
-  wifi.SetRemoteStationManager ("ArfWifiManager");
+  wifi.SetRemoteStationManager ("ns3::ArfWifiManager");
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("aarf");
   experiment = Experiment ("aarf");
-  wifi.SetRemoteStationManager ("AarfWifiManager");
+  wifi.SetRemoteStationManager ("ns3::AarfWifiManager");
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
   NS_LOG_DEBUG ("ideal");
   experiment = Experiment ("ideal");
-  wifi.SetRemoteStationManager ("IdealWifiManager");
+  wifi.SetRemoteStationManager ("ns3::IdealWifiManager");
   dataset = experiment.Run (wifi);
   gnuplot.AddDataset (dataset);
 
--- a/samples/main-ap-wifi.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/samples/main-ap-wifi.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -121,14 +121,14 @@
 
   Ptr<WifiChannel> channel = CreateObject<WifiChannel> ();
   Ssid ssid = Ssid ("wifi-default");
-  wifi.SetPhy ("WifiPhy");
-  wifi.SetRemoteStationManager ("ArfWifiManager");
+  wifi.SetPhy ("ns3::WifiPhy");
+  wifi.SetRemoteStationManager ("ns3::ArfWifiManager");
   // setup ap.
-  wifi.SetMac ("NqstaWifiMac", "Ssid", ssid,
+  wifi.SetMac ("ns3::NqstaWifiMac", "Ssid", ssid,
                "ActiveProbing", Boolean (false));
   staDevs = wifi.Build (stas, channel);
   // setup stas.
-  wifi.SetMac ("NqapWifiMac", "Ssid", ssid,
+  wifi.SetMac ("ns3::NqapWifiMac", "Ssid", ssid,
                "BeaconGeneration", Boolean (true),
                "BeaconInterval", Seconds (2.5));
   wifi.Build (ap, channel);
@@ -145,7 +145,7 @@
   destination.SetPhysicalAddress (staDevs.Get(1)->GetAddress ());
   Ptr<Application> app = 
     CreateObject<OnOffApplication> ("Remote", Address (destination), 
-                                    "Protocol", TypeId::LookupByName ("Packet"),
+                                    "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"),
                                     "OnTime", ConstantVariable (42),
                                     "OffTime", ConstantVariable (0));
   stas.Get (0)->AddApplication (app);
--- a/samples/main-grid-topology.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/samples/main-grid-topology.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -29,7 +29,7 @@
   // started from (-100,-100) with 20 objects per row, 
   // the x interval between each object is 5 meters
   // and the y interval between each object is 20 meters
-  mobility.SetPositionAllocator ("GridPositionAllocator",
+  mobility.SetPositionAllocator ("ns3::GridPositionAllocator",
                                  "MinX", Double (-100.0),
                                  "MinY", Double (-100.0),
                                  "DeltaX", Double (5.0),
@@ -39,7 +39,7 @@
   // each object will be attached a static position.
   // i.e., once set by the "position allocator", the
   // position will never change.
-  mobility.SetMobilityModel ("StaticMobilityModel");
+  mobility.SetMobilityModel ("ns3::StaticMobilityModel");
 
   // finalize the setup by attaching to each object
   // in the input array a position and initializing
--- a/samples/main-random-topology.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/samples/main-random-topology.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -37,11 +37,11 @@
 
   MobilityHelper mobility;
   mobility.EnableNotifier ();
-  mobility.SetPositionAllocator ("RandomDiscPositionAllocator",
+  mobility.SetPositionAllocator ("ns3::RandomDiscPositionAllocator",
                                  "X", String ("100.0"),
                                  "Y", String ("100.0"),
                                  "Rho", String ("Uniform:0:30"));
-  mobility.SetMobilityModel ("StaticMobilityModel");
+  mobility.SetMobilityModel ("ns3::StaticMobilityModel");
   mobility.Layout (objects.begin (), objects.end ());
 
   Config::Connect ("/NodeList/*/$MobilityModelNotifier/CourseChange",
--- a/samples/main-random-walk.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/samples/main-random-walk.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -43,11 +43,11 @@
 
   MobilityHelper mobility;
   mobility.EnableNotifier ();
-  mobility.SetPositionAllocator ("RandomDiscPositionAllocator",
+  mobility.SetPositionAllocator ("ns3::RandomDiscPositionAllocator",
                                  "X", String ("100.0"),
                                  "Y", String ("100.0"),
                                  "Rho", String ("Uniform:0:30"));
-  mobility.SetMobilityModel ("RandomWalk2dMobilityModel",
+  mobility.SetMobilityModel ("ns3::RandomWalk2dMobilityModel",
                              "Mode", String ("Time"),
                              "Time", String ("2s"),
                              "Speed", String ("Constant:1.0"),
--- a/samples/main-simple.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/samples/main-simple.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -42,7 +42,7 @@
 {
   Ptr<Node> a = CreateObject<InternetNode> ();
 
-  TypeId tid = TypeId::LookupByName ("Udp");
+  TypeId tid = TypeId::LookupByName ("ns3::Udp");
   Ptr<SocketFactory> socketFactory = a->GetObject<SocketFactory> (tid);
 
   Ptr<Socket> sink = socketFactory->CreateSocket ();
--- a/src/applications/onoff/onoff-application.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/applications/onoff/onoff-application.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -48,7 +48,7 @@
 TypeId
 OnOffApplication::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("OnOffApplication")
+  static TypeId tid = TypeId ("ns3::OnOffApplication")
     .SetParent<Application> ()
     .AddConstructor<OnOffApplication> ()
     .AddAttribute ("DataRate", "The data rate in on state.",
--- a/src/applications/packet-sink/packet-sink.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/applications/packet-sink/packet-sink.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -39,7 +39,7 @@
 TypeId 
 PacketSink::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("PacketSink")
+  static TypeId tid = TypeId ("ns3::PacketSink")
     .SetParent<Application> ()
     .AddAttribute ("Local", "The Address on which to Bind the rx socket.",
                    Address (),
--- a/src/applications/udp-echo/udp-echo-client.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/applications/udp-echo/udp-echo-client.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -34,7 +34,7 @@
 TypeId
 UdpEchoClient::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("UdpEchoClient")
+  static TypeId tid = TypeId ("ns3::UdpEchoClient")
     .SetParent<Application> ()
     .AddConstructor<UdpEchoClient> ()
     .AddAttribute ("MaxPackets", "XXX",
@@ -88,7 +88,7 @@
 
   if (!m_socket)
     {
-      TypeId tid = TypeId::LookupByName ("Udp");
+      TypeId tid = TypeId::LookupByName ("ns3::Udp");
       Ptr<SocketFactory> socketFactory = 
         GetNode ()->GetObject<SocketFactory> (tid);
       m_socket = socketFactory->CreateSocket ();
--- a/src/applications/udp-echo/udp-echo-server.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/applications/udp-echo/udp-echo-server.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -36,7 +36,7 @@
 TypeId
 UdpEchoServer::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("UdpEchoServer")
+  static TypeId tid = TypeId ("ns3::UdpEchoServer")
     .SetParent<Application> ()
     .AddConstructor<UdpEchoServer> ()
     .AddAttribute ("Port", "Client Port",
@@ -71,7 +71,7 @@
 
   if (!m_socket)
     {
-      TypeId tid = TypeId::LookupByName ("Udp");
+      TypeId tid = TypeId::LookupByName ("ns3::Udp");
       Ptr<SocketFactory> socketFactory = 
         GetNode ()->GetObject<SocketFactory> (tid);
       m_socket = socketFactory->CreateSocket ();
--- a/src/common/error-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/common/error-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -39,7 +39,7 @@
 
 TypeId ErrorModel::GetTypeId (void)
 { 
-  static TypeId tid = TypeId ("ErrorModel")
+  static TypeId tid = TypeId ("ns3::ErrorModel")
     .SetParent<Object> ()
     .AddAttribute ("IsEnabled", "Whether this ErrorModel is enabled or not.",
                    Boolean (true),
@@ -107,7 +107,7 @@
 
 TypeId RateErrorModel::GetTypeId (void)
 { 
-  static TypeId tid = TypeId ("RateErrorModel")
+  static TypeId tid = TypeId ("ns3::RateErrorModel")
     .SetParent<ErrorModel> ()
     .AddConstructor<RateErrorModel> ()
     .AddAttribute ("ErrorUnit", "The error unit",
@@ -237,7 +237,7 @@
 
 TypeId ListErrorModel::GetTypeId (void)
 { 
-  static TypeId tid = TypeId ("ListErrorModel")
+  static TypeId tid = TypeId ("ns3::ListErrorModel")
     .SetParent<ErrorModel> ()
     .AddConstructor<ListErrorModel> ()
     ;
--- a/src/core/attribute-test.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/core/attribute-test.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -98,6 +98,7 @@
   static TypeId GetTypeId (void) {
     static TypeId tid = TypeId ("AttributeObjectTest")
       .SetParent<Object> ()
+      .HideFromDocumentation ()
       .AddAttribute ("TestBoolName", "help text",
 		     Boolean (false),
 		     MakeBooleanAccessor (&AttributeObjectTest::m_boolTest),
--- a/src/core/object.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/core/object.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -45,6 +45,7 @@
   void SetTypeName (uint16_t uid, std::string typeName);
   void SetGroupName (uint16_t uid, std::string groupName);
   void AddConstructor (uint16_t uid, ns3::CallbackBase callback);
+  void HideFromDocumentation (uint16_t uid);
   uint16_t GetUid (std::string name) const;
   std::string GetName (uint16_t uid) const;
   uint16_t GetParent (uint16_t uid) const;
@@ -76,6 +77,7 @@
   std::string GetTraceSourceName (uint16_t uid, uint32_t i) const;
   std::string GetTraceSourceHelp (uint16_t uid, uint32_t i) const;
   ns3::Ptr<const ns3::TraceSourceAccessor> GetTraceSourceAccessor (uint16_t uid, uint32_t i) const;
+  bool MustHideFromDocumentation (uint16_t uid) const;
 
 private:
   struct AttributeInformation {
@@ -98,6 +100,7 @@
     std::string groupName;
     bool hasConstructor;
     ns3::CallbackBase constructor;
+    bool mustHideFromDocumentation;
     std::vector<struct AttributeInformation> attributes;
     std::vector<struct TraceSourceInformation> traceSources;
   };
@@ -130,6 +133,7 @@
   information.typeName = "";
   information.groupName = "";
   information.hasConstructor = false;
+  information.mustHideFromDocumentation = false;
   m_information.push_back (information);
   uint32_t uid = m_information.size ();
   NS_ASSERT (uid <= 0xffff);
@@ -162,6 +166,12 @@
   struct IidInformation *information = LookupInformation (uid);
   information->groupName = groupName;
 }
+void
+IidManager::HideFromDocumentation (uint16_t uid)
+{
+  struct IidInformation *information = LookupInformation (uid);
+  information->mustHideFromDocumentation = true;
+}
 
 void 
 IidManager::AddConstructor (uint16_t uid, ns3::CallbackBase callback)
@@ -363,6 +373,12 @@
   NS_ASSERT (i < information->traceSources.size ());
   return information->traceSources[i].accessor;
 }
+bool 
+IidManager::MustHideFromDocumentation (uint16_t uid) const
+{
+  struct IidInformation *information = LookupInformation (uid);
+  return information->mustHideFromDocumentation;
+}
 
 } // anonymous namespace
 
@@ -564,6 +580,13 @@
   return object;  
 }
 
+bool 
+TypeId::MustHideFromDocumentation (void) const
+{
+  bool mustHide = Singleton<IidManager>::Get ()->MustHideFromDocumentation (m_tid);
+  return mustHide;
+}
+
 uint32_t 
 TypeId::GetAttributeListN (void) const
 {
@@ -645,6 +668,13 @@
   return *this;
 }
 
+TypeId 
+TypeId::HideFromDocumentation (void)
+{
+  Singleton<IidManager>::Get ()->HideFromDocumentation (m_tid);
+  return *this;
+}
+
 
 Ptr<const TraceSourceAccessor> 
 TypeId::LookupTraceSourceByName (std::string name) const
@@ -936,7 +966,7 @@
 static TypeId
 GetObjectIid (void)
 {
-  TypeId tid = TypeId ("Object");
+  TypeId tid = TypeId ("ns3::Object");
   tid.SetParent (tid);
   return tid;
 }
@@ -1324,6 +1354,7 @@
   static ns3::TypeId GetTypeId (void) {
     static ns3::TypeId tid = ns3::TypeId ("BaseA")
       .SetParent (Object::GetTypeId ())
+      .HideFromDocumentation ()
       .AddConstructor<BaseA> ();
     return tid;
   }
@@ -1338,6 +1369,7 @@
   static ns3::TypeId GetTypeId (void) {
     static ns3::TypeId tid = ns3::TypeId ("DerivedA")
       .SetParent (BaseA::GetTypeId ())
+      .HideFromDocumentation ()
       .AddConstructor<DerivedA> ();
     return tid;
   }
@@ -1354,6 +1386,7 @@
   static ns3::TypeId GetTypeId (void) {
     static ns3::TypeId tid = ns3::TypeId ("BaseB")
       .SetParent (Object::GetTypeId ())
+      .HideFromDocumentation ()
       .AddConstructor<BaseB> ();
     return tid;
   }
@@ -1368,6 +1401,7 @@
   static ns3::TypeId GetTypeId (void) {
     static ns3::TypeId tid = ns3::TypeId ("DerivedB")
       .SetParent (BaseB::GetTypeId ())
+      .HideFromDocumentation ()
       .AddConstructor<DerivedB> ();
     return tid;
   }
--- a/src/core/object.h	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/core/object.h	Thu Mar 13 12:56:49 2008 -0700
@@ -180,6 +180,8 @@
   Ptr<Object> CreateObject (const AttributeList &attributes) const;
   Ptr<Object> CreateObject (void) const;
 
+  bool MustHideFromDocumentation (void) const;
+
   /**
    * \param tid the TypeId of the base class.
    * \return this TypeId instance.
@@ -270,6 +272,8 @@
                          std::string help,
                          Ptr<const TraceSourceAccessor> accessor);
 
+  TypeId HideFromDocumentation (void);
+
   /**
    * \brief store together a set of attribute properties.
    */
--- a/src/devices/csma/csma-channel.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/csma/csma-channel.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -48,7 +48,7 @@
 TypeId 
 CsmaChannel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("CsmaChannel")
+  static TypeId tid = TypeId ("ns3::CsmaChannel")
     .SetParent<Channel> ()
     .AddConstructor<CsmaChannel> ()
     .AddAttribute ("BitRate", "The maximum bitrate of the channel",
--- a/src/devices/csma/csma-net-device.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/csma/csma-net-device.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -42,7 +42,7 @@
 TypeId 
 CsmaNetDevice::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("CsmaNetDevice")
+  static TypeId tid = TypeId ("ns3::CsmaNetDevice")
     .SetParent<NetDevice> ()
     .AddConstructor<CsmaNetDevice> ()
     .AddAttribute ("Address", "The address of this device.",
--- a/src/devices/csma/csma-topology.h	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/csma/csma-topology.h	Thu Mar 13 12:56:49 2008 -0700
@@ -106,7 +106,7 @@
 
   /**
    * \param n1 Node from which socketfactory should be tested.
-   * \param tid_name Interface identifier ("Packet", in this case)
+   * \param tid_name Interface identifier ("ns3::PacketSocketFactory", in this case)
    *
    * This is a test function to make sure that a socket can be created
    * by using the socketfactory interface provided in the
--- a/src/devices/point-to-point/point-to-point-channel.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/point-to-point/point-to-point-channel.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -32,7 +32,7 @@
 TypeId 
 PointToPointChannel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("PointToPointChannel")
+  static TypeId tid = TypeId ("ns3::PointToPointChannel")
     .SetParent<Channel> ()
     .AddConstructor<PointToPointChannel> ()
     .AddAttribute ("BitRate", "The maximum bitrate of the channel",
--- a/src/devices/point-to-point/point-to-point-net-device.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/point-to-point/point-to-point-net-device.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -39,7 +39,7 @@
 TypeId 
 PointToPointNetDevice::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("PointToPointNetDevice")
+  static TypeId tid = TypeId ("ns3::PointToPointNetDevice")
     .SetParent<NetDevice> ()
     .AddConstructor<PointToPointNetDevice> ()
     .AddAttribute ("Address", "The address of this device.",
--- a/src/devices/wifi/aarf-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/aarf-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -33,7 +33,7 @@
 TypeId 
 AarfWifiManager::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("AarfWifiManager")
+  static TypeId tid = TypeId ("ns3::AarfWifiManager")
     .SetParent<ArfWifiManager> ()
     .AddConstructor<AarfWifiManager> ()
     .AddAttribute ("SuccessK", "Multiplication factor for the success threshold in the AARF algorithm.",
--- a/src/devices/wifi/adhoc-wifi-mac.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/adhoc-wifi-mac.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -36,7 +36,7 @@
 TypeId 
 AdhocWifiMac::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("AdhocWifiMac")
+  static TypeId tid = TypeId ("ns3::AdhocWifiMac")
     .SetParent<WifiMac> ()
     .AddConstructor<AdhocWifiMac> ()
     ;
--- a/src/devices/wifi/amrr-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/amrr-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -33,7 +33,7 @@
 TypeId
 AmrrWifiManager::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("AmrrWifiManager")
+  static TypeId tid = TypeId ("ns3::AmrrWifiManager")
     .SetParent<WifiRemoteStationManager> ()
     .AddConstructor<AmrrWifiManager> ()
     .AddAttribute ("UpdatePeriod",
--- a/src/devices/wifi/arf-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/arf-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -23,7 +23,7 @@
 #include "ns3/log.h"
 #include "ns3/uinteger.h"
 
-NS_LOG_COMPONENT_DEFINE ("ArfWifiManager");
+NS_LOG_COMPONENT_DEFINE ("ns3::ArfWifiManager");
 
 
 namespace ns3 {
@@ -224,7 +224,7 @@
 TypeId 
 ArfWifiManager::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ArfWifiManager")
+  static TypeId tid = TypeId ("ns3::ArfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
     .AddConstructor<ArfWifiManager> ()
     .AddAttribute ("TimerThreshold", "The 'timer' threshold in the ARF algorithm.",
--- a/src/devices/wifi/constant-rate-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/constant-rate-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -74,7 +74,7 @@
 TypeId 
 ConstantRateWifiManager::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ConstantRateWifiManager")
+  static TypeId tid = TypeId ("ns3::ConstantRateWifiManager")
     .SetParent<WifiRemoteStationManager> ()
     .AddConstructor<ConstantRateWifiManager> ()
     .AddAttribute ("DataMode", "XXX",
--- a/src/devices/wifi/ideal-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/ideal-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -41,7 +41,7 @@
 TypeId 
 IdealWifiManager::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("IdealWifiManager")
+  static TypeId tid = TypeId ("ns3::IdealWifiManager")
     .SetParent<WifiRemoteStationManager> ()
     .AddConstructor<IdealWifiManager> ()
     .AddAttribute ("BerThreshold",
--- a/src/devices/wifi/nqap-wifi-mac.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/nqap-wifi-mac.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -43,7 +43,7 @@
 TypeId 
 NqapWifiMac::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("NqapWifiMac")
+  static TypeId tid = TypeId ("ns3::NqapWifiMac")
     .SetParent<WifiMac> ()
     .AddConstructor<NqapWifiMac> ()
     .AddAttribute ("BeaconInterval", "Delay between two beacons",
--- a/src/devices/wifi/nqsta-wifi-mac.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/nqsta-wifi-mac.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -62,7 +62,7 @@
 TypeId 
 NqstaWifiMac::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("NqstaWifiMac")
+  static TypeId tid = TypeId ("ns3::NqstaWifiMac")
     .SetParent<WifiMac> ()
     .AddConstructor<NqstaWifiMac> ()
     .AddAttribute ("ProbeRequestTimeout", "XXX",
--- a/src/devices/wifi/wifi-channel.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/wifi-channel.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -34,7 +34,7 @@
 TypeId 
 WifiChannel::GetTypdId (void)
 {
-  static TypeId tid = TypeId ("WifiChannel")
+  static TypeId tid = TypeId ("ns3::WifiChannel")
     .SetParent<WifiChannel> ()
     .AddConstructor<WifiChannel> ()
     .AddAttribute ("PropagationLossModel", "XXX",
--- a/src/devices/wifi/wifi-helper.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/wifi-helper.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -15,9 +15,9 @@
 
 WifiHelper::WifiHelper ()
 {
-  m_stationManager.SetTypeId ("ArfWifiManager");
-  m_phy.SetTypeId ("WifiPhy");
-  m_mac.SetTypeId ("AdhocWifiMac");
+  m_stationManager.SetTypeId ("ns3::ArfWifiManager");
+  m_phy.SetTypeId ("ns3::WifiPhy");
+  m_mac.SetTypeId ("ns3::AdhocWifiMac");
 }
 
 void 
--- a/src/devices/wifi/wifi-mac.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/wifi-mac.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -52,7 +52,7 @@
 TypeId 
 WifiMac::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("WifiMac")
+  static TypeId tid = TypeId ("ns3::WifiMac")
     .SetParent<Object> ()
     .AddAttribute ("CtsTimeout", "XXX",
                    GetDefaultCtsAckTimeout (),
--- a/src/devices/wifi/wifi-net-device.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/wifi-net-device.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -33,7 +33,7 @@
 TypeId 
 WifiNetDevice::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("WifiNetDevice")
+  static TypeId tid = TypeId ("ns3::WifiNetDevice")
     .SetParent<NetDevice> ()
     .AddAttribute ("Channel", "XXX",
                    Ptr<Channel> (0),
--- a/src/devices/wifi/wifi-phy.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/wifi-phy.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -182,7 +182,7 @@
 TypeId 
 WifiPhy::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("WifiPhy")
+  static TypeId tid = TypeId ("ns3::WifiPhy")
     .SetParent<Object> ()
     .AddConstructor<WifiPhy> ()
     .AddAttribute ("EnergyDetectionThreshold",
--- a/src/devices/wifi/wifi-remote-station-manager.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/wifi-remote-station-manager.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -123,7 +123,7 @@
 TypeId 
 WifiRemoteStationManager::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("WifiRemoteStationManager")
+  static TypeId tid = TypeId ("ns3::WifiRemoteStationManager")
     .SetParent<Object> ()
     .AddAttribute ("IsLowLatency", "XXX",
                    Boolean (true),
--- a/src/devices/wifi/wifi-remote-station-manager.h	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/devices/wifi/wifi-remote-station-manager.h	Thu Mar 13 12:56:49 2008 -0700
@@ -33,6 +33,14 @@
 class NonUnicastWifiRemoteStation;
 class WifiPhy;
 
+/**
+ * \brief hold per-remote-station state.
+ *
+ * The state in this class is used to keep track
+ * of association status if we are in an infrastructure
+ * network and to perform the selection of tx parameters
+ * on a per-packet basis.
+ */
 class WifiRemoteStationManager : public Object
 {
 private:
--- a/src/internet-node/arp-l3-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/internet-node/arp-l3-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -40,7 +40,7 @@
 TypeId 
 ArpL3Protocol::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ArpL3Protocol")
+  static TypeId tid = TypeId ("ns3::ArpL3Protocol")
     .SetParent<Object> ()
     ;
   return tid;
--- a/src/internet-node/ipv4-l3-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/internet-node/ipv4-l3-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -49,7 +49,7 @@
 TypeId 
 Ipv4L3Protocol::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Ipv4L3Protocol")
+  static TypeId tid = TypeId ("ns3::Ipv4L3Protocol")
     .SetParent<Object> ()
     .AddConstructor<Ipv4L3Protocol> ()
     .AddAttribute ("DefaultTtl", "The TTL value set by default on all outgoing packets generated on this node.",
--- a/src/internet-node/ipv4-l4-demux.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/internet-node/ipv4-l4-demux.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -35,7 +35,7 @@
 TypeId 
 Ipv4L4Demux::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Ipv4L4Demux")
+  static TypeId tid = TypeId ("ns3::Ipv4L4Demux")
     .SetParent<Object> ()
     .AddAttribute ("Protocols", "The set of protocols registered with this demux.",
                    ObjectVector (),
--- a/src/internet-node/ipv4-l4-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/internet-node/ipv4-l4-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -32,7 +32,7 @@
 TypeId 
 Ipv4L4Protocol::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Ipv4L4Protocol")
+  static TypeId tid = TypeId ("ns3::Ipv4L4Protocol")
     .SetParent<Object> ()
     .AddAttribute ("ProtocolNumber", "The Ipv4 protocol number.",
                    Uinteger (0),
--- a/src/internet-node/rtt-estimator.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/internet-node/rtt-estimator.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -39,7 +39,7 @@
 TypeId 
 RttEstimator::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RttEstimator")
+  static TypeId tid = TypeId ("ns3::RttEstimator")
     .SetParent<Object> ()
     .AddAttribute ("MaxMultiplier", 
                    "XXX",
@@ -172,7 +172,7 @@
 TypeId 
 RttMeanDeviation::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RttMeanDeviation")
+  static TypeId tid = TypeId ("ns3::RttMeanDeviation")
     .SetParent<RttEstimator> ()
     .AddConstructor<RttMeanDeviation> ()
     .AddAttribute ("Gain",
--- a/src/internet-node/tcp-l4-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/internet-node/tcp-l4-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -322,7 +322,7 @@
 TypeId 
 TcpL4Protocol::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("TcpL4Protocol")
+  static TypeId tid = TypeId ("ns3::TcpL4Protocol")
     .SetParent<Ipv4L4Protocol> ()
     .AddAttribute ("RttEstimatorFactory",
                    "How RttEstimator objects are created.",
--- a/src/internet-node/udp-l4-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/internet-node/udp-l4-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -43,7 +43,7 @@
 TypeId 
 UdpL4Protocol::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("UdpL4Protocol")
+  static TypeId tid = TypeId ("ns3::UdpL4Protocol")
     .SetParent<Ipv4L4Protocol> ()
     .AddConstructor<UdpL4Protocol> ()
     ;
--- a/src/mobility/hierarchical-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/hierarchical-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -27,7 +27,7 @@
 TypeId 
 HierarchicalMobilityModel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("HierarchicalMobilityModel")
+  static TypeId tid = TypeId ("ns3::HierarchicalMobilityModel")
     .SetParent<MobilityModel> ()
     .AddConstructor<HierarchicalMobilityModel> ()
     .AddAttribute ("Child", "The child mobility model.",
--- a/src/mobility/mobility-helper.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/mobility-helper.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -14,7 +14,7 @@
 {
   m_position = CreateObject<RandomRectanglePositionAllocator> ("X", ConstantVariable (0.0),
 								   "Y", ConstantVariable (0.0));
-  m_mobility.SetTypeId ("StaticMobilityModel");
+  m_mobility.SetTypeId ("ns3::StaticMobilityModel");
 }
 void 
 MobilityHelper::EnableNotifier (void)
@@ -126,7 +126,7 @@
 	      Ptr<MobilityModel> parent = m_mobilityStack.back ();
 	      Ptr<MobilityModel> hierarchical = 
 		CreateObject<HierarchicalMobilityModel> ("Child", model,
-							     "Parent", parent);
+							 "Parent", parent);
 	      object->AggregateObject (hierarchical);
 	      NS_LOG_DEBUG ("node="<<object<<", mob="<<hierarchical);
 	    }
--- a/src/mobility/mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -26,7 +26,7 @@
 TypeId 
 MobilityModel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("MobilityModel")
+  static TypeId tid = TypeId ("ns3::MobilityModel")
     .SetParent<Object> ()
     .AddAttribute ("Position", "The current position of the mobility model.",
                    TypeId::ATTR_SGC,
--- a/src/mobility/position-allocator.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/position-allocator.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -34,7 +34,7 @@
 TypeId 
 PositionAllocator::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("PositionAllocator")
+  static TypeId tid = TypeId ("ns3::PositionAllocator")
     .SetParent<Object> ();
   return tid;
 }
@@ -51,7 +51,7 @@
 TypeId 
 ListPositionAllocator::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ListPositionAllocator")
+  static TypeId tid = TypeId ("ns3::ListPositionAllocator")
     .SetParent<PositionAllocator> ()
     .AddConstructor<ListPositionAllocator> ()
     ;
@@ -78,7 +78,7 @@
 TypeId 
 GridPositionAllocator::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("GridPositionAllocator")
+  static TypeId tid = TypeId ("ns3::GridPositionAllocator")
     .SetParent<PositionAllocator> ()
     .SetGroupName ("Mobility")
     .AddConstructor<GridPositionAllocator> ()
@@ -138,7 +138,7 @@
 TypeId
 RandomRectanglePositionAllocator::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RandomRectanglePositionAllocator")
+  static TypeId tid = TypeId ("ns3::RandomRectanglePositionAllocator")
     .SetParent<PositionAllocator> ()
     .SetGroupName ("Mobility")
     .AddConstructor<RandomRectanglePositionAllocator> ()
@@ -172,7 +172,7 @@
 TypeId
 RandomDiscPositionAllocator::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RandomDiscPositionAllocator")
+  static TypeId tid = TypeId ("ns3::RandomDiscPositionAllocator")
     .SetParent<PositionAllocator> ()
     .SetGroupName ("Mobility")
     .AddConstructor<RandomDiscPositionAllocator> ()
--- a/src/mobility/random-direction-2d-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/random-direction-2d-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -36,7 +36,7 @@
 TypeId
 RandomDirection2dMobilityModel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RandomDirection2dMobilityModel")
+  static TypeId tid = TypeId ("ns3::RandomDirection2dMobilityModel")
     .SetParent<MobilityModel> ()
     .SetGroupName ("Mobility")
     .AddConstructor<RandomDirection2dMobilityModel> ()
--- a/src/mobility/random-walk-2d-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/random-walk-2d-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -33,7 +33,7 @@
 TypeId
 RandomWalk2dMobilityModel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RandomWalk2dMobilityModel")
+  static TypeId tid = TypeId ("ns3::RandomWalk2dMobilityModel")
     .SetParent<MobilityModel> ()
     .SetGroupName ("Mobility")
     .AddConstructor<RandomWalk2dMobilityModel> ()
--- a/src/mobility/random-waypoint-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/random-waypoint-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -30,7 +30,7 @@
 TypeId
 RandomWaypointMobilityModel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RandomWaypointMobilityModel")
+  static TypeId tid = TypeId ("ns3::RandomWaypointMobilityModel")
     .SetParent<MobilityModel> ()
     .SetGroupName ("Mobility")
     .AddConstructor<RandomWaypointMobilityModel> ()
--- a/src/mobility/static-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/static-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -26,7 +26,7 @@
 TypeId
 StaticMobilityModel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("StaticMobilityModel")
+  static TypeId tid = TypeId ("ns3::StaticMobilityModel")
     .SetParent<MobilityModel> ()
     .AddConstructor<StaticMobilityModel> ()
     ;
--- a/src/mobility/static-speed-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/mobility/static-speed-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -26,7 +26,7 @@
 
 TypeId StaticSpeedMobilityModel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("StaticSpeedMobilityModel")
+  static TypeId tid = TypeId ("ns3::StaticSpeedMobilityModel")
     .SetParent<MobilityModel> ()
     .AddConstructor<StaticSpeedMobilityModel> ();
   return tid;
--- a/src/node/application.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/application.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -38,7 +38,7 @@
 TypeId 
 Application::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Application")
+  static TypeId tid = TypeId ("ns3::Application")
     .SetParent<Object> ()
     ;
   return tid;
--- a/src/node/channel.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/channel.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -29,7 +29,7 @@
 TypeId 
 Channel::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Channel")
+  static TypeId tid = TypeId ("ns3::Channel")
     .SetParent<Object> ();
   return tid;
 }
--- a/src/node/drop-tail-queue.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/drop-tail-queue.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -29,7 +29,7 @@
 
 TypeId DropTailQueue::GetTypeId (void) 
 {
-  static TypeId tid = TypeId ("DropTailQueue")
+  static TypeId tid = TypeId ("ns3::DropTailQueue")
     .SetParent<Queue> ()
     .AddConstructor<DropTailQueue> ()
     .AddAttribute ("MaxPackets", "The maximum number of packets accepted by this DropTailQueue.",
--- a/src/node/ipv4.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/ipv4.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -30,7 +30,7 @@
 TypeId 
 Ipv4::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Ipv4")
+  static TypeId tid = TypeId ("ns3::Ipv4")
     .SetParent<Object> ();
   return tid;
 }
--- a/src/node/net-device.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/net-device.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -31,7 +31,7 @@
 
 TypeId NetDevice::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("NetDevice")
+  static TypeId tid = TypeId ("ns3::NetDevice")
     .SetParent<Object> ();
   return tid;
 }
--- a/src/node/node.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/node.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -35,7 +35,7 @@
 TypeId 
 Node::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Node")
+  static TypeId tid = TypeId ("ns3::Node")
     .SetParent<Object> ()
     .AddAttribute ("DeviceList", "The list of devices associated to this Node.",
                    ObjectVector (),
--- a/src/node/packet-socket-factory.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/packet-socket-factory.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -29,7 +29,7 @@
 TypeId 
 PacketSocketFactory::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Packet")
+  static TypeId tid = TypeId ("ns3::PacketSocketFactory")
     .SetParent<SocketFactory> ();
   return tid;
 }
--- a/src/node/queue.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/queue.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -30,7 +30,7 @@
 TypeId 
 Queue::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Queue")
+  static TypeId tid = TypeId ("ns3::Queue")
     .SetParent<Object> ()
     .AddTraceSource ("Enqueue", "XXX",
                      MakeTraceSourceAccessor (&Queue::m_traceEnqueue))
--- a/src/node/socket-factory.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/socket-factory.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -26,7 +26,7 @@
 
 TypeId SocketFactory::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("SocketFactory")
+  static TypeId tid = TypeId ("ns3::SocketFactory")
     .SetParent<Object> ();
   return tid;
 }
--- a/src/node/tcp.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/tcp.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -27,7 +27,7 @@
 TypeId
 Tcp::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Tcp")
+  static TypeId tid = TypeId ("ns3::Tcp")
     .SetParent<SocketFactory> ()
    .AddAttribute ("TcpDefaultSegmentSize",
                   "Default TCP maximum segment size in bytes (may be adjusted based on MTU discovery)",
--- a/src/node/udp.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/node/udp.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -26,7 +26,7 @@
 
 TypeId Udp::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Udp")
+  static TypeId tid = TypeId ("ns3::Udp")
     .SetParent<SocketFactory> ();
   return tid;
 }
--- a/src/routing/global-routing/global-router-interface.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/routing/global-routing/global-router-interface.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -436,7 +436,7 @@
 TypeId 
 GlobalRouter::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("GlobalRouter")
+  static TypeId tid = TypeId ("ns3::GlobalRouter")
     .SetParent<Object> ();
   return tid;
 }
--- a/src/routing/olsr/olsr-agent-impl.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/routing/olsr/olsr-agent-impl.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -154,7 +154,7 @@
 TypeId 
 AgentImpl::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("olsr::AgentImpl")
+  static TypeId tid = TypeId ("ns3::olsr::AgentImpl")
     .SetParent<Agent> ()
     .AddConstructor<AgentImpl> ()
     .AddAttribute ("HelloInterval", "XXX",
--- a/src/routing/olsr/olsr-agent.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/routing/olsr/olsr-agent.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -28,7 +28,7 @@
 TypeId 
 Agent::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("OlsrAgent")
+  static TypeId tid = TypeId ("ns3::olsr::Agent")
     .SetParent<Object> ();
   return tid;
 }
--- a/src/routing/olsr/olsr-helper.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/src/routing/olsr/olsr-helper.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -6,7 +6,7 @@
 
 OlsrHelper::OlsrHelper ()
 {
-  m_agentFactory.SetTypeId ("olsr::AgentImpl");
+  m_agentFactory.SetTypeId ("ns3::olsr::AgentImpl");
 }
 
 void 
--- a/utils/print-introspected-doxygen.cc	Thu Mar 13 11:21:12 2008 -0700
+++ b/utils/print-introspected-doxygen.cc	Thu Mar 13 12:56:49 2008 -0700
@@ -1,29 +1,92 @@
-#include "ns3/internet-node.h"
-#include "ns3/ptr.h"
-#include "ns3/node-list.h"
-#include "ns3/point-to-point-net-device.h"
-#include "ns3/csma-net-device.h"
-#include "ns3/queue.h"
-#include "ns3/drop-tail-queue.h"
-#include "ns3/mobility-model-notifier.h"
-#include "ns3/string.h"
+#include <iostream>
+#include "ns3/object.h"
 
 using namespace ns3;
 
+void
+PrintAttributes (TypeId tid, std::ostream &os)
+{
+  os << "<ul>"<<std::endl;
+  for (uint32_t j = 0; j < tid.GetAttributeListN (); j++)
+    {
+      os << "<li><b>" << tid.GetAttributeName (j) << "</b>: "
+		<< tid.GetAttributeHelp (j) << std::endl;
+      Ptr<const AttributeChecker> checker = tid.GetAttributeChecker (j);
+      os << "  <ul>" << std::endl << "    <li>Type: " <<  checker->GetType ();
+      if (checker->HasTypeConstraints ())
+	{
+	  os << " -> " << checker->GetTypeConstraints ();
+	}
+      os << "</li>" << std::endl;
+      uint32_t flags = tid.GetAttributeFlags (j);
+      os << "<li>Flags: ";
+      if (flags & TypeId::ATTR_SET)
+	{
+	  os << "write ";
+	}
+      if (flags & TypeId::ATTR_GET)
+	{
+	  os << "read ";
+	}
+      if (flags & TypeId::ATTR_CONSTRUCT)
+	{
+	  os << "construct ";
+	}
+      os << "  </ul> " << std::endl;
+      
+    }
+  os << "</ul>" << std::endl;
+}
 
 
 int main (int argc, char *argv[])
 {
-  Ptr<Node> node = CreateObject<InternetNode> ();
-  node->AggregateObject (CreateObject<MobilityModelNotifier> ());
 
-  Ptr<PointToPointNetDevice> p2p = CreateObject<PointToPointNetDevice> ("Address", Mac48Address::Allocate ());
-  node->AddDevice (p2p);
-  p2p->AddQueue (CreateObject<DropTailQueue> ());
-  Ptr<CsmaNetDevice> csma = CreateObject<CsmaNetDevice> ("Address", Mac48Address::Allocate (),
-							 "EncapsulationMode", String ("Llc"));
-  node->AddDevice (csma);
-  csma->AddQueue (CreateObject<DropTailQueue> ());
+  for (uint32_t i = 0; i < TypeId::GetRegisteredN (); i++)
+    {
+      std::cout << "/*!" << std::endl;
+      TypeId tid = TypeId::GetRegistered (i);
+      if (tid.MustHideFromDocumentation ())
+	{
+	  continue;
+	}
+      std::cout << "\\fn static TypeId " << tid.GetName () << "::GetTypeId (void)" << std::endl;
+      std::cout << "\\brief This method returns the TypeId associated to \\ref " << tid.GetName () << std::endl << std::endl;
+      if (tid.GetAttributeListN () == 0)
+	{
+	  std::cout << "No Attributes defined for this type." << std::endl;
+	}
+      else
+	{
+	  std::cout << "Attributes defined for this type:" << std::endl;
+	  PrintAttributes (tid, std::cout);
+	}
+      bool hasAttributesInParent = false;
+      TypeId tmp = tid.GetParent ();
+      while (tmp.GetParent () != tmp)
+	{
+	  if (tmp.GetAttributeListN () != 0)
+	    {
+	      hasAttributesInParent = true;
+	    }
+	  tmp = tmp.GetParent ();
+	}
+      if (hasAttributesInParent)
+	{
+	  std::cout << "Attributes defined in parent classes:<br>" << std::endl;
+	  tmp = tid.GetParent ();
+	  while (tmp.GetParent () != tmp)
+	    {
+	      if (tmp.GetAttributeListN () != 0)
+		{
+		  std::cout << tmp.GetName () << std::endl;
+		  PrintAttributes (tmp, std::cout);
+		}
+	      tmp = tmp.GetParent ();
+	    }
+	}
+      std::cout << "*/" << std::endl;
+    }
 
 
   return 0;