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
[dali_1.0.30] Merge branch 'tizen'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
dummy-control.cpp
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
7f784b6
..
e2b419e
100644
(file)
--- 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
@@
-50,10
+50,9
@@
DummyControl& DummyControl::operator=(const DummyControl& control)
}
// Used to test signal connections
}
// Used to test signal connections
-void DummyControlImpl::CustomSlot1( Actor actor
, const Vector3& value
)
+void DummyControlImpl::CustomSlot1( Actor actor )
{
mCustomSlot1Called = true;
{
mCustomSlot1Called = true;
- mCustomSlot1Value = value;
}
DummyControl DummyControlImpl::New()
}
DummyControl DummyControlImpl::New()
@@
-66,8
+65,7
@@
DummyControl DummyControlImpl::New()
DummyControlImpl::DummyControlImpl()
: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
DummyControlImpl::DummyControlImpl()
: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
- mCustomSlot1Called(false),
- mCustomSlot1Value(Vector3::ZERO)
+ mCustomSlot1Called(false)
{
}
{
}