projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add some APIs into web view." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-scene-holder.cpp
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
111f362
..
e18809a
100644
(file)
--- 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
@@
-105,9
+105,9
@@
Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEve
return mScene.KeyEventGeneratedSignal();
}
return mScene.KeyEventGeneratedSignal();
}
-Dali::Integration::SceneHolder::Touch
SignalType& SceneHolder::Touch
Signal()
+Dali::Integration::SceneHolder::Touch
EventSignalType& SceneHolder::Touched
Signal()
{
{
- return mScene.TouchSignal();
+ return mScene.Touch
ed
Signal();
}
Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
}
Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
@@
-225,9
+225,9
@@
SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal()
return GetImplementation( *this ).KeyEventGeneratedSignal();
}
return GetImplementation( *this ).KeyEventGeneratedSignal();
}
-SceneHolder::Touch
SignalType& SceneHolder::Touch
Signal()
+SceneHolder::Touch
EventSignalType& SceneHolder::Touched
Signal()
{
{
- return GetImplementation( *this ).TouchSignal();
+ return GetImplementation( *this ).Touch
ed
Signal();
}
SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
}
SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()