X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fview%2Fview-impl.cpp;h=9a486ed59671b3f267e9736587ace43448b6411c;hp=6c374c08aab6383a67180622d329a9d0c88e153b;hb=refs%2Ftags%2Faccepted%2Ftizen%2Fcommon%2F20150309.091951;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2 diff --git a/dali-toolkit/internal/controls/view/view-impl.cpp b/dali-toolkit/internal/controls/view/view-impl.cpp index 6c374c0..9a486ed 100644 --- a/dali-toolkit/internal/controls/view/view-impl.cpp +++ b/dali-toolkit/internal/controls/view/view-impl.cpp @@ -22,8 +22,7 @@ #include #include #include - -// INTERNAL INCLUDES +#include namespace Dali { @@ -34,7 +33,7 @@ namespace Toolkit namespace Internal { -namespace // to register type +namespace { BaseHandle Create() @@ -42,14 +41,11 @@ BaseHandle Create() return Toolkit::View::New(); } -TypeRegistration typeRegistration( typeid(Toolkit::View), typeid(Toolkit::Control), Create ); - -SignalConnectorType signalConnector1( typeRegistration, Toolkit::View::SIGNAL_ORIENTATION_ANIMATION_START , &View::DoConnectSignal ); +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::View, Toolkit::Control, Create ) -} +DALI_SIGNAL_REGISTRATION( View, "orientation-animation-start", SIGNAL_ORIENTATION_ANIMATION_START ) -namespace -{ +DALI_TYPE_REGISTRATION_END() const float ROTATION_ANIMATION_DURATION = 0.5f; @@ -251,7 +247,7 @@ bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* trac bool connected( true ); Toolkit::View view = Toolkit::View::DownCast(handle); - if( Toolkit::View::SIGNAL_ORIENTATION_ANIMATION_START == signalName ) + if( 0 == strcmp( signalName.c_str(), SIGNAL_ORIENTATION_ANIMATION_START ) ) { view.OrientationAnimationStartedSignal().Connect( tracker, functor ); }