Updated all cpp files to new format
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / builder-signals.cpp
index d38e1d4..c4af9d4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  */
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/common/stage.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/object/type-info.h>
 #include <dali/public-api/object/property-notification.h>
-#include <dali/devel-api/common/stage.h>
+#include <dali/public-api/object/type-info.h>
 
 #include <dali/integration-api/debug.h>
 #include <limits>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/builder/builder-impl.h>
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
+#include <dali-toolkit/internal/builder/builder-impl.h>
 
 namespace Dali
 {
@@ -35,11 +35,11 @@ namespace Toolkit
 {
 namespace Internal
 {
-extern Animation CreateAnimation( const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder  );
-extern void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value );
-}
-}
-}
+extern Animation CreateAnimation(const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder);
+extern void      DeterminePropertyFromNode(const TreeNode& node, Property::Value& value);
+} // namespace Internal
+} // namespace Toolkit
+} // namespace Dali
 
 namespace
 {
@@ -52,9 +52,9 @@ using namespace Dali;
 // Action on child actor. The child is found by name
 struct ChildActorAction
 {
-  std::string actorName;
-  std::string actionName;
-  std::string childName;
+  std::string   actorName;
+  std::string   actionName;
+  std::string   childName;
   Property::Map parameters;
 
   void operator()(void)
@@ -80,8 +80,8 @@ struct ChildActorAction
 // Action to set a property
 struct PropertySetAction
 {
-  std::string actorName;
-  std::string propertyName;
+  std::string     actorName;
+  std::string     propertyName;
   Property::Value value;
 
   void operator()(void)
@@ -92,15 +92,15 @@ struct PropertySetAction
     {
       Property::Index idx = actor.GetPropertyIndex(propertyName);
 
-      if( idx != Property::INVALID_INDEX )
+      if(idx != Property::INVALID_INDEX)
       {
-        if( actor.GetPropertyType(idx) != value.GetType() )
+        if(actor.GetPropertyType(idx) != value.GetType())
         {
           DALI_SCRIPT_WARNING("Set property action has different type for property '%s'\n", propertyName.c_str());
         }
         else
         {
-          actor.SetProperty( idx, value );
+          actor.SetProperty(idx, value);
         }
       }
       else
@@ -114,8 +114,8 @@ struct PropertySetAction
 // Generic action on a handle (Animation & Actor)
 struct GenericAction
 {
-  std::string actorName;
-  std::string actionName;
+  std::string   actorName;
+  std::string   actionName;
   Property::Map parameters;
 
   void operator()(void)
@@ -125,7 +125,6 @@ struct GenericAction
     {
       actor.DoAction(actionName, parameters);
     }
-
   };
 };
 
@@ -142,12 +141,12 @@ struct QuitAction
 // Delay an animation play; ie wait as its not on stage yet
 struct DelayedAnimationPlay
 {
-  OptionalChild                                         animNode;
-  Dali::IntrusivePtr<Dali::Toolkit::Internal::Builder>  builder;
+  OptionalChild                                        animNode;
+  Dali::IntrusivePtr<Dali::Toolkit::Internal::Builder> builder;
 
   void operator()(void)
   {
-    Animation anim = Toolkit::Internal::CreateAnimation(*animNode, builder.Get() );
+    Animation anim = Toolkit::Internal::CreateAnimation(*animNode, builder.Get());
     if(anim)
     {
       anim.Play();
@@ -158,16 +157,16 @@ struct DelayedAnimationPlay
 // Delay a pathConstrainer apply
 struct DelayedConstrainerApply
 {
-  std::string     constrainerName;
+  std::string constrainerName;
 
   std::vector<std::string> targetActorNames;
   std::vector<std::string> sourceActorNames;
   std::vector<std::string> targetPropertyNames;
   std::vector<std::string> sourcePropertyNames;
-  std::vector<Vector2>  ranges;
-  std::vector<Vector2>  wrapRanges;
+  std::vector<Vector2>     ranges;
+  std::vector<Vector2>     wrapRanges;
 
-  Dali::IntrusivePtr<Dali::Toolkit::Internal::Builder>  builder;
+  Dali::IntrusivePtr<Dali::Toolkit::Internal::Builder> builder;
 
   /*
    * Helper function to get the parameters to apply each constraint
@@ -177,43 +176,43 @@ struct DelayedConstrainerApply
    * @param[out] sourceActor Source actor for the constraint
    * @param[out] sourcePropertyIndex Source property index for the constraint
    */
-  bool GetApplyParameters( size_t i,
-                           Actor& targetActor, Property::Index& targetPropertyIndex,
-                           Actor& sourceActor, Property::Index& sourcePropertyIndex)
+  bool GetApplyParameters(size_t           i,
+                          Actor&           targetActor,
+                          Property::Index& targetPropertyIndex,
+                          Actor&           sourceActor,
+                          Property::Index& sourcePropertyIndex)
   {
-
-    targetActor = Stage::GetCurrent().GetRootLayer().FindChildByName(targetActorNames[i]);
+    targetActor         = Stage::GetCurrent().GetRootLayer().FindChildByName(targetActorNames[i]);
     targetPropertyIndex = Property::INVALID_INDEX;
     if(targetActor)
     {
       targetPropertyIndex = targetActor.GetPropertyIndex(targetPropertyNames[i]);
-      if( targetPropertyIndex ==  Property::INVALID_INDEX )
+      if(targetPropertyIndex == Property::INVALID_INDEX)
       {
-        DALI_SCRIPT_WARNING("Property '%s' not founded in actor '%s'\n", targetPropertyNames[i].c_str(), targetActorNames[i].c_str() );
+        DALI_SCRIPT_WARNING("Property '%s' not founded in actor '%s'\n", targetPropertyNames[i].c_str(), targetActorNames[i].c_str());
         return false;
       }
     }
     else
     {
-      DALI_SCRIPT_WARNING("Actor '%s' not founded\n", targetActorNames[i].c_str() );
+      DALI_SCRIPT_WARNING("Actor '%s' not founded\n", targetActorNames[i].c_str());
       return false;
     }
 
-
-    sourceActor = Stage::GetCurrent().GetRootLayer().FindChildByName(sourceActorNames[i]);
+    sourceActor         = Stage::GetCurrent().GetRootLayer().FindChildByName(sourceActorNames[i]);
     sourcePropertyIndex = Property::INVALID_INDEX;
     if(sourceActor)
     {
       sourcePropertyIndex = sourceActor.GetPropertyIndex(sourcePropertyNames[i]);
-      if( sourcePropertyIndex ==  Property::INVALID_INDEX )
+      if(sourcePropertyIndex == Property::INVALID_INDEX)
       {
-        DALI_SCRIPT_WARNING("Property '%s' not founded in actor '%s'\n", sourcePropertyNames[i].c_str(), sourceActorNames[i].c_str() );
+        DALI_SCRIPT_WARNING("Property '%s' not founded in actor '%s'\n", sourcePropertyNames[i].c_str(), sourceActorNames[i].c_str());
         return false;
       }
     }
     else
     {
-      DALI_SCRIPT_WARNING("Actor '%s' not founded\n", targetActorNames[i].c_str() );
+      DALI_SCRIPT_WARNING("Actor '%s' not founded\n", targetActorNames[i].c_str());
       return false;
     }
     return true;
@@ -221,24 +220,23 @@ struct DelayedConstrainerApply
 
   void operator()(void)
   {
-    Actor sourceActor, targetActor;
+    Actor           sourceActor, targetActor;
     Property::Index targetPropertyIndex(Property::INVALID_INDEX);
     Property::Index sourcePropertyIndex(Property::INVALID_INDEX);
-    size_t actorCount( targetActorNames.size() );
-    if( builder.Get()->IsPathConstrainer( constrainerName ))
+    size_t          actorCount(targetActorNames.size());
+    if(builder.Get()->IsPathConstrainer(constrainerName))
     {
       PathConstrainer constrainer = builder.Get()->GetPathConstrainer(constrainerName);
-      if( constrainer )
+      if(constrainer)
       {
-        for(size_t i(0); i<actorCount; ++i )
+        for(size_t i(0); i < actorCount; ++i)
         {
-
-          if( GetApplyParameters( i, targetActor, targetPropertyIndex, sourceActor, sourcePropertyIndex ) )
+          if(GetApplyParameters(i, targetActor, targetPropertyIndex, sourceActor, sourcePropertyIndex))
           {
-            constrainer.Apply( Property(targetActor,targetPropertyIndex),
-                               Property(sourceActor,sourcePropertyIndex),
-                               ranges[i],
-                               wrapRanges[i]);
+            constrainer.Apply(Property(targetActor, targetPropertyIndex),
+                              Property(sourceActor, sourcePropertyIndex),
+                              ranges[i],
+                              wrapRanges[i]);
           }
         }
       }
@@ -247,20 +245,19 @@ struct DelayedConstrainerApply
         DALI_SCRIPT_WARNING("Constrainer %s not found\n", constrainerName.c_str());
       }
     }
-    else if( builder.Get()->IsLinearConstrainer( constrainerName ) )
+    else if(builder.Get()->IsLinearConstrainer(constrainerName))
     {
-      Dali::LinearConstrainer constrainer( builder.Get()->GetLinearConstrainer(constrainerName));
-      if( constrainer )
+      Dali::LinearConstrainer constrainer(builder.Get()->GetLinearConstrainer(constrainerName));
+      if(constrainer)
       {
-        for(size_t i(0); i<actorCount; ++i )
+        for(size_t i(0); i < actorCount; ++i)
         {
-
-          if( GetApplyParameters( i, targetActor, targetPropertyIndex, sourceActor, sourcePropertyIndex ) )
+          if(GetApplyParameters(i, targetActor, targetPropertyIndex, sourceActor, sourcePropertyIndex))
           {
-            constrainer.Apply( Property(targetActor,targetPropertyIndex),
-                               Property(sourceActor,sourcePropertyIndex),
-                               ranges[i],
-                               wrapRanges[i]);
+            constrainer.Apply(Property(targetActor, targetPropertyIndex),
+                              Property(sourceActor, sourcePropertyIndex),
+                              ranges[i],
+                              wrapRanges[i]);
           }
         }
       }
@@ -279,24 +276,24 @@ struct DelayedConstrainerApply
 // Delay a pathConstrainer remove
 struct DelayedConstrainerRemove
 {
-  std::string     constrainerName;
-  std::vector<std::string> targetActorNames;
-  Dali::IntrusivePtr<Dali::Toolkit::Internal::Builder>  builder;
+  std::string                                          constrainerName;
+  std::vector<std::string>                             targetActorNames;
+  Dali::IntrusivePtr<Dali::Toolkit::Internal::Builder> builder;
 
   void operator()(void)
   {
-    size_t actorCount( targetActorNames.size() );
-    if( builder.Get()->IsPathConstrainer( constrainerName ))
+    size_t actorCount(targetActorNames.size());
+    if(builder.Get()->IsPathConstrainer(constrainerName))
     {
       PathConstrainer constrainer = builder.Get()->GetPathConstrainer(constrainerName);
-      if( constrainer )
+      if(constrainer)
       {
-        for(size_t i(0); i<actorCount; ++i )
+        for(size_t i(0); i < actorCount; ++i)
         {
           Actor targetActor = Stage::GetCurrent().GetRootLayer().FindChildByName(targetActorNames[i]);
           if(targetActor)
           {
-            constrainer.Remove( targetActor );
+            constrainer.Remove(targetActor);
           }
         }
       }
@@ -305,17 +302,17 @@ struct DelayedConstrainerRemove
         DALI_SCRIPT_WARNING("Constrainer %s not found\n", constrainerName.c_str());
       }
     }
-    else if(builder.Get()->IsLinearConstrainer( constrainerName ))
+    else if(builder.Get()->IsLinearConstrainer(constrainerName))
     {
       LinearConstrainer constrainer = builder.Get()->GetLinearConstrainer(constrainerName);
-      if( constrainer )
+      if(constrainer)
       {
-        for(size_t i(0); i<actorCount; ++i )
+        for(size_t i(0); i < actorCount; ++i)
         {
           Actor targetActor = Stage::GetCurrent().GetRootLayer().FindChildByName(targetActorNames[i]);
           if(targetActor)
           {
-            constrainer.Remove( targetActor );
+            constrainer.Remove(targetActor);
           }
         }
       }
@@ -334,7 +331,7 @@ struct DelayedConstrainerRemove
 /*
  * Gets Property::Value from child
  */
-Property::Value GetPropertyValue(const TreeNode &child)
+Property::Value GetPropertyValue(const TreeNodechild)
 {
   size_t nChildren = child.Size();
 
@@ -343,16 +340,16 @@ Property::Value GetPropertyValue(const TreeNode &child)
   if(0 == nChildren)
   {
     // cast away unused return for static analyzers
-    static_cast<void>( Dali::Toolkit::Internal::DeterminePropertyFromNode( child, ret ) );
+    static_cast<void>(Dali::Toolkit::Internal::DeterminePropertyFromNode(child, ret));
   }
   else if(1 == nChildren)
   {
     // {"property": {"quaternion":[1,2,3,4]} }
     // {"property": {"angle":22, "axis": [1,2,3]} }
 
-    OptionalChild quaternion  = IsChild(&child, "quaternion");
-    OptionalChild axis        = IsChild(&child, "axis");
-    OptionalChild angle       = IsChild(&child, "angle");
+    OptionalChild quaternion = IsChild(&child, "quaternion");
+    OptionalChild axis       = IsChild(&child, "axis");
+    OptionalChild angle      = IsChild(&child, "angle");
 
     if(quaternion)
     {
@@ -382,14 +379,13 @@ Property::Value GetPropertyValue(const TreeNode &child)
   return ret;
 }
 
-
 /*
  * Gets Parmeter list from child
  * params is be cleared before insertion
  */
 void GetParameters(const TreeNode& child, Property::Map& params)
 {
-  if( OptionalChild c = IsChild(child, "parameters") )
+  if(OptionalChild c = IsChild(child, "parameters"))
   {
     const TreeNode& node = *c;
 
@@ -397,18 +393,21 @@ void GetParameters(const TreeNode& child, Property::Map& params)
 
     for(TreeNode::ConstIterator iter(node.CBegin()); iter != node.CEnd(); ++iter)
     {
-      params[ (*iter).first ] = GetPropertyValue( (*iter).second );
+      params[(*iter).first] = GetPropertyValue((*iter).second);
     }
   }
 }
 
 // Shim for the property notifcation signal
-template <typename T>
+template<typename T>
 struct PropertyNotifcationSignalShim
 {
   T mFunctor;
 
-  PropertyNotifcationSignalShim(T& functor) : mFunctor(functor) {}
+  PropertyNotifcationSignalShim(T& functor)
+  : mFunctor(functor)
+  {
+  }
 
   void operator()(PropertyNotification& /* source */)
   {
@@ -417,105 +416,115 @@ struct PropertyNotifcationSignalShim
 };
 
 // Specializations for the different signal connection calls between actor & PropertyNotification
-template <typename T>
-struct SignalConnector {};
+template<typename T>
+struct SignalConnector
+{
+};
 
 // Actor specialization
-template <>
-struct SignalConnector<Actor> {
-  Actor& mActor;
+template<>
+struct SignalConnector<Actor>
+{
+  Actor&             mActor;
   ConnectionTracker* mTracker;
   const std::string& mName;
 
   SignalConnector<Actor>(ConnectionTracker* tracker, Actor& actor, const std::string& name)
-  : mActor(actor), mTracker(tracker), mName(name) {}
+  : mActor(actor),
+    mTracker(tracker),
+    mName(name)
+  {
+  }
 
-  template <typename T>
+  template<typename T>
   void Connect(T& functor)
   {
-    mActor.ConnectSignal( mTracker, mName, functor);
+    mActor.ConnectSignal(mTracker, mName, functor);
   }
 };
 
 // PropertyNotification specialization
-template <>
+template<>
 struct SignalConnector<PropertyNotification>
 {
   PropertyNotification& mNotification;
-  ConnectionTracker* mTracker;
+  ConnectionTracker*    mTracker;
 
-  SignalConnector<PropertyNotification>(ConnectionTracker* tracker, PropertyNotification &notification)
-  : mNotification(notification), mTracker(tracker) {}
+  SignalConnector<PropertyNotification>(ConnectionTracker* tracker, PropertyNotification& notification)
+  : mNotification(notification),
+    mTracker(tracker)
+  {
+  }
 
-  template <typename T>
+  template<typename T>
   void Connect(T& functor)
   {
-    mNotification.NotifySignal().Connect( mTracker, PropertyNotifcationSignalShim<T>(functor) );
+    mNotification.NotifySignal().Connect(mTracker, PropertyNotifcationSignalShim<T>(functor));
   }
 };
 
 /**
  * Set an action functor on a signal
  */
-template <typename T>
-void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder, SignalConnector<T>& connector)
+template<typename T>
+void SetActionOnSignal(const TreeNode& root, const TreeNode& child, Actor actor, Dali::Toolkit::Internal::Builder* const builder, SignalConnector<T>& connector)
 {
-  OptionalString childActorName(IsString( IsChild(&child, "childActor")) );
-  OptionalString actorName(IsString( IsChild(&child, "actor")) );
-  OptionalString propertyName(IsString( IsChild(&child, "property")) );
-  OptionalChild  valueChild( IsChild(&child, "value") );
+  OptionalString childActorName(IsString(IsChild(&child, "childActor")));
+  OptionalString actorName(IsString(IsChild(&child, "actor")));
+  OptionalString propertyName(IsString(IsChild(&child, "property")));
+  OptionalChild  valueChild(IsChild(&child, "value"));
 
-  OptionalString actionName = IsString( IsChild(&child, "action") );
+  OptionalString actionName = IsString(IsChild(&child, "action"));
   DALI_ASSERT_ALWAYS(actionName && "Signal must have an action");
 
   if(childActorName)
   {
     ChildActorAction action;
-    action.actorName       = *actorName;
-    action.childName       = *childActorName;
-    action.actionName      = *actionName;
+    action.actorName  = *actorName;
+    action.childName  = *childActorName;
+    action.actionName = *actionName;
     GetParameters(child, action.parameters);
-    connector.Connect( action );
+    connector.Connect(action);
   }
   else if(actorName)
   {
-    if(propertyName && valueChild && ("set" == *actionName) )
+    if(propertyName && valueChild && ("set" == *actionName))
     {
       PropertySetAction action;
-      action.actorName       = *actorName;
-      action.propertyName    = *propertyName;
+      action.actorName    = *actorName;
+      action.propertyName = *propertyName;
       // actor may not exist yet so we can't check the property type
-      Dali::Toolkit::Internal::DeterminePropertyFromNode( *valueChild, action.value );
-      connector.Connect( action );
+      Dali::Toolkit::Internal::DeterminePropertyFromNode(*valueChild, action.value);
+      connector.Connect(action);
     }
     else
     {
       GenericAction action;
-      action.actorName       = *actorName;
-      action.actionName      = *actionName;
+      action.actorName  = *actorName;
+      action.actionName = *actionName;
       GetParameters(child, action.parameters);
-      connector.Connect( action );
+      connector.Connect(action);
     }
   }
   else if("quit" == *actionName)
   {
     QuitAction action;
     action.builder = builder;
-    connector.Connect( action );
+    connector.Connect(action);
   }
   else if("play" == *actionName)
   {
-    OptionalChild animations     = IsChild( root, "animations" );
-    OptionalString animationName = IsString( IsChild(child, "animation") );
-    if( animations && animationName )
+    OptionalChild  animations    = IsChild(root, "animations");
+    OptionalString animationName = IsString(IsChild(child, "animation"));
+    if(animations && animationName)
     {
-      if( OptionalChild animNode = IsChild(*animations, *animationName) )
+      if(OptionalChild animNode = IsChild(*animations, *animationName))
       {
         DelayedAnimationPlay action;
         action.animNode = animNode;
-        action.builder = builder;
+        action.builder  = builder;
         // @todo; put constants into the map
-        connector.Connect( action );
+        connector.Connect(action);
       }
       else
       {
@@ -527,32 +536,32 @@ void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
       DALI_SCRIPT_WARNING("Cannot find animations section\n");
     }
   }
-  else if("applyConstraint" == *actionName )
+  else if("applyConstraint" == *actionName)
   {
-    OptionalString constrainerName = IsString( IsChild(child, "constrainer") );
-    if( !constrainerName )
+    OptionalString constrainerName = IsString(IsChild(child, "constrainer"));
+    if(!constrainerName)
     {
       DALI_SCRIPT_WARNING("Need to specify a constrainer\n");
     }
     else
     {
       DelayedConstrainerApply action;
-      action.constrainerName = *constrainerName;
-      action.builder = builder;
+      action.constrainerName       = *constrainerName;
+      action.builder               = builder;
       OptionalChild propertiesNode = IsChild(child, "properties");
       if(propertiesNode)
       {
         const TreeNode::ConstIterator endIter = (*propertiesNode).CEnd();
-        for( TreeNode::ConstIterator iter = (*propertiesNode).CBegin(); endIter != iter; ++iter )
+        for(TreeNode::ConstIterator iter = (*propertiesNode).CBegin(); endIter != iter; ++iter)
         {
           const TreeNode::KeyNodePair& pKeyChild = *iter;
-          OptionalString sourceActorName(IsString(IsChild(pKeyChild.second, "source")));
+          OptionalString               sourceActorName(IsString(IsChild(pKeyChild.second, "source")));
           if(!sourceActorName)
           {
             DALI_SCRIPT_WARNING("Need to specify source actor to apply the constraint\n");
             continue;
           }
-          OptionalString sourcePropertyName( IsString( IsChild(pKeyChild.second, "sourceProperty" ) ) );
+          OptionalString sourcePropertyName(IsString(IsChild(pKeyChild.second, "sourceProperty")));
           if(!sourcePropertyName)
           {
             DALI_SCRIPT_WARNING("Need to specify source property to apply the constraint\n");
@@ -566,7 +575,7 @@ void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
             continue;
           }
 
-          OptionalString targetPropertyName( IsString( IsChild(pKeyChild.second, "targetProperty" ) ) );
+          OptionalString targetPropertyName(IsString(IsChild(pKeyChild.second, "targetProperty")));
           if(!targetPropertyName)
           {
             DALI_SCRIPT_WARNING("Need to specify target property name to apply the constraint\n");
@@ -580,7 +589,7 @@ void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
             continue;
           }
 
-          Vector2 wrap(-std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
+          Vector2         wrap(-std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
           OptionalVector2 wrapRange(IsVector2(IsChild(pKeyChild.second, "wrap")));
           if(wrapRange)
           {
@@ -598,27 +607,26 @@ void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
       }
     }
   }
-  else if("removeConstraints" == *actionName )
+  else if("removeConstraints" == *actionName)
   {
-    OptionalString constrainerName = IsString( IsChild(child, "constrainer") );
-    if( !constrainerName )
+    OptionalString constrainerName = IsString(IsChild(child, "constrainer"));
+    if(!constrainerName)
     {
       DALI_SCRIPT_WARNING("Need to specify a constrainer\n");
     }
     else
     {
-
       DelayedConstrainerRemove action;
-      action.constrainerName = *constrainerName;
-      action.builder = builder;
+      action.constrainerName       = *constrainerName;
+      action.builder               = builder;
       OptionalChild propertiesNode = IsChild(child, "properties");
       if(propertiesNode)
       {
         const TreeNode::ConstIterator endIter = (*propertiesNode).CEnd();
-        for( TreeNode::ConstIterator iter = (*propertiesNode).CBegin(); endIter != iter; ++iter )
+        for(TreeNode::ConstIterator iter = (*propertiesNode).CBegin(); endIter != iter; ++iter)
         {
           const TreeNode::KeyNodePair& pKeyChild = *iter;
-          OptionalString targetActorName(IsString(IsChild(pKeyChild.second, "target")));
+          OptionalString               targetActorName(IsString(IsChild(pKeyChild.second, "target")));
           if(targetActorName)
           {
             action.targetActorNames.push_back(*targetActorName);
@@ -637,28 +645,27 @@ void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
   {
     // no named actor; presume self
     GenericAction action;
-    action.actorName       = actor.GetProperty< std::string >( Dali::Actor::Property::NAME );
-    action.actionName      = *actionName;
+    action.actorName  = actor.GetProperty<std::string>(Dali::Actor::Property::NAME);
+    action.actionName = *actionName;
     GetParameters(child, action.parameters);
-    connector.Connect( action );
+    connector.Connect(action);
   }
 }
 
-
 /**
  * Get a notification condition argument0 as 'arg0' 'value' or 'min'
  */
-float GetConditionArg0(const TreeNode &child)
+float GetConditionArg0(const TreeNodechild)
 {
-  OptionalFloat f = IsFloat( IsChild(child, "arg0") );
+  OptionalFloat f = IsFloat(IsChild(child, "arg0"));
   // allowing some human preferable alternatives
   if(!f)
   {
-    f = IsFloat( IsChild(child, "value") );
+    f = IsFloat(IsChild(child, "value"));
   }
   if(!f)
   {
-    f = IsFloat( IsChild(child, "min") );
+    f = IsFloat(IsChild(child, "min"));
   }
 
   DALI_ASSERT_ALWAYS(f && "Notification condition for arg0 not specified");
@@ -669,13 +676,13 @@ float GetConditionArg0(const TreeNode &child)
 /**
  * Get a notification condition argument1 as 'arg1' or 'max'
  */
-float GetConditionArg1(const TreeNode &child)
+float GetConditionArg1(const TreeNodechild)
 {
-  OptionalFloat f = IsFloat( IsChild(child, "arg1") );
+  OptionalFloat f = IsFloat(IsChild(child, "arg1"));
   // allowing some human preferable alternatives
   if(!f)
   {
-    f = IsFloat( IsChild(child, "max") );
+    f = IsFloat(IsChild(child, "max"));
   }
 
   DALI_ASSERT_ALWAYS(f && "Notification condition for arg1 not specified");
@@ -683,9 +690,7 @@ float GetConditionArg1(const TreeNode &child)
   return *f;
 }
 
-
-
-}; // anon namespace
+}; // namespace
 
 namespace Dali
 {
@@ -693,28 +698,27 @@ namespace Toolkit
 {
 namespace Internal
 {
-
-Actor SetupSignalAction(const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder );
-Actor SetupPropertyNotification(const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder );
+Actor SetupSignalAction(const TreeNode& child, Actor actor, Dali::Toolkit::Internal::Builder* const builder);
+Actor SetupPropertyNotification(const TreeNode& child, Actor actor, Dali::Toolkit::Internal::Builder* const builder);
 
 /**
  * Setup signals and actions on an actor
  */
-Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder )
+Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode& root, const TreeNode& child, Actor actor, Dali::Toolkit::Internal::Builder* const builder)
 {
   DALI_ASSERT_ALWAYS(actor);
 
   if(OptionalChild signalsChild = IsChild(child, "signals"))
   {
-    const TreeNode& signalsNode = *signalsChild;
-    const TreeConstIter endIter = signalsNode.CEnd();
-    for( TreeConstIter iter = signalsNode.CBegin(); endIter != iter; ++iter )
+    const TreeNode&     signalsNode = *signalsChild;
+    const TreeConstIter endIter     = signalsNode.CEnd();
+    for(TreeConstIter iter = signalsNode.CBegin(); endIter != iter; ++iter)
     {
       const TreeNode::KeyNodePair& key_child = *iter;
 
-      DALI_SCRIPT_INFO("  Creating Signal for: %s\n", actor.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str());
+      DALI_SCRIPT_INFO("  Creating Signal for: %s\n", actor.GetProperty<std::string>(Dali::Actor::Property::NAME).c_str());
 
-      OptionalString name( IsString( IsChild( key_child.second, "name")) );
+      OptionalString name(IsString(IsChild(key_child.second, "name")));
       DALI_ASSERT_ALWAYS(name && "Signal must have a name");
 
       SignalConnector<Actor> connector(tracker, actor, *name);
@@ -728,61 +732,66 @@ Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const
 /**
  * Setup Property notifications for an actor
  */
-Actor SetupPropertyNotification(ConnectionTracker* tracker, const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder )
+Actor SetupPropertyNotification(ConnectionTracker* tracker, const TreeNode& root, const TreeNode& child, Actor actor, Dali::Toolkit::Internal::Builder* const builder)
 {
   DALI_ASSERT_ALWAYS(actor);
 
-  if(OptionalChild notificationsChild = IsChild(child,"notifications"))
+  if(OptionalChild notificationsChild = IsChild(child, "notifications"))
   {
-    const TreeNode& notificationsNode = *notificationsChild;
-    const TreeNode::ConstIterator endIter = notificationsNode.CEnd();
-    for( TreeNode::ConstIterator iter = notificationsNode.CBegin(); endIter != iter; ++iter )
+    const TreeNode&               notificationsNode = *notificationsChild;
+    const TreeNode::ConstIterator endIter           = notificationsNode.CEnd();
+    for(TreeNode::ConstIterator iter = notificationsNode.CBegin(); endIter != iter; ++iter)
     {
       const TreeNode::KeyNodePair& key_child = *iter;
 
-      OptionalString prop(IsString( IsChild(key_child.second, "property")) );
+      OptionalString prop(IsString(IsChild(key_child.second, "property")));
       DALI_ASSERT_ALWAYS(prop && "Notification signal must specify a property");
 
       Property::Index prop_index = actor.GetPropertyIndex(*prop);
       DALI_ASSERT_ALWAYS(prop_index != Property::INVALID_INDEX && "Notification signal specifies an unknown property");
 
-      OptionalString cond(IsString( IsChild(key_child.second, "condition")));
+      OptionalString cond(IsString(IsChild(key_child.second, "condition")));
       DALI_ASSERT_ALWAYS(cond && "Notification signal must specify a condition");
 
       if("False" == *cond)
       {
-        PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop),
-                                                                           LessThanCondition(1.f) );
+        PropertyNotification notification = actor.AddPropertyNotification(actor.GetPropertyIndex(*prop),
+                                                                          LessThanCondition(1.f));
+
         SignalConnector<PropertyNotification> connector(tracker, notification);
         SetActionOnSignal(root, key_child.second, actor, builder, connector);
       }
       else if("LessThan" == *cond)
       {
-        PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop),
-                                                                           LessThanCondition(GetConditionArg0(key_child.second)) );
+        PropertyNotification notification = actor.AddPropertyNotification(actor.GetPropertyIndex(*prop),
+                                                                          LessThanCondition(GetConditionArg0(key_child.second)));
+
         SignalConnector<PropertyNotification> connector(tracker, notification);
         SetActionOnSignal(root, key_child.second, actor, builder, connector);
       }
       else if("GreaterThan" == *cond)
       {
-        PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop),
-                                                                           GreaterThanCondition(GetConditionArg0(key_child.second)) );
+        PropertyNotification notification = actor.AddPropertyNotification(actor.GetPropertyIndex(*prop),
+                                                                          GreaterThanCondition(GetConditionArg0(key_child.second)));
+
         SignalConnector<PropertyNotification> connector(tracker, notification);
         SetActionOnSignal(root, key_child.second, actor, builder, connector);
       }
       else if("Inside" == *cond)
       {
-        PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop),
-                                                                           InsideCondition(GetConditionArg0(key_child.second),
-                                                                           GetConditionArg1(key_child.second)) );
+        PropertyNotification notification = actor.AddPropertyNotification(actor.GetPropertyIndex(*prop),
+                                                                          InsideCondition(GetConditionArg0(key_child.second),
+                                                                                          GetConditionArg1(key_child.second)));
+
         SignalConnector<PropertyNotification> connector(tracker, notification);
         SetActionOnSignal(root, key_child.second, actor, builder, connector);
       }
       else if("Outside" == *cond)
       {
-        PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop),
-                                                                           OutsideCondition(GetConditionArg0(key_child.second),
-                                                                           GetConditionArg1(key_child.second)) );
+        PropertyNotification notification = actor.AddPropertyNotification(actor.GetPropertyIndex(*prop),
+                                                                          OutsideCondition(GetConditionArg0(key_child.second),
+                                                                                           GetConditionArg1(key_child.second)));
+
         SignalConnector<PropertyNotification> connector(tracker, notification);
         SetActionOnSignal(root, key_child.second, actor, builder, connector);
       }
@@ -797,7 +806,6 @@ Actor SetupPropertyNotification(ConnectionTracker* tracker, const TreeNode &root
 
 } // AddPropertyNotification
 
-
 } // namespace Internal
 } // namespace Toolkit
 } // namespace Dali