X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdummy-control.cpp;h=49fe95b47be52a0ea50e195a70b2cda0caac8576;hb=fa5750df279183e1fdf8821e3fe0c9302c6421a3;hp=8e1473ea7c4652340406f49307baf085586646b3;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 8e1473e..49fe95b 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 @@ -26,14 +26,11 @@ namespace Toolkit { DummyControl::DummyControl() -: mCustomSlot1Called(false) { } DummyControl::DummyControl(const DummyControl& control) -: Control( control ), - mCustomSlot1Called(false), - mCustomSlot1Value(Vector3::ZERO) +: Control( control ) { } @@ -53,7 +50,7 @@ DummyControl& DummyControl::operator=(const DummyControl& control) } // Used to test signal connections -void DummyControl::CustomSlot1( Actor actor, const Vector3& value ) +void DummyControlImpl::CustomSlot1( Actor actor, const Vector3& value ) { mCustomSlot1Called = true; mCustomSlot1Value = value; @@ -68,10 +65,13 @@ DummyControl DummyControlImpl::New() } DummyControlImpl::DummyControlImpl() -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ) +: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), + mCustomSlot1Called(false), + mCustomSlot1Value(Vector3::ZERO) { } + DummyControlImpl::~DummyControlImpl() { } @@ -147,16 +147,12 @@ DummyControl DummyControl::New( bool override ) } DummyControl::DummyControl( DummyControlImpl& implementation ) -: Control( implementation ), - mCustomSlot1Called(false), - mCustomSlot1Value(Vector3::ZERO) +: Control( implementation ) { } DummyControl::DummyControl( Dali::Internal::CustomActor* internal ) -: Control( internal ), - mCustomSlot1Called(false), - mCustomSlot1Value(Vector3::ZERO) +: Control( internal ) { VerifyCustomActorPointer(internal); }