X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fbuilder%2Fbuilder-impl.cpp;h=ae6e036f9a99ccd7ca2d7383e4ee73226dc3d5f2;hp=d16c64ffb895f3d351f271c19212a05ba3e2f070;hb=d725a0d2d6b11eff469c9a4d2c13df9e00e6b85f;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e

diff --git a/optional/dali-toolkit/internal/builder/builder-impl.cpp b/optional/dali-toolkit/internal/builder/builder-impl.cpp
index d16c64f..ae6e036 100644
--- a/optional/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/optional/dali-toolkit/internal/builder/builder-impl.cpp
@@ -50,7 +50,6 @@ extern bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Prop
 extern Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const TreeNode &child, Actor actor);
 extern Actor SetupPropertyNotification(ConnectionTracker* tracker, const TreeNode &root, const TreeNode &child, Actor actor);
 extern Actor SetupActor( const TreeNode& node, Actor& actor );
-extern Control SetupControl( const TreeNode& node, Control& actor );
 
 #if defined(DEBUG_ENABLED)
 Integration::Log::Filter* gFilterScript  = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_SCRIPT");
@@ -330,13 +329,6 @@ void Builder::ApplyProperties( const TreeNode& root, const TreeNode& node,
     {
       SetupActor( node, actor );
 
-      Control control  = Control::DownCast(actor);
-
-      if( control )
-      {
-        SetupControl( node, control );
-      }
-
       // add signals
       SetupSignalAction( mSlotDelegate.GetConnectionTracker(), root, node, actor );
 
@@ -472,7 +464,6 @@ BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node,
     baseHandle       = typeInfo.CreateInstance();
     Handle handle    = Handle::DownCast(baseHandle);
     Actor actor      = Actor::DownCast(handle);
-    Control control  = Control::DownCast(handle);
 
     if(handle)
     {
@@ -491,6 +482,7 @@ BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node,
         DALI_SCRIPT_VERBOSE("  Is Actor id=%d\n", actor.GetId());
       }
 
+      Toolkit::Control control  = Toolkit::Control::DownCast(handle);
       if(control)
       {
         DALI_SCRIPT_VERBOSE("  Is Control id=%d\n", actor.GetId());