X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdummy-control.cpp;h=0d54096a2de2df05eaca94322404bce9b98cbd10;hp=8f7022859f5ffc821018d9c77d5be10f0593cd4b;hb=0a6c26e72fc8d2ad52837311b7e9069c12eec4be;hpb=0956b458d0eb2745771cbd7678c354d61621241d diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp index 8f70228..0d54096 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp @@ -21,6 +21,7 @@ #include #include #include +#include namespace Dali { @@ -105,7 +106,7 @@ DummyControlImpl::~DummyControlImpl() void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::Base visual ) { - Control::RegisterVisual( index, visual ); + DevelControl::RegisterVisual( *this, index, visual ); VisualIndices::iterator iter = std::find( mRegisteredVisualIndices.begin(), mRegisteredVisualIndices.end(), index ); if( iter == mRegisteredVisualIndices.end() ) @@ -116,7 +117,7 @@ void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::B void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::Base visual, bool enabled ) { - Control::RegisterVisual( index, visual, enabled ); + DevelControl::RegisterVisual( *this, index, visual, enabled ); VisualIndices::iterator iter = std::find( mRegisteredVisualIndices.begin(), mRegisteredVisualIndices.end(), index ); if( iter == mRegisteredVisualIndices.end() ) @@ -127,7 +128,7 @@ void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::B void DummyControlImpl::UnregisterVisual( Property::Index index ) { - Control::UnregisterVisual( index ); + DevelControl::UnregisterVisual( *this, index ); VisualIndices::iterator iter = std::find( mRegisteredVisualIndices.begin(), mRegisteredVisualIndices.end(), index ); if( iter != mRegisteredVisualIndices.end() ) @@ -138,22 +139,22 @@ void DummyControlImpl::UnregisterVisual( Property::Index index ) Toolkit::Visual::Base DummyControlImpl::GetVisual( Property::Index index ) { - return Control::GetVisual( index ); + return DevelControl::GetVisual( *this, index ); } void DummyControlImpl::EnableVisual( Property::Index index, bool enabled ) { - Control::EnableVisual( index, enabled ); + DevelControl::EnableVisual( *this, index, enabled ); } bool DummyControlImpl::IsVisualEnabled( Property::Index index ) { - return Control::IsVisualEnabled( index ); + return DevelControl::IsVisualEnabled( *this, index ); } Animation DummyControlImpl::CreateTransition( const Toolkit::TransitionData& transition ) { - return Control::CreateTransition( transition ); + return DevelControl::CreateTransition( *this, transition ); } void DummyControlImpl::SetProperty( BaseObject* object, Dali::Property::Index index, const Dali::Property::Value& value )