--- a/src/core/model/object.h	Fri May 13 14:51:51 2011 -0400
+++ b/src/core/model/object.h	Fri May 13 14:52:27 2011 -0400
@@ -76,7 +76,7 @@
    */
   class AggregateIterator
   {
-  public:
+public:
     AggregateIterator ();
 
     /**
@@ -89,7 +89,7 @@
      * \returns the next aggregated object.
      */
     Ptr<const Object> Next (void);
-  private:
+private:
     friend class Object;
     AggregateIterator (Ptr<const Object> object);
     Ptr<const Object> m_object;
@@ -123,7 +123,7 @@
    *
    * Note that you can call Dispose many times on the same object or
    * different objects aggregated together, and DoDispose will be
-   * called only once for each aggregated object.  
+   * called only once for each aggregated object.
    *
    * This method is typically used to break reference cycles.
    */
@@ -164,13 +164,13 @@
   void Start (void);
 
 protected:
- /**
-  * This method is invoked whenever two sets of objects are aggregated together.
-  * It is invoked exactly once for each object in both sets.
-  * This method can be overriden by subclasses who wish to be notified of aggregation
-  * events. These subclasses must chain up to their base class NotifyNewAggregate method.
-  * It is safe to call GetObject and AggregateObject from within this method.
-  */
+  /**
+   * This method is invoked whenever two sets of objects are aggregated together.
+   * It is invoked exactly once for each object in both sets.
+   * This method can be overriden by subclasses who wish to be notified of aggregation
+   * events. These subclasses must chain up to their base class NotifyNewAggregate method.
+   * It is safe to call GetObject and AggregateObject from within this method.
+   */
   virtual void NotifyNewAggregate (void);
   /**
    * This method is called only once by Object::Start. If the user
@@ -259,14 +259,14 @@
    * keep track of the type of this object instance.
    */
   void SetTypeId (TypeId tid);
-   /**
-   * \param attributes the attribute values used to initialize 
-   *        the member variables of this object's instance.
-   *
-   * Invoked from ns3::ObjectFactory::Create and ns3::CreateObject only.
-   * Initialize all the member variables which were
-   * registered with the associated TypeId.
-   */
+  /**
+  * \param attributes the attribute values used to initialize
+  *        the member variables of this object's instance.
+  *
+  * Invoked from ns3::ObjectFactory::Create and ns3::CreateObject only.
+  * Initialize all the member variables which were
+  * registered with the associated TypeId.
+  */
   void Construct (const AttributeList &attributes);
 
   void UpdateSortedArray (struct Aggregates *aggregates, uint32_t i) const;
@@ -359,15 +359,15 @@
 template <typename T>
 Ptr<T> 
 CreateObjectWithAttributes (std::string n1 = "", const AttributeValue & v1 = EmptyAttributeValue (),
-              std::string n2 = "", const AttributeValue & v2 = EmptyAttributeValue (),
-              std::string n3 = "", const AttributeValue & v3 = EmptyAttributeValue (),
-              std::string n4 = "", const AttributeValue & v4 = EmptyAttributeValue (),
-              std::string n5 = "", const AttributeValue & v5 = EmptyAttributeValue (),
-              std::string n6 = "", const AttributeValue & v6 = EmptyAttributeValue (),
-              std::string n7 = "", const AttributeValue & v7 = EmptyAttributeValue (),
-              std::string n8 = "", const AttributeValue & v8 = EmptyAttributeValue (),
-              std::string n9 = "", const AttributeValue & v9 = EmptyAttributeValue ());
-  
+                            std::string n2 = "", const AttributeValue & v2 = EmptyAttributeValue (),
+                            std::string n3 = "", const AttributeValue & v3 = EmptyAttributeValue (),
+                            std::string n4 = "", const AttributeValue & v4 = EmptyAttributeValue (),
+                            std::string n5 = "", const AttributeValue & v5 = EmptyAttributeValue (),
+                            std::string n6 = "", const AttributeValue & v6 = EmptyAttributeValue (),
+                            std::string n7 = "", const AttributeValue & v7 = EmptyAttributeValue (),
+                            std::string n8 = "", const AttributeValue & v8 = EmptyAttributeValue (),
+                            std::string n9 = "", const AttributeValue & v9 = EmptyAttributeValue ());
+
 
 
 } // namespace ns3
@@ -449,20 +449,20 @@
   Ptr<T> p = Ptr<T> (new T (), false);
   p->SetTypeId (T::GetTypeId ());
   p->Object::Construct (attributes);
-  return p;  
+  return p;
 }
 
 template <typename T>
 Ptr<T> 
-CreateObjectWithAttributes (std::string n1 , const AttributeValue & v1,
-              std::string n2 , const AttributeValue & v2,
-              std::string n3 , const AttributeValue & v3,
-              std::string n4 , const AttributeValue & v4,
-              std::string n5 , const AttributeValue & v5,
-              std::string n6 , const AttributeValue & v6,
-              std::string n7 , const AttributeValue & v7,
-              std::string n8 , const AttributeValue & v8,
-              std::string n9 , const AttributeValue & v9)
+CreateObjectWithAttributes (std::string n1, const AttributeValue & v1,
+                            std::string n2, const AttributeValue & v2,
+                            std::string n3, const AttributeValue & v3,
+                            std::string n4, const AttributeValue & v4,
+                            std::string n5, const AttributeValue & v5,
+                            std::string n6, const AttributeValue & v6,
+                            std::string n7, const AttributeValue & v7,
+                            std::string n8, const AttributeValue & v8,
+                            std::string n9, const AttributeValue & v9)
 {
   AttributeList attributes;
   if (n1 == "")
@@ -510,7 +510,7 @@
       goto end;
     }
   attributes.SetWithTid (T::GetTypeId (), n9, v9);
- end:
+end:
   return CreateObjectWithAttributes<T> (attributes);
 }