add back support for introspected doxygen.
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Thu, 13 Mar 2008 12:56:49 -0700
changeset 2602d9262bff6df2
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
     1.1 --- a/examples/csma-broadcast.cc	Thu Mar 13 11:21:12 2008 -0700
     1.2 +++ b/examples/csma-broadcast.cc	Thu Mar 13 12:56:49 2008 -0700
     1.3 @@ -150,7 +150,7 @@
     1.4    NS_LOG_INFO ("Create Applications.");
     1.5    Ptr<OnOffApplication> ooff = 
     1.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("255.255.255.255", port)), 
     1.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
     1.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
     1.9                                      "OnTime", ConstantVariable(1), 
    1.10                                      "OffTime", ConstantVariable(0));
    1.11    n0->AddApplication (ooff);
    1.12 @@ -161,7 +161,7 @@
    1.13    // Create an optional packet sink to receive these packets
    1.14    Ptr<PacketSink> sink = 
    1.15      CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
    1.16 -                              "Protocol", TypeId::LookupByName ("Udp"));
    1.17 +                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
    1.18    n1->AddApplication (sink);
    1.19    // Start the sink
    1.20    sink->Start (Seconds (1.0));
    1.21 @@ -169,7 +169,7 @@
    1.22  
    1.23    // Create an optional packet sink to receive these packets
    1.24    sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
    1.25 -                                   "Protocol", TypeId::LookupByName ("Udp"));
    1.26 +                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
    1.27    n2->AddApplication (sink);
    1.28  
    1.29    // Start the sink
     2.1 --- a/examples/csma-multicast.cc	Thu Mar 13 11:21:12 2008 -0700
     2.2 +++ b/examples/csma-multicast.cc	Thu Mar 13 12:56:49 2008 -0700
     2.3 @@ -279,7 +279,7 @@
     2.4    // every few seconds
     2.5    Ptr<OnOffApplication> ooff = 
     2.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress (multicastGroup, port)), 
     2.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
     2.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
     2.9                                      "OnTime", ConstantVariable(1), 
    2.10                                      "OffTime", ConstantVariable(0),
    2.11                                      "DataRate", DataRate ("255b/s"),
    2.12 @@ -296,7 +296,7 @@
    2.13    // for every packet received
    2.14    Ptr<PacketSink> sink = 
    2.15      CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
    2.16 -                              "Protocol", TypeId::LookupByName ("Udp"));
    2.17 +                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
    2.18    n4->AddApplication (sink);
    2.19    // Start the sink
    2.20    sink->Start (Seconds (1.0));
     3.1 --- a/examples/csma-one-subnet.cc	Thu Mar 13 11:21:12 2008 -0700
     3.2 +++ b/examples/csma-one-subnet.cc	Thu Mar 13 12:56:49 2008 -0700
     3.3 @@ -161,7 +161,7 @@
     3.4    uint16_t port = 9;   // Discard port (RFC 863)
     3.5    Ptr<OnOffApplication> ooff = 
     3.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.1.2", port)), 
     3.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
     3.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
     3.9                                      "OnTime", ConstantVariable(1), 
    3.10                                      "OffTime", ConstantVariable(0));
    3.11    n0->AddApplication (ooff);
    3.12 @@ -175,7 +175,7 @@
    3.13  // Create a similar flow from n3 to n0, starting at time 1.1 seconds
    3.14  //
    3.15    ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.1.1", port)), 
    3.16 -                                         "Protocol", TypeId::LookupByName ("Udp"),
    3.17 +                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
    3.18                                           "OnTime", ConstantVariable(1), 
    3.19                                           "OffTime", ConstantVariable(0));
    3.20    n3->AddApplication (ooff);
     4.1 --- a/examples/csma-packet-socket.cc	Thu Mar 13 11:21:12 2008 -0700
     4.2 +++ b/examples/csma-packet-socket.cc	Thu Mar 13 12:56:49 2008 -0700
     4.3 @@ -141,7 +141,7 @@
     4.4    NS_LOG_INFO ("Create Applications.");
     4.5    Ptr<OnOffApplication> ooff = 
     4.6      CreateObject<OnOffApplication> ("Remote", Address (n0ToN1),
     4.7 -                                    "Protocol", TypeId::LookupByName ("Packet"),
     4.8 +                                    "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"),
     4.9                                      "OnTime", ConstantVariable(1), 
    4.10                                      "OffTime", ConstantVariable(0));
    4.11    n0->AddApplication (ooff);
    4.12 @@ -151,7 +151,7 @@
    4.13  
    4.14    // Create a similar flow from n3 to n0, starting at time 1.1 seconds
    4.15    ooff = CreateObject<OnOffApplication> ("Remote", Address (n3ToN0),
    4.16 -                                         "Protocol", TypeId::LookupByName ("Packet"),
    4.17 +                                         "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"),
    4.18                                           "OnTime", ConstantVariable(1), 
    4.19                                           "OffTime", ConstantVariable(0));
    4.20    n3->AddApplication (ooff);
     5.1 --- a/examples/mixed-global-routing.cc	Thu Mar 13 11:21:12 2008 -0700
     5.2 +++ b/examples/mixed-global-routing.cc	Thu Mar 13 12:56:49 2008 -0700
     5.3 @@ -187,7 +187,7 @@
     5.4    uint16_t port = 9;   // Discard port (RFC 863)
     5.5    Ptr<OnOffApplication> ooff = 
     5.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), 
     5.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
     5.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
     5.9                                      "OnTime", ConstantVariable (1), 
    5.10                                      "OffTime", ConstantVariable (0),
    5.11                                      "DataRate", DataRate("300bps"),
     6.1 --- a/examples/simple-alternate-routing.cc	Thu Mar 13 11:21:12 2008 -0700
     6.2 +++ b/examples/simple-alternate-routing.cc	Thu Mar 13 12:56:49 2008 -0700
     6.3 @@ -184,7 +184,7 @@
     6.4    // Create a flow from n3 to n1, starting at time 1.1 seconds
     6.5    Ptr<OnOffApplication> ooff = 
     6.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.1.1", port)),
     6.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
     6.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
     6.9                                      "OnTime", ConstantVariable (1), 
    6.10                                      "OffTime", ConstantVariable (0));
    6.11    n3->AddApplication (ooff);
    6.12 @@ -195,7 +195,7 @@
    6.13    // Create a packet sink to receive these packets
    6.14    Ptr<PacketSink> sink = 
    6.15      CreateObject<PacketSink> ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), 
    6.16 -                              "Protocol", TypeId::LookupByName ("Udp"));
    6.17 +                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
    6.18    n1->AddApplication (sink);
    6.19    // Start the sink
    6.20    sink->Start (Seconds (1.1));
     7.1 --- a/examples/simple-error-model.cc	Thu Mar 13 11:21:12 2008 -0700
     7.2 +++ b/examples/simple-error-model.cc	Thu Mar 13 12:56:49 2008 -0700
     7.3 @@ -144,7 +144,7 @@
     7.4    uint16_t port = 9;   // Discard port (RFC 863)
     7.5    Ptr<OnOffApplication> ooff = 
     7.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), 
     7.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
     7.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
     7.9                                      "OnTime", ConstantVariable(1), 
    7.10                                      "OffTime", ConstantVariable(0));
    7.11    n0->AddApplication (ooff);
    7.12 @@ -154,7 +154,7 @@
    7.13  
    7.14    // Create an optional packet sink to receive these packets
    7.15    Ptr<PacketSink> sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
    7.16 -                                                   "Protocol", TypeId::LookupByName ("Udp"));
    7.17 +                                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
    7.18    n3->AddApplication (sink);
    7.19    // Start the sink
    7.20    sink->Start (Seconds (1.0));
    7.21 @@ -162,7 +162,7 @@
    7.22  
    7.23    // Create a similar flow from n3 to n1, starting at time 1.1 seconds
    7.24    ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), 
    7.25 -                                         "Protocol", TypeId::LookupByName ("Udp"),
    7.26 +                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
    7.27                                           "OnTime", ConstantVariable(1), 
    7.28                                           "OffTime", ConstantVariable(0));
    7.29    n3->AddApplication (ooff);
    7.30 @@ -172,7 +172,7 @@
    7.31  
    7.32    // Create a packet sink to receive these packets
    7.33    sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
    7.34 -                                   "Protocol", TypeId::LookupByName ("Udp"));
    7.35 +                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
    7.36    n1->AddApplication (sink);
    7.37    // Start the sink
    7.38    sink->Start (Seconds (1.1));
     8.1 --- a/examples/simple-global-routing.cc	Thu Mar 13 11:21:12 2008 -0700
     8.2 +++ b/examples/simple-global-routing.cc	Thu Mar 13 12:56:49 2008 -0700
     8.3 @@ -161,7 +161,7 @@
     8.4    uint16_t port = 9;   // Discard port (RFC 863)
     8.5    Ptr<OnOffApplication> ooff = 
     8.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), 
     8.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
     8.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
     8.9                                      "OnTime", ConstantVariable (1), 
    8.10                                      "OffTime", ConstantVariable (0));
    8.11    n0->AddApplication (ooff);
    8.12 @@ -173,7 +173,7 @@
    8.13    // The last argument "true" disables output from the Receive callback
    8.14    Ptr<PacketSink> sink = 
    8.15      CreateObject<PacketSink> ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
    8.16 -                              "Protocol", TypeId::LookupByName ("Udp"));
    8.17 +                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
    8.18    n3->AddApplication (sink);
    8.19    // Start the sink
    8.20    sink->Start (Seconds (1.0));
    8.21 @@ -181,7 +181,7 @@
    8.22  
    8.23    // Create a similar flow from n3 to n1, starting at time 1.1 seconds
    8.24    ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.2.1", port)),
    8.25 -                                         "Protocol", TypeId::LookupByName ("Udp"),
    8.26 +                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
    8.27                                           "OnTime", ConstantVariable (1), 
    8.28                                           "OffTime", ConstantVariable (0));
    8.29    n3->AddApplication (ooff);
    8.30 @@ -191,7 +191,7 @@
    8.31  
    8.32    // Create a packet sink to receive these packets
    8.33    sink = CreateObject<PacketSink> ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), 
    8.34 -                                   "Protocol", TypeId::LookupByName ("Udp"));
    8.35 +                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
    8.36    n1->AddApplication (sink);
    8.37    // Start the sink
    8.38    sink->Start (Seconds (1.1));
     9.1 --- a/examples/simple-point-to-point-olsr.cc	Thu Mar 13 11:21:12 2008 -0700
     9.2 +++ b/examples/simple-point-to-point-olsr.cc	Thu Mar 13 12:56:49 2008 -0700
     9.3 @@ -168,7 +168,7 @@
     9.4    uint16_t port = 9;   // Discard port (RFC 863)
     9.5    Ptr<OnOffApplication> ooff = 
     9.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.4.2", port)), 
     9.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
     9.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
     9.9                                      "OnTime", ConstantVariable(1), 
    9.10                                      "OffTime", ConstantVariable(0));
    9.11    n0->AddApplication (ooff);
    9.12 @@ -178,14 +178,14 @@
    9.13    // Create an optional packet sink to receive these packets
    9.14    Ptr<PacketSink> sink = 
    9.15      CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
    9.16 -                              "Protocol", TypeId::LookupByName ("Udp"));
    9.17 +                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
    9.18    n3->AddApplication (sink);
    9.19    // Start the sink
    9.20    sink->Start (Seconds (1.0));
    9.21  
    9.22    // Create a similar flow from n3 to n1, starting at time 1.1 seconds
    9.23    ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), 
    9.24 -                                         "Protocol", TypeId::LookupByName ("Udp"),
    9.25 +                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
    9.26                                           "OnTime", ConstantVariable(1), 
    9.27                                           "OffTime", ConstantVariable(0));
    9.28    n3->AddApplication (ooff);
    9.29 @@ -194,7 +194,7 @@
    9.30  
    9.31    // Create a packet sink to receive these packets
    9.32    sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
    9.33 -                                   "Protocol", TypeId::LookupByName ("Udp"));
    9.34 +                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
    9.35    n1->AddApplication (sink);
    9.36    // Start the sink
    9.37    sink->Start (Seconds (1.1));
    10.1 --- a/examples/simple-point-to-point.cc	Thu Mar 13 11:21:12 2008 -0700
    10.2 +++ b/examples/simple-point-to-point.cc	Thu Mar 13 12:56:49 2008 -0700
    10.3 @@ -137,7 +137,7 @@
    10.4    uint16_t port = 9;   // Discard port (RFC 863)
    10.5    Ptr<OnOffApplication> ooff = 
    10.6      CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), 
    10.7 -                                    "Protocol", TypeId::LookupByName ("Udp"),
    10.8 +                                    "Protocol", TypeId::LookupByName ("ns3::Udp"),
    10.9                                      "OnTime", ConstantVariable(1), 
   10.10                                      "OffTime", ConstantVariable(0));
   10.11    n0->AddApplication (ooff);
   10.12 @@ -147,14 +147,14 @@
   10.13    // Create an optional packet sink to receive these packets
   10.14    Ptr<PacketSink> sink = 
   10.15      CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
   10.16 -                              "Protocol", TypeId::LookupByName ("Udp"));
   10.17 +                              "Protocol", TypeId::LookupByName ("ns3::Udp"));
   10.18    n3->AddApplication (sink);
   10.19    // Start the sink
   10.20    sink->Start (Seconds (1.0));
   10.21  
   10.22    // Create a similar flow from n3 to n1, starting at time 1.1 seconds
   10.23    ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), 
   10.24 -                                         "Protocol", TypeId::LookupByName ("Udp"),
   10.25 +                                         "Protocol", TypeId::LookupByName ("ns3::Udp"),
   10.26                                           "OnTime", ConstantVariable(1), 
   10.27                                           "OffTime", ConstantVariable(0));
   10.28    n3->AddApplication (ooff);
   10.29 @@ -163,7 +163,7 @@
   10.30  
   10.31    // Create a packet sink to receive these packets
   10.32    sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)),
   10.33 -                                   "Protocol", TypeId::LookupByName ("Udp"));
   10.34 +                                   "Protocol", TypeId::LookupByName ("ns3::Udp"));
   10.35    n1->AddApplication (sink);
   10.36    // Start the sink
   10.37    sink->Start (Seconds (1.1));
   10.38 @@ -173,7 +173,7 @@
   10.39    uint16_t servPort = 500;
   10.40  
   10.41    ooff = CreateObject<OnOffApplication> ("Remote", Address (InetSocketAddress ("10.1.3.2", servPort)), 
   10.42 -                                         "Protocol", TypeId::LookupByName ("Tcp"),
   10.43 +                                         "Protocol", TypeId::LookupByName ("ns3::Tcp"),
   10.44                                           "OnTime", ConstantVariable(1), 
   10.45                                           "OffTime", ConstantVariable(0));
   10.46    n0->AddApplication (ooff);
   10.47 @@ -183,7 +183,7 @@
   10.48  
   10.49    // Create a packet sink to receive these TCP packets
   10.50    sink = CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
   10.51 -                                   "Protocol", TypeId::LookupByName ("Tcp"));
   10.52 +                                   "Protocol", TypeId::LookupByName ("ns3::Tcp"));
   10.53    n3->AddApplication (sink);
   10.54    sink->Start (Seconds (1.2));
   10.55  
    11.1 --- a/examples/tcp-large-transfer-errors.cc	Thu Mar 13 11:21:12 2008 -0700
    11.2 +++ b/examples/tcp-large-transfer-errors.cc	Thu Mar 13 12:56:49 2008 -0700
    11.3 @@ -199,7 +199,7 @@
    11.4    // Create a packet sink to receive these packets
    11.5    Ptr<PacketSink> sink = 
    11.6      CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
    11.7 -                              "Protocol", TypeId::LookupByName ("Tcp"));
    11.8 +                              "Protocol", TypeId::LookupByName ("ns3::Tcp"));
    11.9    n2->AddApplication (sink);
   11.10    sink->Start (Seconds (0.0));
   11.11    sink->Stop (Seconds (10000.0));
    12.1 --- a/examples/tcp-large-transfer.cc	Thu Mar 13 11:21:12 2008 -0700
    12.2 +++ b/examples/tcp-large-transfer.cc	Thu Mar 13 12:56:49 2008 -0700
    12.3 @@ -199,7 +199,7 @@
    12.4    // Create a packet sink to receive these packets
    12.5    Ptr<PacketSink> sink = 
    12.6      CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
    12.7 -                              "Protocol", TypeId::LookupByName ("Tcp"));
    12.8 +                              "Protocol", TypeId::LookupByName ("ns3::Tcp"));
    12.9    n2->AddApplication (sink);
   12.10    sink->Start (Seconds (0.0));
   12.11    sink->Stop (Seconds (100.0));
    13.1 --- a/examples/tcp-nonlistening-server.cc	Thu Mar 13 11:21:12 2008 -0700
    13.2 +++ b/examples/tcp-nonlistening-server.cc	Thu Mar 13 12:56:49 2008 -0700
    13.3 @@ -162,7 +162,7 @@
    13.4    Ptr<PacketSink> sink = Create<PacketSink> (
    13.5      n2,
    13.6      InetSocketAddress (Ipv4Address::GetAny (), servPort),
    13.7 -    "Tcp");
    13.8 +    "ns3::Tcp");
    13.9    // Start the sink
   13.10    sink->Start (Seconds (0.0));
   13.11    sink->Stop (Seconds (10.0));
    14.1 --- a/examples/tcp-small-transfer-oneloss.cc	Thu Mar 13 11:21:12 2008 -0700
    14.2 +++ b/examples/tcp-small-transfer-oneloss.cc	Thu Mar 13 12:56:49 2008 -0700
    14.3 @@ -181,7 +181,7 @@
    14.4    // Create a packet sink to receive these packets
    14.5    Ptr<PacketSink> sink = 
    14.6      CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
    14.7 -                              "Protocol", TypeId::LookupByName ("Tcp"));
    14.8 +                              "Protocol", TypeId::LookupByName ("ns3::Tcp"));
    14.9    n2->AddApplication (sink);
   14.10    sink->Start (Seconds (0.0));
   14.11    sink->Stop (Seconds (100.0));
    15.1 --- a/examples/tcp-small-transfer.cc	Thu Mar 13 11:21:12 2008 -0700
    15.2 +++ b/examples/tcp-small-transfer.cc	Thu Mar 13 12:56:49 2008 -0700
    15.3 @@ -191,7 +191,7 @@
    15.4    // Create a packet sink to receive these packets
    15.5    Ptr<PacketSink> sink = 
    15.6      CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
    15.7 -                              "Protocol", TypeId::LookupByName ("Tcp"));
    15.8 +                              "Protocol", TypeId::LookupByName ("ns3::Tcp"));
    15.9    n2->AddApplication (sink);
   15.10    sink->Start (Seconds (0.0));
   15.11    sink->Stop (Seconds (100.0));
    16.1 --- a/samples/main-adhoc-wifi.cc	Thu Mar 13 11:21:12 2008 -0700
    16.2 +++ b/samples/main-adhoc-wifi.cc	Thu Mar 13 12:56:49 2008 -0700
    16.3 @@ -117,7 +117,7 @@
    16.4  Ptr<Socket>
    16.5  Experiment::SetupPacketReceive (Ptr<Node> node)
    16.6  {
    16.7 -  TypeId tid = TypeId::LookupByName ("Packet");
    16.8 +  TypeId tid = TypeId::LookupByName ("ns3::PacketSocketFactory");
    16.9    Ptr<SocketFactory> socketFactory = node->GetObject<SocketFactory> (tid);
   16.10    Ptr<Socket> sink = socketFactory->CreateSocket ();
   16.11    sink->Bind ();
   16.12 @@ -150,7 +150,7 @@
   16.13    destination.SetPhysicalAddress (devices.Get (1)->GetAddress ());
   16.14    Ptr<Application> app = 
   16.15      CreateObject<OnOffApplication> ("Remote", Address (destination),
   16.16 -                                    "Protocol", TypeId::LookupByName ("Packet"),
   16.17 +                                    "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"),
   16.18                                      "OnTime", ConstantVariable (250),
   16.19                                      "OffTime", ConstantVariable (0),
   16.20                                      "DataRate", DataRate (60000000),
   16.21 @@ -185,61 +185,61 @@
   16.22    WifiHelper wifi;
   16.23    GnuplotDataset dataset;
   16.24  
   16.25 -  wifi.SetMac ("AdhocWifiMac");
   16.26 -  wifi.SetPhy ("WifiPhy");
   16.27 +  wifi.SetMac ("ns3::AdhocWifiMac");
   16.28 +  wifi.SetPhy ("ns3::WifiPhy");
   16.29  
   16.30    NS_LOG_DEBUG ("54");
   16.31    experiment = Experiment ("54mb");
   16.32 -  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
   16.33 +  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
   16.34                                  "DataMode", String ("wifia-54mbs"));
   16.35    dataset = experiment.Run (wifi);
   16.36    gnuplot.AddDataset (dataset);
   16.37  
   16.38    NS_LOG_DEBUG ("48");
   16.39    experiment = Experiment ("48mb");
   16.40 -  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
   16.41 +  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
   16.42                                  "DataMode", String ("wifia-48mbs"));
   16.43    dataset = experiment.Run (wifi);
   16.44    gnuplot.AddDataset (dataset);
   16.45  
   16.46    NS_LOG_DEBUG ("36");
   16.47    experiment = Experiment ("36mb");
   16.48 -  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
   16.49 +  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
   16.50                                  "DataMode", String ("wifia-36mbs"));
   16.51    dataset = experiment.Run (wifi);
   16.52    gnuplot.AddDataset (dataset);
   16.53  
   16.54    NS_LOG_DEBUG ("24");
   16.55    experiment = Experiment ("24mb");
   16.56 -  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
   16.57 +  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
   16.58                                  "DataMode", String ("wifia-24mbs"));
   16.59    dataset = experiment.Run (wifi);
   16.60    gnuplot.AddDataset (dataset);
   16.61  
   16.62    NS_LOG_DEBUG ("18");
   16.63    experiment = Experiment ("18mb");
   16.64 -  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
   16.65 +  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
   16.66                                  "DataMode", String ("wifia-18mbs"));
   16.67    dataset = experiment.Run (wifi);
   16.68    gnuplot.AddDataset (dataset);
   16.69  
   16.70    NS_LOG_DEBUG ("12");
   16.71    experiment = Experiment ("12mb");
   16.72 -  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
   16.73 +  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
   16.74                                  "DataMode", String ("wifia-12mbs"));
   16.75    dataset = experiment.Run (wifi);
   16.76    gnuplot.AddDataset (dataset);
   16.77  
   16.78    NS_LOG_DEBUG ("9");
   16.79    experiment = Experiment ("9mb");
   16.80 -  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
   16.81 +  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
   16.82                                  "DataMode", String ("wifia-9mbs"));
   16.83    dataset = experiment.Run (wifi);
   16.84    gnuplot.AddDataset (dataset);
   16.85  
   16.86    NS_LOG_DEBUG ("6");
   16.87    experiment = Experiment ("6mb");
   16.88 -  wifi.SetRemoteStationManager ("ConstantRateWifiManager",
   16.89 +  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
   16.90                                  "DataMode", String ("wifia-6mbs"));
   16.91    dataset = experiment.Run (wifi);
   16.92    gnuplot.AddDataset (dataset);
   16.93 @@ -254,19 +254,19 @@
   16.94  
   16.95    NS_LOG_DEBUG ("arf");
   16.96    experiment = Experiment ("arf");
   16.97 -  wifi.SetRemoteStationManager ("ArfWifiManager");
   16.98 +  wifi.SetRemoteStationManager ("ns3::ArfWifiManager");
   16.99    dataset = experiment.Run (wifi);
  16.100    gnuplot.AddDataset (dataset);
  16.101  
  16.102    NS_LOG_DEBUG ("aarf");
  16.103    experiment = Experiment ("aarf");
  16.104 -  wifi.SetRemoteStationManager ("AarfWifiManager");
  16.105 +  wifi.SetRemoteStationManager ("ns3::AarfWifiManager");
  16.106    dataset = experiment.Run (wifi);
  16.107    gnuplot.AddDataset (dataset);
  16.108  
  16.109    NS_LOG_DEBUG ("ideal");
  16.110    experiment = Experiment ("ideal");
  16.111 -  wifi.SetRemoteStationManager ("IdealWifiManager");
  16.112 +  wifi.SetRemoteStationManager ("ns3::IdealWifiManager");
  16.113    dataset = experiment.Run (wifi);
  16.114    gnuplot.AddDataset (dataset);
  16.115  
    17.1 --- a/samples/main-ap-wifi.cc	Thu Mar 13 11:21:12 2008 -0700
    17.2 +++ b/samples/main-ap-wifi.cc	Thu Mar 13 12:56:49 2008 -0700
    17.3 @@ -121,14 +121,14 @@
    17.4  
    17.5    Ptr<WifiChannel> channel = CreateObject<WifiChannel> ();
    17.6    Ssid ssid = Ssid ("wifi-default");
    17.7 -  wifi.SetPhy ("WifiPhy");
    17.8 -  wifi.SetRemoteStationManager ("ArfWifiManager");
    17.9 +  wifi.SetPhy ("ns3::WifiPhy");
   17.10 +  wifi.SetRemoteStationManager ("ns3::ArfWifiManager");
   17.11    // setup ap.
   17.12 -  wifi.SetMac ("NqstaWifiMac", "Ssid", ssid,
   17.13 +  wifi.SetMac ("ns3::NqstaWifiMac", "Ssid", ssid,
   17.14                 "ActiveProbing", Boolean (false));
   17.15    staDevs = wifi.Build (stas, channel);
   17.16    // setup stas.
   17.17 -  wifi.SetMac ("NqapWifiMac", "Ssid", ssid,
   17.18 +  wifi.SetMac ("ns3::NqapWifiMac", "Ssid", ssid,
   17.19                 "BeaconGeneration", Boolean (true),
   17.20                 "BeaconInterval", Seconds (2.5));
   17.21    wifi.Build (ap, channel);
   17.22 @@ -145,7 +145,7 @@
   17.23    destination.SetPhysicalAddress (staDevs.Get(1)->GetAddress ());
   17.24    Ptr<Application> app = 
   17.25      CreateObject<OnOffApplication> ("Remote", Address (destination), 
   17.26 -                                    "Protocol", TypeId::LookupByName ("Packet"),
   17.27 +                                    "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"),
   17.28                                      "OnTime", ConstantVariable (42),
   17.29                                      "OffTime", ConstantVariable (0));
   17.30    stas.Get (0)->AddApplication (app);
    18.1 --- a/samples/main-grid-topology.cc	Thu Mar 13 11:21:12 2008 -0700
    18.2 +++ b/samples/main-grid-topology.cc	Thu Mar 13 12:56:49 2008 -0700
    18.3 @@ -29,7 +29,7 @@
    18.4    // started from (-100,-100) with 20 objects per row, 
    18.5    // the x interval between each object is 5 meters
    18.6    // and the y interval between each object is 20 meters
    18.7 -  mobility.SetPositionAllocator ("GridPositionAllocator",
    18.8 +  mobility.SetPositionAllocator ("ns3::GridPositionAllocator",
    18.9                                   "MinX", Double (-100.0),
   18.10                                   "MinY", Double (-100.0),
   18.11                                   "DeltaX", Double (5.0),
   18.12 @@ -39,7 +39,7 @@
   18.13    // each object will be attached a static position.
   18.14    // i.e., once set by the "position allocator", the
   18.15    // position will never change.
   18.16 -  mobility.SetMobilityModel ("StaticMobilityModel");
   18.17 +  mobility.SetMobilityModel ("ns3::StaticMobilityModel");
   18.18  
   18.19    // finalize the setup by attaching to each object
   18.20    // in the input array a position and initializing
    19.1 --- a/samples/main-random-topology.cc	Thu Mar 13 11:21:12 2008 -0700
    19.2 +++ b/samples/main-random-topology.cc	Thu Mar 13 12:56:49 2008 -0700
    19.3 @@ -37,11 +37,11 @@
    19.4  
    19.5    MobilityHelper mobility;
    19.6    mobility.EnableNotifier ();
    19.7 -  mobility.SetPositionAllocator ("RandomDiscPositionAllocator",
    19.8 +  mobility.SetPositionAllocator ("ns3::RandomDiscPositionAllocator",
    19.9                                   "X", String ("100.0"),
   19.10                                   "Y", String ("100.0"),
   19.11                                   "Rho", String ("Uniform:0:30"));
   19.12 -  mobility.SetMobilityModel ("StaticMobilityModel");
   19.13 +  mobility.SetMobilityModel ("ns3::StaticMobilityModel");
   19.14    mobility.Layout (objects.begin (), objects.end ());
   19.15  
   19.16    Config::Connect ("/NodeList/*/$MobilityModelNotifier/CourseChange",
    20.1 --- a/samples/main-random-walk.cc	Thu Mar 13 11:21:12 2008 -0700
    20.2 +++ b/samples/main-random-walk.cc	Thu Mar 13 12:56:49 2008 -0700
    20.3 @@ -43,11 +43,11 @@
    20.4  
    20.5    MobilityHelper mobility;
    20.6    mobility.EnableNotifier ();
    20.7 -  mobility.SetPositionAllocator ("RandomDiscPositionAllocator",
    20.8 +  mobility.SetPositionAllocator ("ns3::RandomDiscPositionAllocator",
    20.9                                   "X", String ("100.0"),
   20.10                                   "Y", String ("100.0"),
   20.11                                   "Rho", String ("Uniform:0:30"));
   20.12 -  mobility.SetMobilityModel ("RandomWalk2dMobilityModel",
   20.13 +  mobility.SetMobilityModel ("ns3::RandomWalk2dMobilityModel",
   20.14                               "Mode", String ("Time"),
   20.15                               "Time", String ("2s"),
   20.16                               "Speed", String ("Constant:1.0"),
    21.1 --- a/samples/main-simple.cc	Thu Mar 13 11:21:12 2008 -0700
    21.2 +++ b/samples/main-simple.cc	Thu Mar 13 12:56:49 2008 -0700
    21.3 @@ -42,7 +42,7 @@
    21.4  {
    21.5    Ptr<Node> a = CreateObject<InternetNode> ();
    21.6  
    21.7 -  TypeId tid = TypeId::LookupByName ("Udp");
    21.8 +  TypeId tid = TypeId::LookupByName ("ns3::Udp");
    21.9    Ptr<SocketFactory> socketFactory = a->GetObject<SocketFactory> (tid);
   21.10  
   21.11    Ptr<Socket> sink = socketFactory->CreateSocket ();
    22.1 --- a/src/applications/onoff/onoff-application.cc	Thu Mar 13 11:21:12 2008 -0700
    22.2 +++ b/src/applications/onoff/onoff-application.cc	Thu Mar 13 12:56:49 2008 -0700
    22.3 @@ -48,7 +48,7 @@
    22.4  TypeId
    22.5  OnOffApplication::GetTypeId (void)
    22.6  {
    22.7 -  static TypeId tid = TypeId ("OnOffApplication")
    22.8 +  static TypeId tid = TypeId ("ns3::OnOffApplication")
    22.9      .SetParent<Application> ()
   22.10      .AddConstructor<OnOffApplication> ()
   22.11      .AddAttribute ("DataRate", "The data rate in on state.",
    23.1 --- a/src/applications/packet-sink/packet-sink.cc	Thu Mar 13 11:21:12 2008 -0700
    23.2 +++ b/src/applications/packet-sink/packet-sink.cc	Thu Mar 13 12:56:49 2008 -0700
    23.3 @@ -39,7 +39,7 @@
    23.4  TypeId 
    23.5  PacketSink::GetTypeId (void)
    23.6  {
    23.7 -  static TypeId tid = TypeId ("PacketSink")
    23.8 +  static TypeId tid = TypeId ("ns3::PacketSink")
    23.9      .SetParent<Application> ()
   23.10      .AddAttribute ("Local", "The Address on which to Bind the rx socket.",
   23.11                     Address (),
    24.1 --- a/src/applications/udp-echo/udp-echo-client.cc	Thu Mar 13 11:21:12 2008 -0700
    24.2 +++ b/src/applications/udp-echo/udp-echo-client.cc	Thu Mar 13 12:56:49 2008 -0700
    24.3 @@ -34,7 +34,7 @@
    24.4  TypeId
    24.5  UdpEchoClient::GetTypeId (void)
    24.6  {
    24.7 -  static TypeId tid = TypeId ("UdpEchoClient")
    24.8 +  static TypeId tid = TypeId ("ns3::UdpEchoClient")
    24.9      .SetParent<Application> ()
   24.10      .AddConstructor<UdpEchoClient> ()
   24.11      .AddAttribute ("MaxPackets", "XXX",
   24.12 @@ -88,7 +88,7 @@
   24.13  
   24.14    if (!m_socket)
   24.15      {
   24.16 -      TypeId tid = TypeId::LookupByName ("Udp");
   24.17 +      TypeId tid = TypeId::LookupByName ("ns3::Udp");
   24.18        Ptr<SocketFactory> socketFactory = 
   24.19          GetNode ()->GetObject<SocketFactory> (tid);
   24.20        m_socket = socketFactory->CreateSocket ();
    25.1 --- a/src/applications/udp-echo/udp-echo-server.cc	Thu Mar 13 11:21:12 2008 -0700
    25.2 +++ b/src/applications/udp-echo/udp-echo-server.cc	Thu Mar 13 12:56:49 2008 -0700
    25.3 @@ -36,7 +36,7 @@
    25.4  TypeId
    25.5  UdpEchoServer::GetTypeId (void)
    25.6  {
    25.7 -  static TypeId tid = TypeId ("UdpEchoServer")
    25.8 +  static TypeId tid = TypeId ("ns3::UdpEchoServer")
    25.9      .SetParent<Application> ()
   25.10      .AddConstructor<UdpEchoServer> ()
   25.11      .AddAttribute ("Port", "Client Port",
   25.12 @@ -71,7 +71,7 @@
   25.13  
   25.14    if (!m_socket)
   25.15      {
   25.16 -      TypeId tid = TypeId::LookupByName ("Udp");
   25.17 +      TypeId tid = TypeId::LookupByName ("ns3::Udp");
   25.18        Ptr<SocketFactory> socketFactory = 
   25.19          GetNode ()->GetObject<SocketFactory> (tid);
   25.20        m_socket = socketFactory->CreateSocket ();
    26.1 --- a/src/common/error-model.cc	Thu Mar 13 11:21:12 2008 -0700
    26.2 +++ b/src/common/error-model.cc	Thu Mar 13 12:56:49 2008 -0700
    26.3 @@ -39,7 +39,7 @@
    26.4  
    26.5  TypeId ErrorModel::GetTypeId (void)
    26.6  { 
    26.7 -  static TypeId tid = TypeId ("ErrorModel")
    26.8 +  static TypeId tid = TypeId ("ns3::ErrorModel")
    26.9      .SetParent<Object> ()
   26.10      .AddAttribute ("IsEnabled", "Whether this ErrorModel is enabled or not.",
   26.11                     Boolean (true),
   26.12 @@ -107,7 +107,7 @@
   26.13  
   26.14  TypeId RateErrorModel::GetTypeId (void)
   26.15  { 
   26.16 -  static TypeId tid = TypeId ("RateErrorModel")
   26.17 +  static TypeId tid = TypeId ("ns3::RateErrorModel")
   26.18      .SetParent<ErrorModel> ()
   26.19      .AddConstructor<RateErrorModel> ()
   26.20      .AddAttribute ("ErrorUnit", "The error unit",
   26.21 @@ -237,7 +237,7 @@
   26.22  
   26.23  TypeId ListErrorModel::GetTypeId (void)
   26.24  { 
   26.25 -  static TypeId tid = TypeId ("ListErrorModel")
   26.26 +  static TypeId tid = TypeId ("ns3::ListErrorModel")
   26.27      .SetParent<ErrorModel> ()
   26.28      .AddConstructor<ListErrorModel> ()
   26.29      ;
    27.1 --- a/src/core/attribute-test.cc	Thu Mar 13 11:21:12 2008 -0700
    27.2 +++ b/src/core/attribute-test.cc	Thu Mar 13 12:56:49 2008 -0700
    27.3 @@ -98,6 +98,7 @@
    27.4    static TypeId GetTypeId (void) {
    27.5      static TypeId tid = TypeId ("AttributeObjectTest")
    27.6        .SetParent<Object> ()
    27.7 +      .HideFromDocumentation ()
    27.8        .AddAttribute ("TestBoolName", "help text",
    27.9  		     Boolean (false),
   27.10  		     MakeBooleanAccessor (&AttributeObjectTest::m_boolTest),
    28.1 --- a/src/core/object.cc	Thu Mar 13 11:21:12 2008 -0700
    28.2 +++ b/src/core/object.cc	Thu Mar 13 12:56:49 2008 -0700
    28.3 @@ -45,6 +45,7 @@
    28.4    void SetTypeName (uint16_t uid, std::string typeName);
    28.5    void SetGroupName (uint16_t uid, std::string groupName);
    28.6    void AddConstructor (uint16_t uid, ns3::CallbackBase callback);
    28.7 +  void HideFromDocumentation (uint16_t uid);
    28.8    uint16_t GetUid (std::string name) const;
    28.9    std::string GetName (uint16_t uid) const;
   28.10    uint16_t GetParent (uint16_t uid) const;
   28.11 @@ -76,6 +77,7 @@
   28.12    std::string GetTraceSourceName (uint16_t uid, uint32_t i) const;
   28.13    std::string GetTraceSourceHelp (uint16_t uid, uint32_t i) const;
   28.14    ns3::Ptr<const ns3::TraceSourceAccessor> GetTraceSourceAccessor (uint16_t uid, uint32_t i) const;
   28.15 +  bool MustHideFromDocumentation (uint16_t uid) const;
   28.16  
   28.17  private:
   28.18    struct AttributeInformation {
   28.19 @@ -98,6 +100,7 @@
   28.20      std::string groupName;
   28.21      bool hasConstructor;
   28.22      ns3::CallbackBase constructor;
   28.23 +    bool mustHideFromDocumentation;
   28.24      std::vector<struct AttributeInformation> attributes;
   28.25      std::vector<struct TraceSourceInformation> traceSources;
   28.26    };
   28.27 @@ -130,6 +133,7 @@
   28.28    information.typeName = "";
   28.29    information.groupName = "";
   28.30    information.hasConstructor = false;
   28.31 +  information.mustHideFromDocumentation = false;
   28.32    m_information.push_back (information);
   28.33    uint32_t uid = m_information.size ();
   28.34    NS_ASSERT (uid <= 0xffff);
   28.35 @@ -162,6 +166,12 @@
   28.36    struct IidInformation *information = LookupInformation (uid);
   28.37    information->groupName = groupName;
   28.38  }
   28.39 +void
   28.40 +IidManager::HideFromDocumentation (uint16_t uid)
   28.41 +{
   28.42 +  struct IidInformation *information = LookupInformation (uid);
   28.43 +  information->mustHideFromDocumentation = true;
   28.44 +}
   28.45  
   28.46  void 
   28.47  IidManager::AddConstructor (uint16_t uid, ns3::CallbackBase callback)
   28.48 @@ -363,6 +373,12 @@
   28.49    NS_ASSERT (i < information->traceSources.size ());
   28.50    return information->traceSources[i].accessor;
   28.51  }
   28.52 +bool 
   28.53 +IidManager::MustHideFromDocumentation (uint16_t uid) const
   28.54 +{
   28.55 +  struct IidInformation *information = LookupInformation (uid);
   28.56 +  return information->mustHideFromDocumentation;
   28.57 +}
   28.58  
   28.59  } // anonymous namespace
   28.60  
   28.61 @@ -564,6 +580,13 @@
   28.62    return object;  
   28.63  }
   28.64  
   28.65 +bool 
   28.66 +TypeId::MustHideFromDocumentation (void) const
   28.67 +{
   28.68 +  bool mustHide = Singleton<IidManager>::Get ()->MustHideFromDocumentation (m_tid);
   28.69 +  return mustHide;
   28.70 +}
   28.71 +
   28.72  uint32_t 
   28.73  TypeId::GetAttributeListN (void) const
   28.74  {
   28.75 @@ -645,6 +668,13 @@
   28.76    return *this;
   28.77  }
   28.78  
   28.79 +TypeId 
   28.80 +TypeId::HideFromDocumentation (void)
   28.81 +{
   28.82 +  Singleton<IidManager>::Get ()->HideFromDocumentation (m_tid);
   28.83 +  return *this;
   28.84 +}
   28.85 +
   28.86  
   28.87  Ptr<const TraceSourceAccessor> 
   28.88  TypeId::LookupTraceSourceByName (std::string name) const
   28.89 @@ -936,7 +966,7 @@
   28.90  static TypeId
   28.91  GetObjectIid (void)
   28.92  {
   28.93 -  TypeId tid = TypeId ("Object");
   28.94 +  TypeId tid = TypeId ("ns3::Object");
   28.95    tid.SetParent (tid);
   28.96    return tid;
   28.97  }
   28.98 @@ -1324,6 +1354,7 @@
   28.99    static ns3::TypeId GetTypeId (void) {
  28.100      static ns3::TypeId tid = ns3::TypeId ("BaseA")
  28.101        .SetParent (Object::GetTypeId ())
  28.102 +      .HideFromDocumentation ()
  28.103        .AddConstructor<BaseA> ();
  28.104      return tid;
  28.105    }
  28.106 @@ -1338,6 +1369,7 @@
  28.107    static ns3::TypeId GetTypeId (void) {
  28.108      static ns3::TypeId tid = ns3::TypeId ("DerivedA")
  28.109        .SetParent (BaseA::GetTypeId ())
  28.110 +      .HideFromDocumentation ()
  28.111        .AddConstructor<DerivedA> ();
  28.112      return tid;
  28.113    }
  28.114 @@ -1354,6 +1386,7 @@
  28.115    static ns3::TypeId GetTypeId (void) {
  28.116      static ns3::TypeId tid = ns3::TypeId ("BaseB")
  28.117        .SetParent (Object::GetTypeId ())
  28.118 +      .HideFromDocumentation ()
  28.119        .AddConstructor<BaseB> ();
  28.120      return tid;
  28.121    }
  28.122 @@ -1368,6 +1401,7 @@
  28.123    static ns3::TypeId GetTypeId (void) {
  28.124      static ns3::TypeId tid = ns3::TypeId ("DerivedB")
  28.125        .SetParent (BaseB::GetTypeId ())
  28.126 +      .HideFromDocumentation ()
  28.127        .AddConstructor<DerivedB> ();
  28.128      return tid;
  28.129    }
    29.1 --- a/src/core/object.h	Thu Mar 13 11:21:12 2008 -0700
    29.2 +++ b/src/core/object.h	Thu Mar 13 12:56:49 2008 -0700
    29.3 @@ -180,6 +180,8 @@
    29.4    Ptr<Object> CreateObject (const AttributeList &attributes) const;
    29.5    Ptr<Object> CreateObject (void) const;
    29.6  
    29.7 +  bool MustHideFromDocumentation (void) const;
    29.8 +
    29.9    /**
   29.10     * \param tid the TypeId of the base class.
   29.11     * \return this TypeId instance.
   29.12 @@ -270,6 +272,8 @@
   29.13                           std::string help,
   29.14                           Ptr<const TraceSourceAccessor> accessor);
   29.15  
   29.16 +  TypeId HideFromDocumentation (void);
   29.17 +
   29.18    /**
   29.19     * \brief store together a set of attribute properties.
   29.20     */
    30.1 --- a/src/devices/csma/csma-channel.cc	Thu Mar 13 11:21:12 2008 -0700
    30.2 +++ b/src/devices/csma/csma-channel.cc	Thu Mar 13 12:56:49 2008 -0700
    30.3 @@ -48,7 +48,7 @@
    30.4  TypeId 
    30.5  CsmaChannel::GetTypeId (void)
    30.6  {
    30.7 -  static TypeId tid = TypeId ("CsmaChannel")
    30.8 +  static TypeId tid = TypeId ("ns3::CsmaChannel")
    30.9      .SetParent<Channel> ()
   30.10      .AddConstructor<CsmaChannel> ()
   30.11      .AddAttribute ("BitRate", "The maximum bitrate of the channel",
    31.1 --- a/src/devices/csma/csma-net-device.cc	Thu Mar 13 11:21:12 2008 -0700
    31.2 +++ b/src/devices/csma/csma-net-device.cc	Thu Mar 13 12:56:49 2008 -0700
    31.3 @@ -42,7 +42,7 @@
    31.4  TypeId 
    31.5  CsmaNetDevice::GetTypeId (void)
    31.6  {
    31.7 -  static TypeId tid = TypeId ("CsmaNetDevice")
    31.8 +  static TypeId tid = TypeId ("ns3::CsmaNetDevice")
    31.9      .SetParent<NetDevice> ()
   31.10      .AddConstructor<CsmaNetDevice> ()
   31.11      .AddAttribute ("Address", "The address of this device.",
    32.1 --- a/src/devices/csma/csma-topology.h	Thu Mar 13 11:21:12 2008 -0700
    32.2 +++ b/src/devices/csma/csma-topology.h	Thu Mar 13 12:56:49 2008 -0700
    32.3 @@ -106,7 +106,7 @@
    32.4  
    32.5    /**
    32.6     * \param n1 Node from which socketfactory should be tested.
    32.7 -   * \param tid_name Interface identifier ("Packet", in this case)
    32.8 +   * \param tid_name Interface identifier ("ns3::PacketSocketFactory", in this case)
    32.9     *
   32.10     * This is a test function to make sure that a socket can be created
   32.11     * by using the socketfactory interface provided in the
    33.1 --- a/src/devices/point-to-point/point-to-point-channel.cc	Thu Mar 13 11:21:12 2008 -0700
    33.2 +++ b/src/devices/point-to-point/point-to-point-channel.cc	Thu Mar 13 12:56:49 2008 -0700
    33.3 @@ -32,7 +32,7 @@
    33.4  TypeId 
    33.5  PointToPointChannel::GetTypeId (void)
    33.6  {
    33.7 -  static TypeId tid = TypeId ("PointToPointChannel")
    33.8 +  static TypeId tid = TypeId ("ns3::PointToPointChannel")
    33.9      .SetParent<Channel> ()
   33.10      .AddConstructor<PointToPointChannel> ()
   33.11      .AddAttribute ("BitRate", "The maximum bitrate of the channel",
    34.1 --- a/src/devices/point-to-point/point-to-point-net-device.cc	Thu Mar 13 11:21:12 2008 -0700
    34.2 +++ b/src/devices/point-to-point/point-to-point-net-device.cc	Thu Mar 13 12:56:49 2008 -0700
    34.3 @@ -39,7 +39,7 @@
    34.4  TypeId 
    34.5  PointToPointNetDevice::GetTypeId (void)
    34.6  {
    34.7 -  static TypeId tid = TypeId ("PointToPointNetDevice")
    34.8 +  static TypeId tid = TypeId ("ns3::PointToPointNetDevice")
    34.9      .SetParent<NetDevice> ()
   34.10      .AddConstructor<PointToPointNetDevice> ()
   34.11      .AddAttribute ("Address", "The address of this device.",
    35.1 --- a/src/devices/wifi/aarf-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
    35.2 +++ b/src/devices/wifi/aarf-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
    35.3 @@ -33,7 +33,7 @@
    35.4  TypeId 
    35.5  AarfWifiManager::GetTypeId (void)
    35.6  {
    35.7 -  static TypeId tid = TypeId ("AarfWifiManager")
    35.8 +  static TypeId tid = TypeId ("ns3::AarfWifiManager")
    35.9      .SetParent<ArfWifiManager> ()
   35.10      .AddConstructor<AarfWifiManager> ()
   35.11      .AddAttribute ("SuccessK", "Multiplication factor for the success threshold in the AARF algorithm.",
    36.1 --- a/src/devices/wifi/adhoc-wifi-mac.cc	Thu Mar 13 11:21:12 2008 -0700
    36.2 +++ b/src/devices/wifi/adhoc-wifi-mac.cc	Thu Mar 13 12:56:49 2008 -0700
    36.3 @@ -36,7 +36,7 @@
    36.4  TypeId 
    36.5  AdhocWifiMac::GetTypeId (void)
    36.6  {
    36.7 -  static TypeId tid = TypeId ("AdhocWifiMac")
    36.8 +  static TypeId tid = TypeId ("ns3::AdhocWifiMac")
    36.9      .SetParent<WifiMac> ()
   36.10      .AddConstructor<AdhocWifiMac> ()
   36.11      ;
    37.1 --- a/src/devices/wifi/amrr-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
    37.2 +++ b/src/devices/wifi/amrr-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
    37.3 @@ -33,7 +33,7 @@
    37.4  TypeId
    37.5  AmrrWifiManager::GetTypeId (void)
    37.6  {
    37.7 -  static TypeId tid = TypeId ("AmrrWifiManager")
    37.8 +  static TypeId tid = TypeId ("ns3::AmrrWifiManager")
    37.9      .SetParent<WifiRemoteStationManager> ()
   37.10      .AddConstructor<AmrrWifiManager> ()
   37.11      .AddAttribute ("UpdatePeriod",
    38.1 --- a/src/devices/wifi/arf-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
    38.2 +++ b/src/devices/wifi/arf-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
    38.3 @@ -23,7 +23,7 @@
    38.4  #include "ns3/log.h"
    38.5  #include "ns3/uinteger.h"
    38.6  
    38.7 -NS_LOG_COMPONENT_DEFINE ("ArfWifiManager");
    38.8 +NS_LOG_COMPONENT_DEFINE ("ns3::ArfWifiManager");
    38.9  
   38.10  
   38.11  namespace ns3 {
   38.12 @@ -224,7 +224,7 @@
   38.13  TypeId 
   38.14  ArfWifiManager::GetTypeId (void)
   38.15  {
   38.16 -  static TypeId tid = TypeId ("ArfWifiManager")
   38.17 +  static TypeId tid = TypeId ("ns3::ArfWifiManager")
   38.18      .SetParent<WifiRemoteStationManager> ()
   38.19      .AddConstructor<ArfWifiManager> ()
   38.20      .AddAttribute ("TimerThreshold", "The 'timer' threshold in the ARF algorithm.",
    39.1 --- a/src/devices/wifi/constant-rate-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
    39.2 +++ b/src/devices/wifi/constant-rate-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
    39.3 @@ -74,7 +74,7 @@
    39.4  TypeId 
    39.5  ConstantRateWifiManager::GetTypeId (void)
    39.6  {
    39.7 -  static TypeId tid = TypeId ("ConstantRateWifiManager")
    39.8 +  static TypeId tid = TypeId ("ns3::ConstantRateWifiManager")
    39.9      .SetParent<WifiRemoteStationManager> ()
   39.10      .AddConstructor<ConstantRateWifiManager> ()
   39.11      .AddAttribute ("DataMode", "XXX",
    40.1 --- a/src/devices/wifi/ideal-wifi-manager.cc	Thu Mar 13 11:21:12 2008 -0700
    40.2 +++ b/src/devices/wifi/ideal-wifi-manager.cc	Thu Mar 13 12:56:49 2008 -0700
    40.3 @@ -41,7 +41,7 @@
    40.4  TypeId 
    40.5  IdealWifiManager::GetTypeId (void)
    40.6  {
    40.7 -  static TypeId tid = TypeId ("IdealWifiManager")
    40.8 +  static TypeId tid = TypeId ("ns3::IdealWifiManager")
    40.9      .SetParent<WifiRemoteStationManager> ()
   40.10      .AddConstructor<IdealWifiManager> ()
   40.11      .AddAttribute ("BerThreshold",
    41.1 --- a/src/devices/wifi/nqap-wifi-mac.cc	Thu Mar 13 11:21:12 2008 -0700
    41.2 +++ b/src/devices/wifi/nqap-wifi-mac.cc	Thu Mar 13 12:56:49 2008 -0700
    41.3 @@ -43,7 +43,7 @@
    41.4  TypeId 
    41.5  NqapWifiMac::GetTypeId (void)
    41.6  {
    41.7 -  static TypeId tid = TypeId ("NqapWifiMac")
    41.8 +  static TypeId tid = TypeId ("ns3::NqapWifiMac")
    41.9      .SetParent<WifiMac> ()
   41.10      .AddConstructor<NqapWifiMac> ()
   41.11      .AddAttribute ("BeaconInterval", "Delay between two beacons",
    42.1 --- a/src/devices/wifi/nqsta-wifi-mac.cc	Thu Mar 13 11:21:12 2008 -0700
    42.2 +++ b/src/devices/wifi/nqsta-wifi-mac.cc	Thu Mar 13 12:56:49 2008 -0700
    42.3 @@ -62,7 +62,7 @@
    42.4  TypeId 
    42.5  NqstaWifiMac::GetTypeId (void)
    42.6  {
    42.7 -  static TypeId tid = TypeId ("NqstaWifiMac")
    42.8 +  static TypeId tid = TypeId ("ns3::NqstaWifiMac")
    42.9      .SetParent<WifiMac> ()
   42.10      .AddConstructor<NqstaWifiMac> ()
   42.11      .AddAttribute ("ProbeRequestTimeout", "XXX",
    43.1 --- a/src/devices/wifi/wifi-channel.cc	Thu Mar 13 11:21:12 2008 -0700
    43.2 +++ b/src/devices/wifi/wifi-channel.cc	Thu Mar 13 12:56:49 2008 -0700
    43.3 @@ -34,7 +34,7 @@
    43.4  TypeId 
    43.5  WifiChannel::GetTypdId (void)
    43.6  {
    43.7 -  static TypeId tid = TypeId ("WifiChannel")
    43.8 +  static TypeId tid = TypeId ("ns3::WifiChannel")
    43.9      .SetParent<WifiChannel> ()
   43.10      .AddConstructor<WifiChannel> ()
   43.11      .AddAttribute ("PropagationLossModel", "XXX",
    44.1 --- a/src/devices/wifi/wifi-helper.cc	Thu Mar 13 11:21:12 2008 -0700
    44.2 +++ b/src/devices/wifi/wifi-helper.cc	Thu Mar 13 12:56:49 2008 -0700
    44.3 @@ -15,9 +15,9 @@
    44.4  
    44.5  WifiHelper::WifiHelper ()
    44.6  {
    44.7 -  m_stationManager.SetTypeId ("ArfWifiManager");
    44.8 -  m_phy.SetTypeId ("WifiPhy");
    44.9 -  m_mac.SetTypeId ("AdhocWifiMac");
   44.10 +  m_stationManager.SetTypeId ("ns3::ArfWifiManager");
   44.11 +  m_phy.SetTypeId ("ns3::WifiPhy");
   44.12 +  m_mac.SetTypeId ("ns3::AdhocWifiMac");
   44.13  }
   44.14  
   44.15  void 
    45.1 --- a/src/devices/wifi/wifi-mac.cc	Thu Mar 13 11:21:12 2008 -0700
    45.2 +++ b/src/devices/wifi/wifi-mac.cc	Thu Mar 13 12:56:49 2008 -0700
    45.3 @@ -52,7 +52,7 @@
    45.4  TypeId 
    45.5  WifiMac::GetTypeId (void)
    45.6  {
    45.7 -  static TypeId tid = TypeId ("WifiMac")
    45.8 +  static TypeId tid = TypeId ("ns3::WifiMac")
    45.9      .SetParent<Object> ()
   45.10      .AddAttribute ("CtsTimeout", "XXX",
   45.11                     GetDefaultCtsAckTimeout (),
    46.1 --- a/src/devices/wifi/wifi-net-device.cc	Thu Mar 13 11:21:12 2008 -0700
    46.2 +++ b/src/devices/wifi/wifi-net-device.cc	Thu Mar 13 12:56:49 2008 -0700
    46.3 @@ -33,7 +33,7 @@
    46.4  TypeId 
    46.5  WifiNetDevice::GetTypeId (void)
    46.6  {
    46.7 -  static TypeId tid = TypeId ("WifiNetDevice")
    46.8 +  static TypeId tid = TypeId ("ns3::WifiNetDevice")
    46.9      .SetParent<NetDevice> ()
   46.10      .AddAttribute ("Channel", "XXX",
   46.11                     Ptr<Channel> (0),
    47.1 --- a/src/devices/wifi/wifi-phy.cc	Thu Mar 13 11:21:12 2008 -0700
    47.2 +++ b/src/devices/wifi/wifi-phy.cc	Thu Mar 13 12:56:49 2008 -0700
    47.3 @@ -182,7 +182,7 @@
    47.4  TypeId 
    47.5  WifiPhy::GetTypeId (void)
    47.6  {
    47.7 -  static TypeId tid = TypeId ("WifiPhy")
    47.8 +  static TypeId tid = TypeId ("ns3::WifiPhy")
    47.9      .SetParent<Object> ()
   47.10      .AddConstructor<WifiPhy> ()
   47.11      .AddAttribute ("EnergyDetectionThreshold",
    48.1 --- a/src/devices/wifi/wifi-remote-station-manager.cc	Thu Mar 13 11:21:12 2008 -0700
    48.2 +++ b/src/devices/wifi/wifi-remote-station-manager.cc	Thu Mar 13 12:56:49 2008 -0700
    48.3 @@ -123,7 +123,7 @@
    48.4  TypeId 
    48.5  WifiRemoteStationManager::GetTypeId (void)
    48.6  {
    48.7 -  static TypeId tid = TypeId ("WifiRemoteStationManager")
    48.8 +  static TypeId tid = TypeId ("ns3::WifiRemoteStationManager")
    48.9      .SetParent<Object> ()
   48.10      .AddAttribute ("IsLowLatency", "XXX",
   48.11                     Boolean (true),
    49.1 --- a/src/devices/wifi/wifi-remote-station-manager.h	Thu Mar 13 11:21:12 2008 -0700
    49.2 +++ b/src/devices/wifi/wifi-remote-station-manager.h	Thu Mar 13 12:56:49 2008 -0700
    49.3 @@ -33,6 +33,14 @@
    49.4  class NonUnicastWifiRemoteStation;
    49.5  class WifiPhy;
    49.6  
    49.7 +/**
    49.8 + * \brief hold per-remote-station state.
    49.9 + *
   49.10 + * The state in this class is used to keep track
   49.11 + * of association status if we are in an infrastructure
   49.12 + * network and to perform the selection of tx parameters
   49.13 + * on a per-packet basis.
   49.14 + */
   49.15  class WifiRemoteStationManager : public Object
   49.16  {
   49.17  private:
    50.1 --- a/src/internet-node/arp-l3-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
    50.2 +++ b/src/internet-node/arp-l3-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
    50.3 @@ -40,7 +40,7 @@
    50.4  TypeId 
    50.5  ArpL3Protocol::GetTypeId (void)
    50.6  {
    50.7 -  static TypeId tid = TypeId ("ArpL3Protocol")
    50.8 +  static TypeId tid = TypeId ("ns3::ArpL3Protocol")
    50.9      .SetParent<Object> ()
   50.10      ;
   50.11    return tid;
    51.1 --- a/src/internet-node/ipv4-l3-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
    51.2 +++ b/src/internet-node/ipv4-l3-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
    51.3 @@ -49,7 +49,7 @@
    51.4  TypeId 
    51.5  Ipv4L3Protocol::GetTypeId (void)
    51.6  {
    51.7 -  static TypeId tid = TypeId ("Ipv4L3Protocol")
    51.8 +  static TypeId tid = TypeId ("ns3::Ipv4L3Protocol")
    51.9      .SetParent<Object> ()
   51.10      .AddConstructor<Ipv4L3Protocol> ()
   51.11      .AddAttribute ("DefaultTtl", "The TTL value set by default on all outgoing packets generated on this node.",
    52.1 --- a/src/internet-node/ipv4-l4-demux.cc	Thu Mar 13 11:21:12 2008 -0700
    52.2 +++ b/src/internet-node/ipv4-l4-demux.cc	Thu Mar 13 12:56:49 2008 -0700
    52.3 @@ -35,7 +35,7 @@
    52.4  TypeId 
    52.5  Ipv4L4Demux::GetTypeId (void)
    52.6  {
    52.7 -  static TypeId tid = TypeId ("Ipv4L4Demux")
    52.8 +  static TypeId tid = TypeId ("ns3::Ipv4L4Demux")
    52.9      .SetParent<Object> ()
   52.10      .AddAttribute ("Protocols", "The set of protocols registered with this demux.",
   52.11                     ObjectVector (),
    53.1 --- a/src/internet-node/ipv4-l4-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
    53.2 +++ b/src/internet-node/ipv4-l4-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
    53.3 @@ -32,7 +32,7 @@
    53.4  TypeId 
    53.5  Ipv4L4Protocol::GetTypeId (void)
    53.6  {
    53.7 -  static TypeId tid = TypeId ("Ipv4L4Protocol")
    53.8 +  static TypeId tid = TypeId ("ns3::Ipv4L4Protocol")
    53.9      .SetParent<Object> ()
   53.10      .AddAttribute ("ProtocolNumber", "The Ipv4 protocol number.",
   53.11                     Uinteger (0),
    54.1 --- a/src/internet-node/rtt-estimator.cc	Thu Mar 13 11:21:12 2008 -0700
    54.2 +++ b/src/internet-node/rtt-estimator.cc	Thu Mar 13 12:56:49 2008 -0700
    54.3 @@ -39,7 +39,7 @@
    54.4  TypeId 
    54.5  RttEstimator::GetTypeId (void)
    54.6  {
    54.7 -  static TypeId tid = TypeId ("RttEstimator")
    54.8 +  static TypeId tid = TypeId ("ns3::RttEstimator")
    54.9      .SetParent<Object> ()
   54.10      .AddAttribute ("MaxMultiplier", 
   54.11                     "XXX",
   54.12 @@ -172,7 +172,7 @@
   54.13  TypeId 
   54.14  RttMeanDeviation::GetTypeId (void)
   54.15  {
   54.16 -  static TypeId tid = TypeId ("RttMeanDeviation")
   54.17 +  static TypeId tid = TypeId ("ns3::RttMeanDeviation")
   54.18      .SetParent<RttEstimator> ()
   54.19      .AddConstructor<RttMeanDeviation> ()
   54.20      .AddAttribute ("Gain",
    55.1 --- a/src/internet-node/tcp-l4-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
    55.2 +++ b/src/internet-node/tcp-l4-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
    55.3 @@ -322,7 +322,7 @@
    55.4  TypeId 
    55.5  TcpL4Protocol::GetTypeId (void)
    55.6  {
    55.7 -  static TypeId tid = TypeId ("TcpL4Protocol")
    55.8 +  static TypeId tid = TypeId ("ns3::TcpL4Protocol")
    55.9      .SetParent<Ipv4L4Protocol> ()
   55.10      .AddAttribute ("RttEstimatorFactory",
   55.11                     "How RttEstimator objects are created.",
    56.1 --- a/src/internet-node/udp-l4-protocol.cc	Thu Mar 13 11:21:12 2008 -0700
    56.2 +++ b/src/internet-node/udp-l4-protocol.cc	Thu Mar 13 12:56:49 2008 -0700
    56.3 @@ -43,7 +43,7 @@
    56.4  TypeId 
    56.5  UdpL4Protocol::GetTypeId (void)
    56.6  {
    56.7 -  static TypeId tid = TypeId ("UdpL4Protocol")
    56.8 +  static TypeId tid = TypeId ("ns3::UdpL4Protocol")
    56.9      .SetParent<Ipv4L4Protocol> ()
   56.10      .AddConstructor<UdpL4Protocol> ()
   56.11      ;
    57.1 --- a/src/mobility/hierarchical-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
    57.2 +++ b/src/mobility/hierarchical-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
    57.3 @@ -27,7 +27,7 @@
    57.4  TypeId 
    57.5  HierarchicalMobilityModel::GetTypeId (void)
    57.6  {
    57.7 -  static TypeId tid = TypeId ("HierarchicalMobilityModel")
    57.8 +  static TypeId tid = TypeId ("ns3::HierarchicalMobilityModel")
    57.9      .SetParent<MobilityModel> ()
   57.10      .AddConstructor<HierarchicalMobilityModel> ()
   57.11      .AddAttribute ("Child", "The child mobility model.",
    58.1 --- a/src/mobility/mobility-helper.cc	Thu Mar 13 11:21:12 2008 -0700
    58.2 +++ b/src/mobility/mobility-helper.cc	Thu Mar 13 12:56:49 2008 -0700
    58.3 @@ -14,7 +14,7 @@
    58.4  {
    58.5    m_position = CreateObject<RandomRectanglePositionAllocator> ("X", ConstantVariable (0.0),
    58.6  								   "Y", ConstantVariable (0.0));
    58.7 -  m_mobility.SetTypeId ("StaticMobilityModel");
    58.8 +  m_mobility.SetTypeId ("ns3::StaticMobilityModel");
    58.9  }
   58.10  void 
   58.11  MobilityHelper::EnableNotifier (void)
   58.12 @@ -126,7 +126,7 @@
   58.13  	      Ptr<MobilityModel> parent = m_mobilityStack.back ();
   58.14  	      Ptr<MobilityModel> hierarchical = 
   58.15  		CreateObject<HierarchicalMobilityModel> ("Child", model,
   58.16 -							     "Parent", parent);
   58.17 +							 "Parent", parent);
   58.18  	      object->AggregateObject (hierarchical);
   58.19  	      NS_LOG_DEBUG ("node="<<object<<", mob="<<hierarchical);
   58.20  	    }
    59.1 --- a/src/mobility/mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
    59.2 +++ b/src/mobility/mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
    59.3 @@ -26,7 +26,7 @@
    59.4  TypeId 
    59.5  MobilityModel::GetTypeId (void)
    59.6  {
    59.7 -  static TypeId tid = TypeId ("MobilityModel")
    59.8 +  static TypeId tid = TypeId ("ns3::MobilityModel")
    59.9      .SetParent<Object> ()
   59.10      .AddAttribute ("Position", "The current position of the mobility model.",
   59.11                     TypeId::ATTR_SGC,
    60.1 --- a/src/mobility/position-allocator.cc	Thu Mar 13 11:21:12 2008 -0700
    60.2 +++ b/src/mobility/position-allocator.cc	Thu Mar 13 12:56:49 2008 -0700
    60.3 @@ -34,7 +34,7 @@
    60.4  TypeId 
    60.5  PositionAllocator::GetTypeId (void)
    60.6  {
    60.7 -  static TypeId tid = TypeId ("PositionAllocator")
    60.8 +  static TypeId tid = TypeId ("ns3::PositionAllocator")
    60.9      .SetParent<Object> ();
   60.10    return tid;
   60.11  }
   60.12 @@ -51,7 +51,7 @@
   60.13  TypeId 
   60.14  ListPositionAllocator::GetTypeId (void)
   60.15  {
   60.16 -  static TypeId tid = TypeId ("ListPositionAllocator")
   60.17 +  static TypeId tid = TypeId ("ns3::ListPositionAllocator")
   60.18      .SetParent<PositionAllocator> ()
   60.19      .AddConstructor<ListPositionAllocator> ()
   60.20      ;
   60.21 @@ -78,7 +78,7 @@
   60.22  TypeId 
   60.23  GridPositionAllocator::GetTypeId (void)
   60.24  {
   60.25 -  static TypeId tid = TypeId ("GridPositionAllocator")
   60.26 +  static TypeId tid = TypeId ("ns3::GridPositionAllocator")
   60.27      .SetParent<PositionAllocator> ()
   60.28      .SetGroupName ("Mobility")
   60.29      .AddConstructor<GridPositionAllocator> ()
   60.30 @@ -138,7 +138,7 @@
   60.31  TypeId
   60.32  RandomRectanglePositionAllocator::GetTypeId (void)
   60.33  {
   60.34 -  static TypeId tid = TypeId ("RandomRectanglePositionAllocator")
   60.35 +  static TypeId tid = TypeId ("ns3::RandomRectanglePositionAllocator")
   60.36      .SetParent<PositionAllocator> ()
   60.37      .SetGroupName ("Mobility")
   60.38      .AddConstructor<RandomRectanglePositionAllocator> ()
   60.39 @@ -172,7 +172,7 @@
   60.40  TypeId
   60.41  RandomDiscPositionAllocator::GetTypeId (void)
   60.42  {
   60.43 -  static TypeId tid = TypeId ("RandomDiscPositionAllocator")
   60.44 +  static TypeId tid = TypeId ("ns3::RandomDiscPositionAllocator")
   60.45      .SetParent<PositionAllocator> ()
   60.46      .SetGroupName ("Mobility")
   60.47      .AddConstructor<RandomDiscPositionAllocator> ()
    61.1 --- a/src/mobility/random-direction-2d-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
    61.2 +++ b/src/mobility/random-direction-2d-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
    61.3 @@ -36,7 +36,7 @@
    61.4  TypeId
    61.5  RandomDirection2dMobilityModel::GetTypeId (void)
    61.6  {
    61.7 -  static TypeId tid = TypeId ("RandomDirection2dMobilityModel")
    61.8 +  static TypeId tid = TypeId ("ns3::RandomDirection2dMobilityModel")
    61.9      .SetParent<MobilityModel> ()
   61.10      .SetGroupName ("Mobility")
   61.11      .AddConstructor<RandomDirection2dMobilityModel> ()
    62.1 --- a/src/mobility/random-walk-2d-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
    62.2 +++ b/src/mobility/random-walk-2d-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
    62.3 @@ -33,7 +33,7 @@
    62.4  TypeId
    62.5  RandomWalk2dMobilityModel::GetTypeId (void)
    62.6  {
    62.7 -  static TypeId tid = TypeId ("RandomWalk2dMobilityModel")
    62.8 +  static TypeId tid = TypeId ("ns3::RandomWalk2dMobilityModel")
    62.9      .SetParent<MobilityModel> ()
   62.10      .SetGroupName ("Mobility")
   62.11      .AddConstructor<RandomWalk2dMobilityModel> ()
    63.1 --- a/src/mobility/random-waypoint-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
    63.2 +++ b/src/mobility/random-waypoint-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
    63.3 @@ -30,7 +30,7 @@
    63.4  TypeId
    63.5  RandomWaypointMobilityModel::GetTypeId (void)
    63.6  {
    63.7 -  static TypeId tid = TypeId ("RandomWaypointMobilityModel")
    63.8 +  static TypeId tid = TypeId ("ns3::RandomWaypointMobilityModel")
    63.9      .SetParent<MobilityModel> ()
   63.10      .SetGroupName ("Mobility")
   63.11      .AddConstructor<RandomWaypointMobilityModel> ()
    64.1 --- a/src/mobility/static-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
    64.2 +++ b/src/mobility/static-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
    64.3 @@ -26,7 +26,7 @@
    64.4  TypeId
    64.5  StaticMobilityModel::GetTypeId (void)
    64.6  {
    64.7 -  static TypeId tid = TypeId ("StaticMobilityModel")
    64.8 +  static TypeId tid = TypeId ("ns3::StaticMobilityModel")
    64.9      .SetParent<MobilityModel> ()
   64.10      .AddConstructor<StaticMobilityModel> ()
   64.11      ;
    65.1 --- a/src/mobility/static-speed-mobility-model.cc	Thu Mar 13 11:21:12 2008 -0700
    65.2 +++ b/src/mobility/static-speed-mobility-model.cc	Thu Mar 13 12:56:49 2008 -0700
    65.3 @@ -26,7 +26,7 @@
    65.4  
    65.5  TypeId StaticSpeedMobilityModel::GetTypeId (void)
    65.6  {
    65.7 -  static TypeId tid = TypeId ("StaticSpeedMobilityModel")
    65.8 +  static TypeId tid = TypeId ("ns3::StaticSpeedMobilityModel")
    65.9      .SetParent<MobilityModel> ()
   65.10      .AddConstructor<StaticSpeedMobilityModel> ();
   65.11    return tid;
    66.1 --- a/src/node/application.cc	Thu Mar 13 11:21:12 2008 -0700
    66.2 +++ b/src/node/application.cc	Thu Mar 13 12:56:49 2008 -0700
    66.3 @@ -38,7 +38,7 @@
    66.4  TypeId 
    66.5  Application::GetTypeId (void)
    66.6  {
    66.7 -  static TypeId tid = TypeId ("Application")
    66.8 +  static TypeId tid = TypeId ("ns3::Application")
    66.9      .SetParent<Object> ()
   66.10      ;
   66.11    return tid;
    67.1 --- a/src/node/channel.cc	Thu Mar 13 11:21:12 2008 -0700
    67.2 +++ b/src/node/channel.cc	Thu Mar 13 12:56:49 2008 -0700
    67.3 @@ -29,7 +29,7 @@
    67.4  TypeId 
    67.5  Channel::GetTypeId (void)
    67.6  {
    67.7 -  static TypeId tid = TypeId ("Channel")
    67.8 +  static TypeId tid = TypeId ("ns3::Channel")
    67.9      .SetParent<Object> ();
   67.10    return tid;
   67.11  }
    68.1 --- a/src/node/drop-tail-queue.cc	Thu Mar 13 11:21:12 2008 -0700
    68.2 +++ b/src/node/drop-tail-queue.cc	Thu Mar 13 12:56:49 2008 -0700
    68.3 @@ -29,7 +29,7 @@
    68.4  
    68.5  TypeId DropTailQueue::GetTypeId (void) 
    68.6  {
    68.7 -  static TypeId tid = TypeId ("DropTailQueue")
    68.8 +  static TypeId tid = TypeId ("ns3::DropTailQueue")
    68.9      .SetParent<Queue> ()
   68.10      .AddConstructor<DropTailQueue> ()
   68.11      .AddAttribute ("MaxPackets", "The maximum number of packets accepted by this DropTailQueue.",
    69.1 --- a/src/node/ipv4.cc	Thu Mar 13 11:21:12 2008 -0700
    69.2 +++ b/src/node/ipv4.cc	Thu Mar 13 12:56:49 2008 -0700
    69.3 @@ -30,7 +30,7 @@
    69.4  TypeId 
    69.5  Ipv4::GetTypeId (void)
    69.6  {
    69.7 -  static TypeId tid = TypeId ("Ipv4")
    69.8 +  static TypeId tid = TypeId ("ns3::Ipv4")
    69.9      .SetParent<Object> ();
   69.10    return tid;
   69.11  }
    70.1 --- a/src/node/net-device.cc	Thu Mar 13 11:21:12 2008 -0700
    70.2 +++ b/src/node/net-device.cc	Thu Mar 13 12:56:49 2008 -0700
    70.3 @@ -31,7 +31,7 @@
    70.4  
    70.5  TypeId NetDevice::GetTypeId (void)
    70.6  {
    70.7 -  static TypeId tid = TypeId ("NetDevice")
    70.8 +  static TypeId tid = TypeId ("ns3::NetDevice")
    70.9      .SetParent<Object> ();
   70.10    return tid;
   70.11  }
    71.1 --- a/src/node/node.cc	Thu Mar 13 11:21:12 2008 -0700
    71.2 +++ b/src/node/node.cc	Thu Mar 13 12:56:49 2008 -0700
    71.3 @@ -35,7 +35,7 @@
    71.4  TypeId 
    71.5  Node::GetTypeId (void)
    71.6  {
    71.7 -  static TypeId tid = TypeId ("Node")
    71.8 +  static TypeId tid = TypeId ("ns3::Node")
    71.9      .SetParent<Object> ()
   71.10      .AddAttribute ("DeviceList", "The list of devices associated to this Node.",
   71.11                     ObjectVector (),
    72.1 --- a/src/node/packet-socket-factory.cc	Thu Mar 13 11:21:12 2008 -0700
    72.2 +++ b/src/node/packet-socket-factory.cc	Thu Mar 13 12:56:49 2008 -0700
    72.3 @@ -29,7 +29,7 @@
    72.4  TypeId 
    72.5  PacketSocketFactory::GetTypeId (void)
    72.6  {
    72.7 -  static TypeId tid = TypeId ("Packet")
    72.8 +  static TypeId tid = TypeId ("ns3::PacketSocketFactory")
    72.9      .SetParent<SocketFactory> ();
   72.10    return tid;
   72.11  }
    73.1 --- a/src/node/queue.cc	Thu Mar 13 11:21:12 2008 -0700
    73.2 +++ b/src/node/queue.cc	Thu Mar 13 12:56:49 2008 -0700
    73.3 @@ -30,7 +30,7 @@
    73.4  TypeId 
    73.5  Queue::GetTypeId (void)
    73.6  {
    73.7 -  static TypeId tid = TypeId ("Queue")
    73.8 +  static TypeId tid = TypeId ("ns3::Queue")
    73.9      .SetParent<Object> ()
   73.10      .AddTraceSource ("Enqueue", "XXX",
   73.11                       MakeTraceSourceAccessor (&Queue::m_traceEnqueue))
    74.1 --- a/src/node/socket-factory.cc	Thu Mar 13 11:21:12 2008 -0700
    74.2 +++ b/src/node/socket-factory.cc	Thu Mar 13 12:56:49 2008 -0700
    74.3 @@ -26,7 +26,7 @@
    74.4  
    74.5  TypeId SocketFactory::GetTypeId (void)
    74.6  {
    74.7 -  static TypeId tid = TypeId ("SocketFactory")
    74.8 +  static TypeId tid = TypeId ("ns3::SocketFactory")
    74.9      .SetParent<Object> ();
   74.10    return tid;
   74.11  }
    75.1 --- a/src/node/tcp.cc	Thu Mar 13 11:21:12 2008 -0700
    75.2 +++ b/src/node/tcp.cc	Thu Mar 13 12:56:49 2008 -0700
    75.3 @@ -27,7 +27,7 @@
    75.4  TypeId
    75.5  Tcp::GetTypeId (void)
    75.6  {
    75.7 -  static TypeId tid = TypeId ("Tcp")
    75.8 +  static TypeId tid = TypeId ("ns3::Tcp")
    75.9      .SetParent<SocketFactory> ()
   75.10     .AddAttribute ("TcpDefaultSegmentSize",
   75.11                    "Default TCP maximum segment size in bytes (may be adjusted based on MTU discovery)",
    76.1 --- a/src/node/udp.cc	Thu Mar 13 11:21:12 2008 -0700
    76.2 +++ b/src/node/udp.cc	Thu Mar 13 12:56:49 2008 -0700
    76.3 @@ -26,7 +26,7 @@
    76.4  
    76.5  TypeId Udp::GetTypeId (void)
    76.6  {
    76.7 -  static TypeId tid = TypeId ("Udp")
    76.8 +  static TypeId tid = TypeId ("ns3::Udp")
    76.9      .SetParent<SocketFactory> ();
   76.10    return tid;
   76.11  }
    77.1 --- a/src/routing/global-routing/global-router-interface.cc	Thu Mar 13 11:21:12 2008 -0700
    77.2 +++ b/src/routing/global-routing/global-router-interface.cc	Thu Mar 13 12:56:49 2008 -0700
    77.3 @@ -436,7 +436,7 @@
    77.4  TypeId 
    77.5  GlobalRouter::GetTypeId (void)
    77.6  {
    77.7 -  static TypeId tid = TypeId ("GlobalRouter")
    77.8 +  static TypeId tid = TypeId ("ns3::GlobalRouter")
    77.9      .SetParent<Object> ();
   77.10    return tid;
   77.11  }
    78.1 --- a/src/routing/olsr/olsr-agent-impl.cc	Thu Mar 13 11:21:12 2008 -0700
    78.2 +++ b/src/routing/olsr/olsr-agent-impl.cc	Thu Mar 13 12:56:49 2008 -0700
    78.3 @@ -154,7 +154,7 @@
    78.4  TypeId 
    78.5  AgentImpl::GetTypeId (void)
    78.6  {
    78.7 -  static TypeId tid = TypeId ("olsr::AgentImpl")
    78.8 +  static TypeId tid = TypeId ("ns3::olsr::AgentImpl")
    78.9      .SetParent<Agent> ()
   78.10      .AddConstructor<AgentImpl> ()
   78.11      .AddAttribute ("HelloInterval", "XXX",
    79.1 --- a/src/routing/olsr/olsr-agent.cc	Thu Mar 13 11:21:12 2008 -0700
    79.2 +++ b/src/routing/olsr/olsr-agent.cc	Thu Mar 13 12:56:49 2008 -0700
    79.3 @@ -28,7 +28,7 @@
    79.4  TypeId 
    79.5  Agent::GetTypeId (void)
    79.6  {
    79.7 -  static TypeId tid = TypeId ("OlsrAgent")
    79.8 +  static TypeId tid = TypeId ("ns3::olsr::Agent")
    79.9      .SetParent<Object> ();
   79.10    return tid;
   79.11  }
    80.1 --- a/src/routing/olsr/olsr-helper.cc	Thu Mar 13 11:21:12 2008 -0700
    80.2 +++ b/src/routing/olsr/olsr-helper.cc	Thu Mar 13 12:56:49 2008 -0700
    80.3 @@ -6,7 +6,7 @@
    80.4  
    80.5  OlsrHelper::OlsrHelper ()
    80.6  {
    80.7 -  m_agentFactory.SetTypeId ("olsr::AgentImpl");
    80.8 +  m_agentFactory.SetTypeId ("ns3::olsr::AgentImpl");
    80.9  }
   80.10  
   80.11  void 
    81.1 --- a/utils/print-introspected-doxygen.cc	Thu Mar 13 11:21:12 2008 -0700
    81.2 +++ b/utils/print-introspected-doxygen.cc	Thu Mar 13 12:56:49 2008 -0700
    81.3 @@ -1,29 +1,92 @@
    81.4 -#include "ns3/internet-node.h"
    81.5 -#include "ns3/ptr.h"
    81.6 -#include "ns3/node-list.h"
    81.7 -#include "ns3/point-to-point-net-device.h"
    81.8 -#include "ns3/csma-net-device.h"
    81.9 -#include "ns3/queue.h"
   81.10 -#include "ns3/drop-tail-queue.h"
   81.11 -#include "ns3/mobility-model-notifier.h"
   81.12 -#include "ns3/string.h"
   81.13 +#include <iostream>
   81.14 +#include "ns3/object.h"
   81.15  
   81.16  using namespace ns3;
   81.17  
   81.18 +void
   81.19 +PrintAttributes (TypeId tid, std::ostream &os)
   81.20 +{
   81.21 +  os << "<ul>"<<std::endl;
   81.22 +  for (uint32_t j = 0; j < tid.GetAttributeListN (); j++)
   81.23 +    {
   81.24 +      os << "<li><b>" << tid.GetAttributeName (j) << "</b>: "
   81.25 +		<< tid.GetAttributeHelp (j) << std::endl;
   81.26 +      Ptr<const AttributeChecker> checker = tid.GetAttributeChecker (j);
   81.27 +      os << "  <ul>" << std::endl << "    <li>Type: " <<  checker->GetType ();
   81.28 +      if (checker->HasTypeConstraints ())
   81.29 +	{
   81.30 +	  os << " -> " << checker->GetTypeConstraints ();
   81.31 +	}
   81.32 +      os << "</li>" << std::endl;
   81.33 +      uint32_t flags = tid.GetAttributeFlags (j);
   81.34 +      os << "<li>Flags: ";
   81.35 +      if (flags & TypeId::ATTR_SET)
   81.36 +	{
   81.37 +	  os << "write ";
   81.38 +	}
   81.39 +      if (flags & TypeId::ATTR_GET)
   81.40 +	{
   81.41 +	  os << "read ";
   81.42 +	}
   81.43 +      if (flags & TypeId::ATTR_CONSTRUCT)
   81.44 +	{
   81.45 +	  os << "construct ";
   81.46 +	}
   81.47 +      os << "  </ul> " << std::endl;
   81.48 +      
   81.49 +    }
   81.50 +  os << "</ul>" << std::endl;
   81.51 +}
   81.52  
   81.53  
   81.54  int main (int argc, char *argv[])
   81.55  {
   81.56 -  Ptr<Node> node = CreateObject<InternetNode> ();
   81.57 -  node->AggregateObject (CreateObject<MobilityModelNotifier> ());
   81.58  
   81.59 -  Ptr<PointToPointNetDevice> p2p = CreateObject<PointToPointNetDevice> ("Address", Mac48Address::Allocate ());
   81.60 -  node->AddDevice (p2p);
   81.61 -  p2p->AddQueue (CreateObject<DropTailQueue> ());
   81.62 -  Ptr<CsmaNetDevice> csma = CreateObject<CsmaNetDevice> ("Address", Mac48Address::Allocate (),
   81.63 -							 "EncapsulationMode", String ("Llc"));
   81.64 -  node->AddDevice (csma);
   81.65 -  csma->AddQueue (CreateObject<DropTailQueue> ());
   81.66 +  for (uint32_t i = 0; i < TypeId::GetRegisteredN (); i++)
   81.67 +    {
   81.68 +      std::cout << "/*!" << std::endl;
   81.69 +      TypeId tid = TypeId::GetRegistered (i);
   81.70 +      if (tid.MustHideFromDocumentation ())
   81.71 +	{
   81.72 +	  continue;
   81.73 +	}
   81.74 +      std::cout << "\\fn static TypeId " << tid.GetName () << "::GetTypeId (void)" << std::endl;
   81.75 +      std::cout << "\\brief This method returns the TypeId associated to \\ref " << tid.GetName () << std::endl << std::endl;
   81.76 +      if (tid.GetAttributeListN () == 0)
   81.77 +	{
   81.78 +	  std::cout << "No Attributes defined for this type." << std::endl;
   81.79 +	}
   81.80 +      else
   81.81 +	{
   81.82 +	  std::cout << "Attributes defined for this type:" << std::endl;
   81.83 +	  PrintAttributes (tid, std::cout);
   81.84 +	}
   81.85 +      bool hasAttributesInParent = false;
   81.86 +      TypeId tmp = tid.GetParent ();
   81.87 +      while (tmp.GetParent () != tmp)
   81.88 +	{
   81.89 +	  if (tmp.GetAttributeListN () != 0)
   81.90 +	    {
   81.91 +	      hasAttributesInParent = true;
   81.92 +	    }
   81.93 +	  tmp = tmp.GetParent ();
   81.94 +	}
   81.95 +      if (hasAttributesInParent)
   81.96 +	{
   81.97 +	  std::cout << "Attributes defined in parent classes:<br>" << std::endl;
   81.98 +	  tmp = tid.GetParent ();
   81.99 +	  while (tmp.GetParent () != tmp)
  81.100 +	    {
  81.101 +	      if (tmp.GetAttributeListN () != 0)
  81.102 +		{
  81.103 +		  std::cout << tmp.GetName () << std::endl;
  81.104 +		  PrintAttributes (tmp, std::cout);
  81.105 +		}
  81.106 +	      tmp = tmp.GetParent ();
  81.107 +	    }
  81.108 +	}
  81.109 +      std::cout << "*/" << std::endl;
  81.110 +    }
  81.111  
  81.112  
  81.113    return 0;