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%2Ftoolkit-scene-holder.cpp;h=8bcb3c07b161d45bd42fca603120df622c8f1ecc;hp=320c859109e1f5d413b1be929c99627e3186fc05;hb=23b2e42867831f09cb411f99dfd6d7c4403dc28a;hpb=7dbe383e1d72909ceb2ef46e33b880243911df7e diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp index 320c859..8bcb3c0 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -106,9 +105,9 @@ Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEve return mScene.KeyEventGeneratedSignal(); } -Dali::Integration::SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +Dali::Integration::SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal() { - return mScene.TouchSignal(); + return mScene.TouchedSignal(); } Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() @@ -116,6 +115,11 @@ Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSig return mScene.WheelEventSignal(); } +Dali::Integration::SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal() +{ + return mScene.WheelEventGeneratedSignal(); +} + Integration::Scene SceneHolder::GetScene() { return mScene; @@ -226,9 +230,9 @@ SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal() return GetImplementation( *this ).KeyEventGeneratedSignal(); } -SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal() { - return GetImplementation( *this ).TouchSignal(); + return GetImplementation( *this ).TouchedSignal(); } SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() @@ -236,6 +240,11 @@ SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() return GetImplementation( *this ).WheelEventSignal(); } +SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal() +{ + return GetImplementation( *this ).WheelEventGeneratedSignal(); +} + } // Integration } // Dali