TypeId::GetAttributeListN -> TypeId::GetAttributeN
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Fri, 21 Mar 2008 13:41:16 -0700
changeset 269356e28e34e109
parent 2692 e4387e19039d
child 2694 9440242e1c76
TypeId::GetAttributeListN -> TypeId::GetAttributeN
src/common/packet.cc
src/core/attribute-list.cc
src/core/command-line.cc
src/core/object-base.cc
src/core/type-id.cc
src/core/type-id.h
utils/print-introspected-doxygen.cc
     1.1 --- a/src/common/packet.cc	Fri Mar 21 13:24:15 2008 -0700
     1.2 +++ b/src/common/packet.cc	Fri Mar 21 13:41:16 2008 -0700
     1.3 @@ -308,14 +308,14 @@
     1.4                Chunk *chunk = dynamic_cast<Chunk *> (instance);
     1.5                NS_ASSERT (chunk != 0);
     1.6                chunk->Deserialize (item.current);
     1.7 -              for (uint32_t j = 0; j < item.tid.GetAttributeListN (); j++)
     1.8 +              for (uint32_t j = 0; j < item.tid.GetAttributeN (); j++)
     1.9                  {
    1.10                    std::string attrName = item.tid.GetAttributeName (j);
    1.11                    std::string value;
    1.12                    bool ok = chunk->GetAttribute (attrName, value);
    1.13                    NS_ASSERT (ok);
    1.14                    os << attrName << "=" << value;
    1.15 -                  if ((j + 1) < item.tid.GetAttributeListN ())
    1.16 +                  if ((j + 1) < item.tid.GetAttributeN ())
    1.17                      {
    1.18                        os << ",";
    1.19                      }
     2.1 --- a/src/core/attribute-list.cc	Fri Mar 21 13:24:15 2008 -0700
     2.2 +++ b/src/core/attribute-list.cc	Fri Mar 21 13:41:16 2008 -0700
     2.3 @@ -171,7 +171,7 @@
     2.4    for (uint32_t i = 0; i < TypeId::GetRegisteredN (); i++)
     2.5      {
     2.6        TypeId tid = TypeId::GetRegistered (i);
     2.7 -      for (uint32_t j = 0; j < tid.GetAttributeListN (); j++)
     2.8 +      for (uint32_t j = 0; j < tid.GetAttributeN (); j++)
     2.9          {
    2.10            if (checker == tid.GetAttributeChecker (j))
    2.11              {
     3.1 --- a/src/core/command-line.cc	Fri Mar 21 13:24:15 2008 -0700
     3.2 +++ b/src/core/command-line.cc	Fri Mar 21 13:41:16 2008 -0700
     3.3 @@ -124,7 +124,7 @@
     3.4      {
     3.5        NS_FATAL_ERROR ("Unknown type="<<type<<" in --PrintAttributes");
     3.6      }
     3.7 -  for (uint32_t i = 0; i < tid.GetAttributeListN (); ++i)
     3.8 +  for (uint32_t i = 0; i < tid.GetAttributeN (); ++i)
     3.9      {
    3.10        std::cout << "    --"<<tid.GetAttributeFullName (i)<<"=[";
    3.11        Ptr<const AttributeChecker> checker = tid.GetAttributeChecker (i);
     4.1 --- a/src/core/object-base.cc	Fri Mar 21 13:24:15 2008 -0700
     4.2 +++ b/src/core/object-base.cc	Fri Mar 21 13:41:16 2008 -0700
     4.3 @@ -36,8 +36,8 @@
     4.4    TypeId tid = GetInstanceTypeId ();
     4.5    do {
     4.6      // loop over all attributes in object type
     4.7 -    NS_LOG_DEBUG ("construct tid="<<tid.GetName ()<<", params="<<tid.GetAttributeListN ());
     4.8 -    for (uint32_t i = 0; i < tid.GetAttributeListN (); i++)
     4.9 +    NS_LOG_DEBUG ("construct tid="<<tid.GetName ()<<", params="<<tid.GetAttributeN ());
    4.10 +    for (uint32_t i = 0; i < tid.GetAttributeN (); i++)
    4.11        {
    4.12          Ptr<const AttributeAccessor> paramSpec = tid.GetAttributeAccessor (i);
    4.13          Attribute initial = tid.GetAttributeInitialValue (i);
     5.1 --- a/src/core/type-id.cc	Fri Mar 21 13:24:15 2008 -0700
     5.2 +++ b/src/core/type-id.cc	Fri Mar 21 13:41:16 2008 -0700
     5.3 @@ -54,7 +54,7 @@
     5.4                       ns3::Attribute initialValue,
     5.5                       ns3::Ptr<const ns3::AttributeAccessor> spec,
     5.6                       ns3::Ptr<const ns3::AttributeChecker> checker);
     5.7 -  uint32_t GetAttributeListN (uint16_t uid) const;
     5.8 +  uint32_t GetAttributeN (uint16_t uid) const;
     5.9    std::string GetAttributeName (uint16_t uid, uint32_t i) const;
    5.10    std::string GetAttributeHelp (uint16_t uid, uint32_t i) const;
    5.11    uint32_t GetAttributeFlags (uint16_t uid, uint32_t i) const;
    5.12 @@ -263,7 +263,7 @@
    5.13  
    5.14  
    5.15  uint32_t 
    5.16 -IidManager::GetAttributeListN (uint16_t uid) const
    5.17 +IidManager::GetAttributeN (uint16_t uid) const
    5.18  {
    5.19    struct IidInformation *information = LookupInformation (uid);
    5.20    return information->attributes.size ();
    5.21 @@ -438,7 +438,7 @@
    5.22    TypeId nextTid = *this;
    5.23    do {
    5.24      tid = nextTid;
    5.25 -    for (uint32_t i = 0; i < tid.GetAttributeListN (); i++)
    5.26 +    for (uint32_t i = 0; i < tid.GetAttributeN (); i++)
    5.27        {
    5.28          std::string paramName = tid.GetAttributeName (i);
    5.29          if (paramName == name)
    5.30 @@ -548,9 +548,9 @@
    5.31  }
    5.32  
    5.33  uint32_t 
    5.34 -TypeId::GetAttributeListN (void) const
    5.35 +TypeId::GetAttributeN (void) const
    5.36  {
    5.37 -  uint32_t n = Singleton<IidManager>::Get ()->GetAttributeListN (m_tid);
    5.38 +  uint32_t n = Singleton<IidManager>::Get ()->GetAttributeN (m_tid);
    5.39    return n;
    5.40  }
    5.41  std::string 
     6.1 --- a/src/core/type-id.h	Fri Mar 21 13:24:15 2008 -0700
     6.2 +++ b/src/core/type-id.h	Fri Mar 21 13:41:16 2008 -0700
     6.3 @@ -139,7 +139,7 @@
     6.4    /**
     6.5     * \returns the number of attributes associated to this TypeId
     6.6     */
     6.7 -  uint32_t GetAttributeListN (void) const;
     6.8 +  uint32_t GetAttributeN (void) const;
     6.9    /**
    6.10     * \param i index into attribute array
    6.11     * \returns the name associated to the attribute whose
     7.1 --- a/utils/print-introspected-doxygen.cc	Fri Mar 21 13:24:15 2008 -0700
     7.2 +++ b/utils/print-introspected-doxygen.cc	Fri Mar 21 13:41:16 2008 -0700
     7.3 @@ -7,7 +7,7 @@
     7.4  PrintAttributes (TypeId tid, std::ostream &os)
     7.5  {
     7.6    os << "<ul>"<<std::endl;
     7.7 -  for (uint32_t j = 0; j < tid.GetAttributeListN (); j++)
     7.8 +  for (uint32_t j = 0; j < tid.GetAttributeN (); j++)
     7.9      {
    7.10        os << "<li><b>" << tid.GetAttributeName (j) << "</b>: "
    7.11  		<< tid.GetAttributeHelp (j) << std::endl;
    7.12 @@ -52,7 +52,7 @@
    7.13  	}
    7.14        std::cout << "\\fn static TypeId " << tid.GetName () << "::GetTypeId (void)" << std::endl;
    7.15        std::cout << "\\brief This method returns the TypeId associated to \\ref " << tid.GetName () << std::endl << std::endl;
    7.16 -      if (tid.GetAttributeListN () == 0)
    7.17 +      if (tid.GetAttributeN () == 0)
    7.18  	{
    7.19  	  std::cout << "No Attributes defined for this type." << std::endl;
    7.20  	}
    7.21 @@ -65,7 +65,7 @@
    7.22        TypeId tmp = tid.GetParent ();
    7.23        while (tmp.GetParent () != tmp)
    7.24  	{
    7.25 -	  if (tmp.GetAttributeListN () != 0)
    7.26 +	  if (tmp.GetAttributeN () != 0)
    7.27  	    {
    7.28  	      hasAttributesInParent = true;
    7.29  	    }
    7.30 @@ -77,7 +77,7 @@
    7.31  	  tmp = tid.GetParent ();
    7.32  	  while (tmp.GetParent () != tmp)
    7.33  	    {
    7.34 -	      if (tmp.GetAttributeListN () != 0)
    7.35 +	      if (tmp.GetAttributeN () != 0)
    7.36  		{
    7.37  		  std::cout << tmp.GetName () << std::endl;
    7.38  		  PrintAttributes (tmp, std::cout);