projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "KeyEvent class pimpling"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
common
/
scene-impl.cpp
diff --git
a/dali/internal/event/common/scene-impl.cpp
b/dali/internal/event/common/scene-impl.cpp
index
af08928
..
54301e1
100755
(executable)
--- a/
dali/internal/event/common/scene-impl.cpp
+++ b/
dali/internal/event/common/scene-impl.cpp
@@
-296,7
+296,7
@@
SceneGraph::Scene* Scene::GetSceneObject() const
return mSceneObject;
}
return mSceneObject;
}
-void Scene::EmitKeyEventSignal(const
Dali::
KeyEvent& event)
+void Scene::EmitKeyEventSignal(const KeyEvent& event)
{
if ( !mKeyEventSignal.Empty() )
{
{
if ( !mKeyEventSignal.Empty() )
{
@@
-305,10
+305,9
@@
void Scene::EmitKeyEventSignal(const Dali::KeyEvent& event)
}
}
}
}
-bool Scene::EmitKeyEventGeneratedSignal(const
Dali::
KeyEvent& event)
+bool Scene::EmitKeyEventGeneratedSignal(const KeyEvent& event)
{
// Emit the KeyEventGenerated signal when KeyEvent is generated
{
// Emit the KeyEventGenerated signal when KeyEvent is generated
- Dali::Integration::Scene handle( this );
return mKeyEventGeneratedSignal.Emit( event );
}
return mKeyEventGeneratedSignal.Emit( event );
}